david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s390x/tcg: Always use MMU_USER_IDX for CONFIG_USER_ONLY

Browse Source 
Although we basically ignore the index all the time for CONFIG_USER_ONLY,
let's simply skip all the checks and always return MMU_USER_IDX in
cpu_mmu_index() and get_mem_index().

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
This commit is contained in:
David Hildenbrand 2019-09-03 13:26:31 +02:00
parent 2bb525e20d
commit 817791e839
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/s390x/cpu.h
View File

@ -328,6 +328,9 @@ extern const VMStateDescription vmstate_s390_cpu;
static inline int cpu_mmu_index(CPUS390XState *env, bool ifetch) static inline int cpu_mmu_index(CPUS390XState *env, bool ifetch)
{ {
#ifdef CONFIG_USER_ONLY
return MMU_USER_IDX;
#else
if (!(env->psw.mask & PSW_MASK_DAT)) { if (!(env->psw.mask & PSW_MASK_DAT)) {
return MMU_REAL_IDX; return MMU_REAL_IDX;
} }
@ -351,6 +354,7 @@ static inline int cpu_mmu_index(CPUS390XState *env, bool ifetch)
default: default:
abort(); abort();
} }
#endif
} }
static inline void cpu_get_tb_cpu_state(CPUS390XState* env, target_ulong *pc, static inline void cpu_get_tb_cpu_state(CPUS390XState* env, target_ulong *pc,

4
target/s390x/translate.c
View File

@ -318,6 +318,9 @@ static inline uint64_t ld_code4(CPUS390XState *env, uint64_t pc)
static int get_mem_index(DisasContext *s) static int get_mem_index(DisasContext *s)
{ {
#ifdef CONFIG_USER_ONLY
return MMU_USER_IDX;
#else
if (!(s->base.tb->flags & FLAG_MASK_DAT)) { if (!(s->base.tb->flags & FLAG_MASK_DAT)) {
return MMU_REAL_IDX; return MMU_REAL_IDX;
} }
@ -333,6 +336,7 @@ static int get_mem_index(DisasContext *s)
tcg_abort(); tcg_abort();
break; break;
} }
#endif
} }
static void gen_exception(int excp) static void gen_exception(int excp)