[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 8/9] target/ppc: powerpc_excp: Move AIL under a Book3s block
From: |
Fabiano Rosas |
Subject: |
[PATCH 8/9] target/ppc: powerpc_excp: Move AIL under a Book3s block |
Date: |
Mon, 3 Jan 2022 19:07:45 -0300 |
AIL only applies for Book3s CPUs, so move it along with ILE. This
moves ILE further down in the file because the AIL function can alter
vector so we cannot move it up.
Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>
---
target/ppc/excp_helper.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index d7e087f2f6..a4787c3ae2 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -766,14 +766,6 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp)
}
}
- /*
- * We preserve MSR_LE, but some CPUs can take interrupts in a
- * different endianness.
- */
- if (excp_model >= POWERPC_EXCP_970) {
- ppc_excp_toggle_ile(cpu, &new_msr);
- }
-
#if defined(TARGET_PPC64)
if (excp_model == POWERPC_EXCP_BOOKE) {
if (env->spr[SPR_BOOKE_EPCR] & EPCR_ICM) {
@@ -799,8 +791,16 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp)
env->spr[srr1] = msr;
}
- /* This can update new_msr and vector if AIL applies */
- ppc_excp_apply_ail(cpu, excp_model, excp, msr, &new_msr, &vector);
+ if (excp_model >= POWERPC_EXCP_970) {
+ /*
+ * We preserve MSR_LE, but some CPUs can take interrupts in a
+ * different endianness.
+ */
+ ppc_excp_toggle_ile(cpu, &new_msr);
+
+ /* This can update new_msr and vector if AIL applies */
+ ppc_excp_apply_ail(cpu, excp_model, excp, msr, &new_msr, &vector);
+ }
powerpc_set_excp_state(cpu, vector, new_msr);
}
--
2.33.1
- Re: [PATCH 2/9] target/ppc: powerpc_excp: Keep 60x soft MMU logs active, (continued)
- [PATCH 4/9] target/ppc: Add HV support to ppc_interrupts_little_endian, Fabiano Rosas, 2022/01/03
- [PATCH 8/9] target/ppc: powerpc_excp: Move AIL under a Book3s block,
Fabiano Rosas <=
- [PATCH 9/9] target/ppc: Introduce a wrapper for powerpc_excp, Fabiano Rosas, 2022/01/03
- [PATCH 6/9] target/ppc: powerpc_excp: Preserve MSR_LE bit, Fabiano Rosas, 2022/01/03
- [PATCH 7/9] target/ppc: powerpc_excp: Move ILE setting into a function, Fabiano Rosas, 2022/01/03