Commit bba9bdce authored by Richard Henderson's avatar Richard Henderson Committed by Richard Henderson
Browse files

target-alpha: Use kernel mmu_idx for pal_mode. 



Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
parent ea879fc7

target-alpha/cpu.h

+7 −1
Original line number Diff line number Diff line
@@ -341,7 +341,13 @@ enum { 


static inline int cpu_mmu_index(CPUState *env)

{

    return (env->ps & PS_USER_MODE) != 0;

    if (env->pal_mode) {

        return MMU_KERNEL_IDX;

    } else if (env->ps & PS_USER_MODE) {

        return MMU_USER_IDX;

    } else {

        return MMU_KERNEL_IDX;

    }

}



enum {

target-alpha/translate.c

+2 −4
Original line number Diff line number Diff line
@@ -3098,10 +3098,8 @@ static inline void gen_intermediate_code_internal(CPUState *env, 
    ctx.env = env;

    ctx.pc = pc_start;

    ctx.amask = env->amask;

#if defined (CONFIG_USER_ONLY)

    ctx.mem_idx = 0;

#else

    ctx.mem_idx = ((env->ps >> 3) & 3);

    ctx.mem_idx = cpu_mmu_index(env);

#if !defined (CONFIG_USER_ONLY)

    ctx.pal_mode = env->pal_mode;

#endif