[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/10] target/ppc: 7xx: Set SRRs directly in exception code
From: |
Fabiano Rosas |
Subject: |
[PATCH 10/10] target/ppc: 7xx: Set SRRs directly in exception code |
Date: |
Thu, 3 Feb 2022 19:42:46 -0300 |
The 7xx CPUs don't have alternate/hypervisor Save and Restore
Registers, so we can set SRR0 and SRR1 directly.
Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>
---
target/ppc/excp_helper.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index 3872f3b7ad..0050c8447f 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -746,7 +746,6 @@ static void powerpc_excp_7xx(PowerPCCPU *cpu, int excp)
CPUState *cs = CPU(cpu);
CPUPPCState *env = &cpu->env;
target_ulong msr, new_msr, vector;
- int srr0, srr1;
if (excp <= POWERPC_EXCP_NONE || excp >= POWERPC_EXCP_NB) {
cpu_abort(cs, "Invalid PowerPC exception %d. Aborting\n", excp);
@@ -765,10 +764,6 @@ static void powerpc_excp_7xx(PowerPCCPU *cpu, int excp)
*/
new_msr = env->msr & ((target_ulong)1 << MSR_ME);
- /* target registers */
- srr0 = SPR_SRR0;
- srr1 = SPR_SRR1;
-
/*
* Hypervisor emulation assistance interrupt only exists on server
* arch 2.05 server or later.
@@ -907,10 +902,6 @@ static void powerpc_excp_7xx(PowerPCCPU *cpu, int excp)
cpu_abort(cs, "Trying to deliver HV exception (MSR) %d with "
"no HV support\n", excp);
}
- if (srr0 == SPR_HSRR0) {
- cpu_abort(cs, "Trying to deliver HV exception (HSRR) %d with "
- "no HV support\n", excp);
- }
}
/*
@@ -922,10 +913,10 @@ static void powerpc_excp_7xx(PowerPCCPU *cpu, int excp)
}
/* Save PC */
- env->spr[srr0] = env->nip;
+ env->spr[SPR_SRR0] = env->nip;
/* Save MSR */
- env->spr[srr1] = msr;
+ env->spr[SPR_SRR1] = msr;
powerpc_set_excp_state(cpu, vector, new_msr);
}
--
2.34.1
- [PATCH 02/10] target/ppc: Introduce powerpc_excp_7xx, (continued)
- [PATCH 02/10] target/ppc: Introduce powerpc_excp_7xx, Fabiano Rosas, 2022/02/03
- [PATCH 04/10] target/ppc: 7xx: Machine Check exception cleanup, Fabiano Rosas, 2022/02/03
- [PATCH 06/10] target/ppc: 7xx: Program exception cleanup, Fabiano Rosas, 2022/02/03
- [PATCH 05/10] target/ppc: 7xx: External interrupt cleanup, Fabiano Rosas, 2022/02/03
- [PATCH 03/10] target/ppc: Simplify powerpc_excp_7xx, Fabiano Rosas, 2022/02/03
- [PATCH 07/10] target/ppc: 7xx: System Call exception cleanup, Fabiano Rosas, 2022/02/03
- [PATCH 09/10] target/ppc: 7xx: Software TLB cleanup, Fabiano Rosas, 2022/02/03
- [PATCH 10/10] target/ppc: 7xx: Set SRRs directly in exception code,
Fabiano Rosas <=
- [PATCH 08/10] target/ppc: 7xx: System Reset cleanup, Fabiano Rosas, 2022/02/03
- Re: [PATCH 00/10] target/ppc: powerpc_excp improvements [7xx] (8/n), Cédric Le Goater, 2022/02/04