From: Edgar E. Iglesias Date: Tue, 27 May 2014 16:09:51 +0000 (+0100) Subject: target-arm: Use a 1:1 mapping between EL and MMU index X-Git-Tag: qemu-xen-4.6.0-rc1~427^2~18 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f79fbf39e266e6fef3d796ef3884aefb9506b73c;p=qemu-upstream-4.6-testing.git target-arm: Use a 1:1 mapping between EL and MMU index Signed-off-by: Edgar E. Iglesias Message-id: 1400980132-25949-6-git-send-email-edgar.iglesias@gmail.com Message-id: 1400805738-11889-7-git-send-email-edgar.iglesias@gmail.com Signed-off-by: Peter Maydell --- diff --git a/target-arm/cpu.h b/target-arm/cpu.h index c83f2495a..5aa978d9c 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -1080,12 +1080,12 @@ static inline CPUARMState *cpu_init(const char *cpu_model) #define cpu_list arm_cpu_list /* MMU modes definitions */ -#define MMU_MODE0_SUFFIX _kernel -#define MMU_MODE1_SUFFIX _user -#define MMU_USER_IDX 1 +#define MMU_MODE0_SUFFIX _user +#define MMU_MODE1_SUFFIX _kernel +#define MMU_USER_IDX 0 static inline int cpu_mmu_index (CPUARMState *env) { - return arm_current_pl(env) ? 0 : 1; + return arm_current_pl(env); } #include "exec/cpu-all.h" diff --git a/target-arm/translate.h b/target-arm/translate.h index 8737af00e..31a0104b5 100644 --- a/target-arm/translate.h +++ b/target-arm/translate.h @@ -54,11 +54,7 @@ static inline int arm_dc_feature(DisasContext *dc, int feature) static inline int get_mem_index(DisasContext *s) { -#ifdef CONFIG_USER_ONLY - return 1; -#else - return s->user; -#endif + return s->current_pl; } /* target-specific extra values for is_jmp */