[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/30] target/ppc: Remove msr_me macro
From: |
Daniel Henrique Barboza |
Subject: |
[PULL 18/30] target/ppc: Remove msr_me macro |
Date: |
Thu, 5 May 2022 15:49:26 -0300 |
From: Víctor Colombo <victor.colombo@eldorado.org.br>
msr_me 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-11-victor.colombo@eldorado.org.br>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
target/ppc/cpu.h | 2 +-
target/ppc/excp_helper.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index 5a83c4b028..deb861f5f3 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -359,6 +359,7 @@ FIELD(MSR, CE, MSR_CE, 1)
FIELD(MSR, ILE, MSR_ILE, 1)
FIELD(MSR, EE, MSR_EE, 1)
FIELD(MSR, PR, MSR_PR, 1)
+FIELD(MSR, ME, MSR_ME, 1)
FIELD(MSR, DS, MSR_DS, 1)
FIELD(MSR, LE, MSR_LE, 1)
@@ -480,7 +481,6 @@ FIELD(MSR, LE, MSR_LE, 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_me ((env->msr >> MSR_ME) & 1)
#define msr_fe0 ((env->msr >> MSR_FE0) & 1)
#define msr_de ((env->msr >> MSR_DE) & 1)
#define msr_fe1 ((env->msr >> MSR_FE1) & 1)
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index ee63641dd0..e254ae806c 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -444,7 +444,7 @@ static void powerpc_excp_40x(PowerPCCPU *cpu, int excp)
srr1 = SPR_40x_SRR3;
break;
case POWERPC_EXCP_MCHECK: /* Machine check exception */
- if (msr_me == 0) {
+ if (!FIELD_EX64(env->msr, MSR, ME)) {
/*
* Machine check exception is not enabled. Enter
* checkstop state.
@@ -575,7 +575,7 @@ static void powerpc_excp_6xx(PowerPCCPU *cpu, int excp)
case POWERPC_EXCP_CRITICAL: /* Critical input */
break;
case POWERPC_EXCP_MCHECK: /* Machine check exception */
- if (msr_me == 0) {
+ if (!FIELD_EX64(env->msr, MSR, ME)) {
/*
* Machine check exception is not enabled. Enter
* checkstop state.
@@ -748,7 +748,7 @@ static void powerpc_excp_7xx(PowerPCCPU *cpu, int excp)
switch (excp) {
case POWERPC_EXCP_MCHECK: /* Machine check exception */
- if (msr_me == 0) {
+ if (!FIELD_EX64(env->msr, MSR, ME)) {
/*
* Machine check exception is not enabled. Enter
* checkstop state.
@@ -933,7 +933,7 @@ static void powerpc_excp_74xx(PowerPCCPU *cpu, int excp)
switch (excp) {
case POWERPC_EXCP_MCHECK: /* Machine check exception */
- if (msr_me == 0) {
+ if (!FIELD_EX64(env->msr, MSR, ME)) {
/*
* Machine check exception is not enabled. Enter
* checkstop state.
@@ -1128,7 +1128,7 @@ static void powerpc_excp_booke(PowerPCCPU *cpu, int excp)
srr1 = SPR_BOOKE_CSRR1;
break;
case POWERPC_EXCP_MCHECK: /* Machine check exception */
- if (msr_me == 0) {
+ if (!FIELD_EX64(env->msr, MSR, ME)) {
/*
* Machine check exception is not enabled. Enter
* checkstop state.
@@ -1366,7 +1366,7 @@ static void powerpc_excp_books(PowerPCCPU *cpu, int excp)
switch (excp) {
case POWERPC_EXCP_MCHECK: /* Machine check exception */
- if (msr_me == 0) {
+ if (!FIELD_EX64(env->msr, MSR, ME)) {
/*
* Machine check exception is not enabled. Enter
* checkstop state.
--
2.32.0
- [PULL 04/30] target/ppc: init 'rmmu_info' in kvm_get_radix_page_info(), (continued)
- [PULL 04/30] target/ppc: init 'rmmu_info' in kvm_get_radix_page_info(), Daniel Henrique Barboza, 2022/05/05
- [PULL 03/30] target/ppc: init 'sregs' in kvmppc_put_books_sregs(), Daniel Henrique Barboza, 2022/05/05
- [PULL 05/30] target/ppc: Fix BookE debug interrupt generation, Daniel Henrique Barboza, 2022/05/05
- [PULL 06/30] vhost-user: Use correct macro name TARGET_PPC64, Daniel Henrique Barboza, 2022/05/05
- [PULL 08/30] ppc/xive: Update the state of the External interrupt signal, Daniel Henrique Barboza, 2022/05/05
- [PULL 10/30] target/ppc: Remove unused msr_* macros, Daniel Henrique Barboza, 2022/05/05
- [PULL 07/30] ppc/xive: Always recompute the PIPR when pushing an OS context, Daniel Henrique Barboza, 2022/05/05
- [PULL 09/30] target/ppc: Remove fpscr_* macros from cpu.h, Daniel Henrique Barboza, 2022/05/05
- [PULL 14/30] target/ppc: Remove msr_ile macro, Daniel Henrique Barboza, 2022/05/05
- [PULL 15/30] target/ppc: Remove msr_ee macro, Daniel Henrique Barboza, 2022/05/05
- [PULL 18/30] target/ppc: Remove msr_me macro,
Daniel Henrique Barboza <=
- [PULL 16/30] target/ppc: Remove msr_ce macro, Daniel Henrique Barboza, 2022/05/05
- [PULL 20/30] target/ppc: Remove msr_fp macro, Daniel Henrique Barboza, 2022/05/05
- [PULL 11/30] target/ppc: Remove msr_pr macro, Daniel Henrique Barboza, 2022/05/05
- [PULL 12/30] target/ppc: Remove msr_le macro, Daniel Henrique Barboza, 2022/05/05
- [PULL 13/30] target/ppc: Remove msr_ds macro, Daniel Henrique Barboza, 2022/05/05
- [PULL 17/30] target/ppc: Remove msr_pow macro, Daniel Henrique Barboza, 2022/05/05
- [PULL 19/30] target/ppc: Remove msr_gs macro, Daniel Henrique Barboza, 2022/05/05
- [PULL 21/30] target/ppc: Remove msr_cm macro, Daniel Henrique Barboza, 2022/05/05
- [PULL 22/30] target/ppc: Remove msr_ir macro, Daniel Henrique Barboza, 2022/05/05
- [PULL 24/30] target/ppc: Remove msr_ep macro, Daniel Henrique Barboza, 2022/05/05