OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target-arm: Use a 1:1 mapping between EL and MMU index

Browse Source 
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
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 <peter.maydell@linaro.org>
This commit is contained in:
Edgar E. Iglesias 2014-05-27 17:09:51 +01:00 committed by Peter Maydell
parent 6ce2faf43c
commit f79fbf39e2
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target-arm/cpu.h
View File

@ -1080,12 +1080,12 @@ static inline CPUARMState *cpu_init(const char *cpu_model)
#define cpu_list arm_cpu_list #define cpu_list arm_cpu_list
/* MMU modes definitions */ /* MMU modes definitions */
#define MMU_MODE0_SUFFIX _kernel #define MMU_MODE0_SUFFIX _user
#define MMU_MODE1_SUFFIX _user #define MMU_MODE1_SUFFIX _kernel
#define MMU_USER_IDX 1 #define MMU_USER_IDX 0
static inline int cpu_mmu_index (CPUARMState *env) 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" #include "exec/cpu-all.h"

6
target-arm/translate.h
View File

@ -54,11 +54,7 @@ static inline int arm_dc_feature(DisasContext *dc, int feature)
static inline int get_mem_index(DisasContext *s) static inline int get_mem_index(DisasContext *s)
{ {
#ifdef CONFIG_USER_ONLY return s->current_pl;
return 1;
#else
return s->user;
#endif
} }
/* target-specific extra values for is_jmp */ /* target-specific extra values for is_jmp */