[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/20] target/ppc: Substitute msr_ds macro with new M_MSR_DS macr
From: |
Víctor Colombo |
Subject: |
[PATCH 05/20] target/ppc: Substitute msr_ds macro with new M_MSR_DS macro |
Date: |
Fri, 22 Apr 2022 15:54:35 -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/mmu_common.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index d25a778b7c..e81f1f2d68 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -354,6 +354,7 @@ typedef enum {
#define MSR_LE 0 /* Little-endian mode 1 hflags */
#define M_MSR_PR (1ull << MSR_PR)
+#define M_MSR_DS (1ull << MSR_DS)
#define M_MSR_LE (1ull << MSR_LE)
/* PMU bits */
@@ -484,7 +485,6 @@ typedef enum {
#define msr_ep ((env->msr >> MSR_EP) & 1)
#define msr_ir ((env->msr >> MSR_IR) & 1)
#define msr_dr ((env->msr >> MSR_DR) & 1)
-#define msr_ds ((env->msr >> MSR_DS) & 1)
#define msr_ts ((env->msr >> MSR_TS1) & 3)
#define DBCR0_ICMP (1 << 27)
diff --git a/target/ppc/mmu_common.c b/target/ppc/mmu_common.c
index fef2b11733..b7865d24b2 100644
--- a/target/ppc/mmu_common.c
+++ b/target/ppc/mmu_common.c
@@ -768,7 +768,7 @@ static bool mmubooke206_get_as(CPUPPCState *env,
*pr_out = !!(epidr & EPID_EPR);
return true;
} else {
- *as_out = msr_ds;
+ *as_out = env->msr & M_MSR_DS;
*pr_out = env->msr & M_MSR_PR;
return false;
}
--
2.25.1
- Re: [PATCH 02/20] target/ppc: Remove unused msr_* macros, (continued)
- [PATCH 03/20] target/ppc: Substitute msr_pr macro with new M_MSR_PR macro, Víctor Colombo, 2022/04/22
- Re: [PATCH 03/20] target/ppc: Substitute msr_pr macro with new M_MSR_PR macro, Richard Henderson, 2022/04/26
- Re: [PATCH 03/20] target/ppc: Substitute msr_pr macro with new M_MSR_PR macro, Víctor Colombo, 2022/04/27
- Re: [PATCH 03/20] target/ppc: Substitute msr_pr macro with new M_MSR_PR macro, Cédric Le Goater, 2022/04/28
- Re: [PATCH 03/20] target/ppc: Substitute msr_pr macro with new M_MSR_PR macro, Víctor Colombo, 2022/04/28
- Re: [PATCH 03/20] target/ppc: Substitute msr_pr macro with new M_MSR_PR macro, Richard Henderson, 2022/04/28
- Re: [PATCH 03/20] target/ppc: Substitute msr_pr macro with new M_MSR_PR macro, BALATON Zoltan, 2022/04/28
[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 <=
[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