target/ppc: Remove msr_fp macro
msr_fp 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-13-victor.colombo@eldorado.org.br> Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
parent
10b2b37391
commit
39695e156f
@ -360,6 +360,7 @@ FIELD(MSR, CE, MSR_CE, 1)
|
|||||||
FIELD(MSR, ILE, MSR_ILE, 1)
|
FIELD(MSR, ILE, MSR_ILE, 1)
|
||||||
FIELD(MSR, EE, MSR_EE, 1)
|
FIELD(MSR, EE, MSR_EE, 1)
|
||||||
FIELD(MSR, PR, MSR_PR, 1)
|
FIELD(MSR, PR, MSR_PR, 1)
|
||||||
|
FIELD(MSR, FP, MSR_FP, 1)
|
||||||
FIELD(MSR, ME, MSR_ME, 1)
|
FIELD(MSR, ME, MSR_ME, 1)
|
||||||
FIELD(MSR, DS, MSR_DS, 1)
|
FIELD(MSR, DS, MSR_DS, 1)
|
||||||
FIELD(MSR, LE, MSR_LE, 1)
|
FIELD(MSR, LE, MSR_LE, 1)
|
||||||
@ -480,7 +481,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_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)
|
||||||
#define msr_fe1 ((env->msr >> MSR_FE1) & 1)
|
#define msr_fe1 ((env->msr >> MSR_FE1) & 1)
|
||||||
|
@ -478,7 +478,8 @@ static void powerpc_excp_40x(PowerPCCPU *cpu, int excp)
|
|||||||
case POWERPC_EXCP_PROGRAM: /* Program exception */
|
case POWERPC_EXCP_PROGRAM: /* Program exception */
|
||||||
switch (env->error_code & ~0xF) {
|
switch (env->error_code & ~0xF) {
|
||||||
case POWERPC_EXCP_FP:
|
case POWERPC_EXCP_FP:
|
||||||
if ((msr_fe0 == 0 && msr_fe1 == 0) || msr_fp == 0) {
|
if ((msr_fe0 == 0 && msr_fe1 == 0) ||
|
||||||
|
!FIELD_EX64(env->msr, MSR, FP)) {
|
||||||
trace_ppc_excp_fp_ignore();
|
trace_ppc_excp_fp_ignore();
|
||||||
powerpc_reset_excp_state(cpu);
|
powerpc_reset_excp_state(cpu);
|
||||||
return;
|
return;
|
||||||
@ -615,7 +616,8 @@ static void powerpc_excp_6xx(PowerPCCPU *cpu, int excp)
|
|||||||
case POWERPC_EXCP_PROGRAM: /* Program exception */
|
case POWERPC_EXCP_PROGRAM: /* Program exception */
|
||||||
switch (env->error_code & ~0xF) {
|
switch (env->error_code & ~0xF) {
|
||||||
case POWERPC_EXCP_FP:
|
case POWERPC_EXCP_FP:
|
||||||
if ((msr_fe0 == 0 && msr_fe1 == 0) || msr_fp == 0) {
|
if ((msr_fe0 == 0 && msr_fe1 == 0) ||
|
||||||
|
!FIELD_EX64(env->msr, MSR, FP)) {
|
||||||
trace_ppc_excp_fp_ignore();
|
trace_ppc_excp_fp_ignore();
|
||||||
powerpc_reset_excp_state(cpu);
|
powerpc_reset_excp_state(cpu);
|
||||||
return;
|
return;
|
||||||
@ -788,7 +790,8 @@ static void powerpc_excp_7xx(PowerPCCPU *cpu, int excp)
|
|||||||
case POWERPC_EXCP_PROGRAM: /* Program exception */
|
case POWERPC_EXCP_PROGRAM: /* Program exception */
|
||||||
switch (env->error_code & ~0xF) {
|
switch (env->error_code & ~0xF) {
|
||||||
case POWERPC_EXCP_FP:
|
case POWERPC_EXCP_FP:
|
||||||
if ((msr_fe0 == 0 && msr_fe1 == 0) || msr_fp == 0) {
|
if ((msr_fe0 == 0 && msr_fe1 == 0) ||
|
||||||
|
!FIELD_EX64(env->msr, MSR, FP)) {
|
||||||
trace_ppc_excp_fp_ignore();
|
trace_ppc_excp_fp_ignore();
|
||||||
powerpc_reset_excp_state(cpu);
|
powerpc_reset_excp_state(cpu);
|
||||||
return;
|
return;
|
||||||
@ -973,7 +976,8 @@ static void powerpc_excp_74xx(PowerPCCPU *cpu, int excp)
|
|||||||
case POWERPC_EXCP_PROGRAM: /* Program exception */
|
case POWERPC_EXCP_PROGRAM: /* Program exception */
|
||||||
switch (env->error_code & ~0xF) {
|
switch (env->error_code & ~0xF) {
|
||||||
case POWERPC_EXCP_FP:
|
case POWERPC_EXCP_FP:
|
||||||
if ((msr_fe0 == 0 && msr_fe1 == 0) || msr_fp == 0) {
|
if ((msr_fe0 == 0 && msr_fe1 == 0) ||
|
||||||
|
!FIELD_EX64(env->msr, MSR, FP)) {
|
||||||
trace_ppc_excp_fp_ignore();
|
trace_ppc_excp_fp_ignore();
|
||||||
powerpc_reset_excp_state(cpu);
|
powerpc_reset_excp_state(cpu);
|
||||||
return;
|
return;
|
||||||
@ -1171,7 +1175,8 @@ static void powerpc_excp_booke(PowerPCCPU *cpu, int excp)
|
|||||||
case POWERPC_EXCP_PROGRAM: /* Program exception */
|
case POWERPC_EXCP_PROGRAM: /* Program exception */
|
||||||
switch (env->error_code & ~0xF) {
|
switch (env->error_code & ~0xF) {
|
||||||
case POWERPC_EXCP_FP:
|
case POWERPC_EXCP_FP:
|
||||||
if ((msr_fe0 == 0 && msr_fe1 == 0) || msr_fp == 0) {
|
if ((msr_fe0 == 0 && msr_fe1 == 0) ||
|
||||||
|
!FIELD_EX64(env->msr, MSR, FP)) {
|
||||||
trace_ppc_excp_fp_ignore();
|
trace_ppc_excp_fp_ignore();
|
||||||
powerpc_reset_excp_state(cpu);
|
powerpc_reset_excp_state(cpu);
|
||||||
return;
|
return;
|
||||||
@ -1434,7 +1439,8 @@ static void powerpc_excp_books(PowerPCCPU *cpu, int excp)
|
|||||||
case POWERPC_EXCP_PROGRAM: /* Program exception */
|
case POWERPC_EXCP_PROGRAM: /* Program exception */
|
||||||
switch (env->error_code & ~0xF) {
|
switch (env->error_code & ~0xF) {
|
||||||
case POWERPC_EXCP_FP:
|
case POWERPC_EXCP_FP:
|
||||||
if ((msr_fe0 == 0 && msr_fe1 == 0) || msr_fp == 0) {
|
if ((msr_fe0 == 0 && msr_fe1 == 0) ||
|
||||||
|
!FIELD_EX64(env->msr, MSR, FP)) {
|
||||||
trace_ppc_excp_fp_ignore();
|
trace_ppc_excp_fp_ignore();
|
||||||
powerpc_reset_excp_state(cpu);
|
powerpc_reset_excp_state(cpu);
|
||||||
return;
|
return;
|
||||||
|
Loading…
Reference in New Issue
Block a user