summaryrefslogtreecommitdiffstats
path: root/target-arm
diff options
context:
space:
mode:
authorEdgar E. Iglesias2015-05-29 08:43:13 +0200
committerPeter Maydell2015-06-02 14:22:29 +0200
commit3fc827d591679f3e262b9d1f8b34528eabfca8c0 (patch)
tree9d83cf0236f97090d9e8f04fef5d3855b97b954c /target-arm
parentMerge remote-tracking branch 'remotes/kraxel/tags/pull-input-20150602-1' into... (diff)
downloadqemu-3fc827d591679f3e262b9d1f8b34528eabfca8c0.tar.gz
qemu-3fc827d591679f3e262b9d1f8b34528eabfca8c0.tar.xz
qemu-3fc827d591679f3e262b9d1f8b34528eabfca8c0.zip
target-arm: Correct check for non-EL3
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>
Diffstat (limited to 'target-arm')
-rw-r--r--target-arm/op_helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
index 3f5b9ab596..7583ae7121 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;
case CP_ACCESS_TRAP_EL3: