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

target/ppc: Remove msr_gs macro 

msr_gs macro hides the usage of env->msr, which is a bad behavior
Substitute it with FIELD_EX64 calls that explicitly use env->msr
as a parameter.

Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Víctor Colombo <victor.colombo@eldorado.org.br>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220504210541.115256-12-victor.colombo@eldorado.org.br>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Víctor Colombo 2022-05-04 18:05:30 -03:00 committed by Daniel Henrique Barboza
parent c354d85828
commit 10b2b37391
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/ppc/cpu.h
View File

@ -354,6 +354,7 @@ typedef enum {
#define MSR_RI 1 /* Recoverable interrupt 1 */ #define MSR_RI 1 /* Recoverable interrupt 1 */
#define MSR_LE 0 /* Little-endian mode 1 hflags */ #define MSR_LE 0 /* Little-endian mode 1 hflags */
FIELD(MSR, GS, MSR_GS, 1)
FIELD(MSR, POW, MSR_POW, 1) FIELD(MSR, POW, MSR_POW, 1)
FIELD(MSR, CE, MSR_CE, 1) FIELD(MSR, CE, MSR_CE, 1)
FIELD(MSR, ILE, MSR_ILE, 1) FIELD(MSR, ILE, MSR_ILE, 1)
@ -479,7 +480,6 @@ FIELD(MSR, LE, MSR_LE, 1)
#define msr_hv (0) #define msr_hv (0)
#endif #endif
#define msr_cm ((env->msr >> MSR_CM) & 1) #define msr_cm ((env->msr >> MSR_CM) & 1)
#define msr_gs ((env->msr >> MSR_GS) & 1)
#define msr_fp ((env->msr >> MSR_FP) & 1) #define msr_fp ((env->msr >> MSR_FP) & 1)
#define msr_fe0 ((env->msr >> MSR_FE0) & 1) #define msr_fe0 ((env->msr >> MSR_FE0) & 1)
#define msr_de ((env->msr >> MSR_DE) & 1) #define msr_de ((env->msr >> MSR_DE) & 1)

2
target/ppc/helper_regs.c
View File

@ -233,7 +233,7 @@ int hreg_store_msr(CPUPPCState *env, target_ulong value, int alter_hv)
} }
if ((env->mmu_model == POWERPC_MMU_BOOKE || if ((env->mmu_model == POWERPC_MMU_BOOKE ||
env->mmu_model == POWERPC_MMU_BOOKE206) && env->mmu_model == POWERPC_MMU_BOOKE206) &&
((value >> MSR_GS) & 1) != msr_gs) { ((value ^ env->msr) & R_MSR_GS_MASK)) {
cpu_interrupt_exittb(cs); cpu_interrupt_exittb(cs);
} }
if (unlikely((env->flags & POWERPC_FLAG_TGPR) && if (unlikely((env->flags & POWERPC_FLAG_TGPR) &&

4
target/ppc/mmu_helper.c
View File

@ -935,7 +935,7 @@ void helper_booke206_tlbwe(CPUPPCState *env)
} }
if (((env->spr[SPR_BOOKE_MAS0] & MAS0_ATSEL) == MAS0_ATSEL_LRAT) && if (((env->spr[SPR_BOOKE_MAS0] & MAS0_ATSEL) == MAS0_ATSEL_LRAT) &&
!msr_gs) { !FIELD_EX64(env->msr, MSR, GS)) {
/* XXX we don't support direct LRAT setting yet */ /* XXX we don't support direct LRAT setting yet */
fprintf(stderr, "cpu: don't support LRAT setting yet\n"); fprintf(stderr, "cpu: don't support LRAT setting yet\n");
return; return;
@ -962,7 +962,7 @@ void helper_booke206_tlbwe(CPUPPCState *env)
POWERPC_EXCP_INVAL_INVAL, GETPC()); POWERPC_EXCP_INVAL_INVAL, GETPC());
} }
if (msr_gs) { if (FIELD_EX64(env->msr, MSR, GS)) {
cpu_abort(env_cpu(env), "missing HV implementation\n"); cpu_abort(env_cpu(env), "missing HV implementation\n");
} }