Argh, that fix is cleaner and I should have checked patchwork first. Lesson learned, thanks.
-Leon On Mon, Jun 1, 2015 at 10:20 PM, Peter Maydell <[email protected]> wrote: > On 1 June 2015 at 13:27, Leon Yu <[email protected]> wrote: >> as comparing boolean with constant 3 is always false. >> >> Signed-off-by: Leon Yu <[email protected]> >> --- >> target-arm/op_helper.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c >> index 3f5b9ab..30f2374 100644 >> --- a/target-arm/op_helper.c >> +++ b/target-arm/op_helper.c >> @@ -421,7 +421,7 @@ void HELPER(access_check_cp_reg)(CPUARMState *env, void >> *rip, uint32_t syndrome) >> /* Requesting a trap to EL2 when we're in EL3 or S-EL0/1 is >> * a bug in the access function. >> */ >> - assert(!arm_is_secure(env) && !arm_current_el(env) == 3); >> + assert(!arm_is_secure(env) && !(arm_current_el(env) == 3)); >> target_el = 2; >> break; > > Yep. There's a fix onlist already: > http://patchwork.ozlabs.org/patch/477597/ > > thanks > -- PMM
