On Wed, May 07, 2014 at 10:00:11AM +0100, Peter Maydell wrote:
> On 6 May 2014 07:08, Edgar E. Iglesias <edgar.igles...@gmail.com> wrote:
> > From: "Edgar E. Iglesias" <edgar.igles...@xilinx.com>
> >
> > Check for EL2 support before returning to it.
> >
> > Signed-off-by: Edgar E. Iglesias <edgar.igles...@xilinx.com>
> > ---
> > target-arm/op_helper.c | 8 +++-----
> > 1 file changed, 3 insertions(+), 5 deletions(-)
> >
> > diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
> > index 770c776..f1ae05e 100644
> > --- a/target-arm/op_helper.c
> > +++ b/target-arm/op_helper.c
> > @@ -411,12 +411,10 @@ void HELPER(exception_return)(CPUARMState *env)
> > env->regs[15] = env->elr_el[ELR_EL_IDX(1)] & ~0x1;
> > } else {
> > new_el = extract32(spsr, 2, 2);
> > - if (new_el > cur_el) {
> > + if (new_el > cur_el
> > + || (new_el == 2 && !arm_feature(env, ARM_FEATURE_EL2))) {
> > /* Disallow returns to higher ELs than the current one. */
> > - goto illegal_return;
> > - }
> > - if (new_el > 1) {
> > - /* Return to unimplemented EL */
> > + /* Disallow returns to unimplemented ELs. */
>
> Merge the comments rather than having two one-liners one after
> the other, please.
> /* Disallow return to an EL which is unimplemented or higher
> * than the current one.
> */
Fixed for v2, thanks.
Cheers,
Edgar
