[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 16/20] target/ppc: Substitute msr_ep macro with new M_MSR_EP macr
From: |
Víctor Colombo |
Subject: |
[PATCH 16/20] target/ppc: Substitute msr_ep macro with new M_MSR_EP macro |
Date: |
Fri, 22 Apr 2022 15:54:46 -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/helper_regs.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index 3a5218a2cd..1767a3a430 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -362,6 +362,7 @@ typedef enum {
#define M_MSR_PR (1ull << MSR_PR)
#define M_MSR_FP (1ull << MSR_FP)
#define M_MSR_ME (1ull << MSR_ME)
+#define M_MSR_EP (1ull << MSR_EP)
#define M_MSR_IR (1ull << MSR_IR)
#define M_MSR_DR (1ull << MSR_DR)
#define M_MSR_DS (1ull << MSR_DS)
@@ -484,7 +485,6 @@ typedef enum {
#endif
#define msr_fe0 ((env->msr >> MSR_FE0) & 1)
#define msr_fe1 ((env->msr >> MSR_FE1) & 1)
-#define msr_ep ((env->msr >> MSR_EP) & 1)
#define msr_ts ((env->msr >> MSR_TS1) & 3)
#define DBCR0_ICMP (1 << 27)
diff --git a/target/ppc/helper_regs.c b/target/ppc/helper_regs.c
index 1c67fbf7c1..f9d2e123cf 100644
--- a/target/ppc/helper_regs.c
+++ b/target/ppc/helper_regs.c
@@ -241,8 +241,8 @@ int hreg_store_msr(CPUPPCState *env, target_ulong value,
int alter_hv)
/* Swap temporary saved registers with GPRs */
hreg_swap_gpr_tgpr(env);
}
- if (unlikely((value >> MSR_EP) & 1) != msr_ep) {
- env->excp_prefix = ((value >> MSR_EP) & 1) * 0xFFF00000;
+ if (unlikely(!(value & env->msr & M_MSR_EP))) {
+ env->excp_prefix = !!(value & M_MSR_EP) * 0xFFF00000;
}
/*
* If PR=1 then EE, IR and DR must be 1
--
2.25.1
- [PATCH 06/20] target/ppc: Substitute msr_ile macro with new M_MSR_ILE macro, (continued)
- [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, 2022/04/22
- [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 <=
- [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
- Re: [PATCH 00/20] target/ppc: Remove hidden usages of *env, Richard Henderson, 2022/04/26