[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 09/10] target/ppc: 7xx: Software TLB cleanup
From: |
Fabiano Rosas |
Subject: |
[PATCH v2 09/10] target/ppc: 7xx: Software TLB cleanup |
Date: |
Fri, 4 Feb 2022 14:34:29 -0300 |
This code applies only to the 7xx CPUs, so we can remove the switch
statement.
Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>
---
target/ppc/excp_helper.c | 26 ++++++--------------------
1 file changed, 6 insertions(+), 20 deletions(-)
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index 2bbfc25d2b..dd373a4d5b 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -745,7 +745,6 @@ static void powerpc_excp_7xx(PowerPCCPU *cpu, int excp)
{
CPUState *cs = CPU(cpu);
CPUPPCState *env = &cpu->env;
- int excp_model = env->excp_model;
target_ulong msr, new_msr, vector;
int srr0, srr1;
@@ -904,26 +903,13 @@ static void powerpc_excp_7xx(PowerPCCPU *cpu, int excp)
case POWERPC_EXCP_IFTLB: /* Instruction fetch TLB error */
case POWERPC_EXCP_DLTLB: /* Data load TLB miss */
case POWERPC_EXCP_DSTLB: /* Data store TLB miss */
- switch (excp_model) {
- case POWERPC_EXCP_6xx:
- /* Swap temporary saved registers with GPRs */
- if (!(new_msr & ((target_ulong)1 << MSR_TGPR))) {
- new_msr |= (target_ulong)1 << MSR_TGPR;
- hreg_swap_gpr_tgpr(env);
- }
- /* fall through */
- case POWERPC_EXCP_7xx:
- ppc_excp_debug_sw_tlb(env, excp);
+ ppc_excp_debug_sw_tlb(env, excp);
+
+ msr |= env->crf[0] << 28;
+ msr |= env->error_code; /* key, D/I, S/L bits */
+ /* Set way using a LRU mechanism */
+ msr |= ((env->last_way + 1) & (env->nb_ways - 1)) << 17;
- msr |= env->crf[0] << 28;
- msr |= env->error_code; /* key, D/I, S/L bits */
- /* Set way using a LRU mechanism */
- msr |= ((env->last_way + 1) & (env->nb_ways - 1)) << 17;
- break;
- default:
- cpu_abort(cs, "Invalid TLB miss exception\n");
- break;
- }
break;
case POWERPC_EXCP_IABR: /* Instruction address breakpoint */
case POWERPC_EXCP_SMI: /* System management interrupt */
--
2.34.1
- [PATCH v2 00/10] target/ppc: powerpc_excp improvements [7xx] (8/n), Fabiano Rosas, 2022/02/04
- [PATCH v2 02/10] target/ppc: Introduce powerpc_excp_7xx, Fabiano Rosas, 2022/02/04
- [PATCH v2 03/10] target/ppc: Simplify powerpc_excp_7xx, Fabiano Rosas, 2022/02/04
- [PATCH v2 10/10] target/ppc: 7xx: Set SRRs directly in exception code, Fabiano Rosas, 2022/02/04
- [PATCH v2 06/10] target/ppc: 7xx: Program exception cleanup, Fabiano Rosas, 2022/02/04
- [PATCH v2 09/10] target/ppc: 7xx: Software TLB cleanup,
Fabiano Rosas <=
- [PATCH v2 01/10] target/ppc: Merge 7x5 and 7x0 exception model IDs, Fabiano Rosas, 2022/02/04
- [PATCH v2 07/10] target/ppc: 7xx: System Call exception cleanup, Fabiano Rosas, 2022/02/04
- [PATCH v2 05/10] target/ppc: 7xx: External interrupt cleanup, Fabiano Rosas, 2022/02/04
- [PATCH v2 08/10] target/ppc: 7xx: System Reset cleanup, Fabiano Rosas, 2022/02/04
- [PATCH v2 04/10] target/ppc: 7xx: Machine Check exception cleanup, Fabiano Rosas, 2022/02/04
- Re: [PATCH v2 00/10] target/ppc: powerpc_excp improvements [7xx] (8/n), Cédric Le Goater, 2022/02/09