[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 09/20] target/ppc: Substitute msr_pow macro with new M_MSR_POW ma
From: |
Víctor Colombo |
Subject: |
[PATCH 09/20] target/ppc: Substitute msr_pow macro with new M_MSR_POW macro |
Date: |
Fri, 22 Apr 2022 15:54:39 -0300 |
Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Víctor Colombo <victor.colombo@eldorado.org.br>
---
target/ppc/cpu.h | 2 +-
target/ppc/excp_helper.c | 12 ++++++------
target/ppc/helper_regs.c | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index 3f10c1f5b2..b79c00dd65 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -353,6 +353,7 @@ typedef enum {
#define MSR_RI 1 /* Recoverable interrupt 1 */
#define MSR_LE 0 /* Little-endian mode 1 hflags */
+#define M_MSR_POW (1ull << MSR_POW)
#define M_MSR_CE (1ull << MSR_CE)
#define M_MSR_ILE (1ull << MSR_ILE)
#define M_MSR_EE (1ull << MSR_EE)
@@ -477,7 +478,6 @@ typedef enum {
#endif
#define msr_cm ((env->msr >> MSR_CM) & 1)
#define msr_gs ((env->msr >> MSR_GS) & 1)
-#define msr_pow ((env->msr >> MSR_POW) & 1)
#define msr_fp ((env->msr >> MSR_FP) & 1)
#define msr_me ((env->msr >> MSR_ME) & 1)
#define msr_fe0 ((env->msr >> MSR_FE0) & 1)
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index 6dcaa79516..91af089d2e 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -661,7 +661,7 @@ static void powerpc_excp_6xx(PowerPCCPU *cpu, int excp)
case POWERPC_EXCP_ITLB: /* Instruction TLB error */
break;
case POWERPC_EXCP_RESET: /* System reset exception */
- if (msr_pow) {
+ if (env->msr & M_MSR_POW) {
cpu_abort(cs, "Trying to deliver power-saving system reset "
"exception %d with no HV support\n", excp);
}
@@ -853,7 +853,7 @@ static void powerpc_excp_7xx(PowerPCCPU *cpu, int excp)
case POWERPC_EXCP_DECR: /* Decrementer exception */
break;
case POWERPC_EXCP_RESET: /* System reset exception */
- if (msr_pow) {
+ if (env->msr & M_MSR_POW) {
cpu_abort(cs, "Trying to deliver power-saving system reset "
"exception %d with no HV support\n", excp);
}
@@ -1038,7 +1038,7 @@ static void powerpc_excp_74xx(PowerPCCPU *cpu, int excp)
case POWERPC_EXCP_DECR: /* Decrementer exception */
break;
case POWERPC_EXCP_RESET: /* System reset exception */
- if (msr_pow) {
+ if (env->msr & M_MSR_POW) {
cpu_abort(cs, "Trying to deliver power-saving system reset "
"exception %d with no HV support\n", excp);
}
@@ -1248,7 +1248,7 @@ static void powerpc_excp_booke(PowerPCCPU *cpu, int excp)
env->spr[SPR_BOOKE_ESR] = ESR_SPV;
break;
case POWERPC_EXCP_RESET: /* System reset exception */
- if (msr_pow) {
+ if (env->msr & M_MSR_POW) {
cpu_abort(cs, "Trying to deliver power-saving system reset "
"exception %d with no HV support\n", excp);
}
@@ -1507,7 +1507,7 @@ static void powerpc_excp_books(PowerPCCPU *cpu, int excp)
break;
case POWERPC_EXCP_RESET: /* System reset exception */
/* A power-saving exception sets ME, otherwise it is unchanged */
- if (msr_pow) {
+ if (env->msr & M_MSR_POW) {
/* indicate that we resumed from power save mode */
msr |= 0x10000;
new_msr |= ((target_ulong)1 << MSR_ME);
@@ -1519,7 +1519,7 @@ static void powerpc_excp_books(PowerPCCPU *cpu, int excp)
*/
new_msr |= (target_ulong)MSR_HVB;
} else {
- if (msr_pow) {
+ if (env->msr & M_MSR_POW) {
cpu_abort(cs, "Trying to deliver power-saving system reset "
"exception %d with no HV support\n", excp);
}
diff --git a/target/ppc/helper_regs.c b/target/ppc/helper_regs.c
index 9a691d6833..a9bedfce50 100644
--- a/target/ppc/helper_regs.c
+++ b/target/ppc/helper_regs.c
@@ -261,7 +261,7 @@ int hreg_store_msr(CPUPPCState *env, target_ulong value,
int alter_hv)
env->msr = value;
hreg_compute_hflags(env);
#if !defined(CONFIG_USER_ONLY)
- if (unlikely(msr_pow == 1)) {
+ if (unlikely(env->msr & M_MSR_POW)) {
if (!env->pending_interrupts && (*env->check_pow)(env)) {
cs->halted = 1;
excp = EXCP_HALTED;
--
2.25.1
- Re: [PATCH 03/20] target/ppc: Substitute msr_pr macro with new M_MSR_PR macro, (continued)
[PATCH 04/20] target/ppc: Substitute msr_le macro with new M_MSR_LE macro, Víctor Colombo, 2022/04/22
[PATCH 05/20] target/ppc: Substitute msr_ds macro with new M_MSR_DS macro, Víctor Colombo, 2022/04/22
[PATCH 06/20] target/ppc: Substitute msr_ile macro with new M_MSR_ILE macro, Víctor Colombo, 2022/04/22
[PATCH 07/20] target/ppc: Substitute msr_ee macro with new M_MSR_EE macro, Víctor Colombo, 2022/04/22
[PATCH 08/20] target/ppc: Substitute msr_ce macro with new M_MSR_CE macro, Víctor Colombo, 2022/04/22
[PATCH 10/20] target/ppc: Substitute msr_me macro with new M_MSR_ME macro, Víctor Colombo, 2022/04/22
[PATCH 09/20] target/ppc: Substitute msr_pow macro with new M_MSR_POW macro,
Víctor Colombo <=
[PATCH 11/20] target/ppc: Substitute msr_gs macro with new M_MSR_GS macro, Víctor Colombo, 2022/04/22
[PATCH 12/20] target/ppc: Substitute msr_fp macro with new M_MSR_FP macro, Víctor Colombo, 2022/04/22
[PATCH 13/20] target/ppc: Substitute msr_cm macro with new M_MSR_CM macro, Víctor Colombo, 2022/04/22
[PATCH 14/20] target/ppc: Substitute msr_ir macro with new M_MSR_IR macro, Víctor Colombo, 2022/04/22
[PATCH 15/20] target/ppc: Substitute msr_dr macro with new M_MSR_DR macro, Víctor Colombo, 2022/04/22
[PATCH 16/20] target/ppc: Substitute msr_ep macro with new M_MSR_EP macro, Víctor Colombo, 2022/04/22
[PATCH 17/20] target/ppc: Substitute msr_fe macro with new M_MSR_FE macro, Víctor Colombo, 2022/04/22
[PATCH 18/20] target/ppc: Substitute msr_ts macro with new M_MSR_TS macro, Víctor Colombo, 2022/04/22
[PATCH 19/20] target/ppc: Substitute msr_hv macro with new M_MSR_HV macro, Víctor Colombo, 2022/04/22
[PATCH 20/20] target/ppc: Add unused M_MSR_* macros, Víctor Colombo, 2022/04/22