From 1482c26a4e656eaa35712895024a56303f4ba7ea Mon Sep 17 00:00:00 2001 From: Matthias Welwarsky Date: Thu, 6 Apr 2017 11:06:20 +0200 Subject: aarch64: simplify mode and state handling Aarch32 and Aarch64 modes don't conflict in CPSR, no need to deconflict ARMv7-M profile modes either. Change-Id: I4c437dfa657f9e8a1da3687bc9f21435384b7881 Signed-off-by: Matthias Welwarsky Reviewed-on: http://openocd.zylin.com/4144 Tested-by: jenkins Reviewed-by: Yao Qi Reviewed-by: Matthias Welwarsky --- src/target/arm.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/target/arm.h') diff --git a/src/target/arm.h b/src/target/arm.h index f89aa68..eb4a51f 100644 --- a/src/target/arm.h +++ b/src/target/arm.h @@ -66,14 +66,13 @@ enum arm_mode { ARM_MODE_USER_THREAD = 1, ARM_MODE_HANDLER = 2, - /* shift left 4 bits for armv8 64 */ - ARMV8_64_EL0T = 0x0F, - ARMV8_64_EL1T = 0x4F, - ARMV8_64_EL1H = 0x5F, - ARMV8_64_EL2T = 0x8F, - ARMV8_64_EL2H = 0x9F, - ARMV8_64_EL3T = 0xCF, - ARMV8_64_EL3H = 0xDF, + ARMV8_64_EL0T = 0x0, + ARMV8_64_EL1T = 0x4, + ARMV8_64_EL1H = 0x5, + ARMV8_64_EL2T = 0x8, + ARMV8_64_EL2H = 0x9, + ARMV8_64_EL3T = 0xC, + ARMV8_64_EL3H = 0xD, ARM_MODE_ANY = -1 }; -- cgit v1.1