OSDN Git Service

target-arm: Correct check for non-EL3
authorEdgar E. Iglesias <edgar.iglesias@xilinx.com>
Fri, 29 May 2015 06:43:13 +0000 (16:43 +1000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 2 Jun 2015 12:22:29 +0000 (13:22 +0100)
This fixes a compile warning from clang 3.5 (the assertion
could never fire).

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Message-id: 1432881807-18164-2-git-send-email-edgar.iglesias@gmail.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: John Snow <jsnow@redhat.com>
[PMM: added note in commit message that this is fixing a build warning]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
target-arm/op_helper.c

index 3f5b9ab..7583ae7 100644 (file)
@@ -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;
     case CP_ACCESS_TRAP_EL3: