[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 8/8] target/ppc: 405: System call exception cleanup
From: |
Fabiano Rosas |
Subject: |
[PATCH 8/8] target/ppc: 405: System call exception cleanup |
Date: |
Mon, 10 Jan 2022 15:15:46 -0300 |
There's no sc 1.
We also only used env->nip because of the vhyp code, so change to
'vector' now.
Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>
---
target/ppc/excp_helper.c | 23 +++--------------------
1 file changed, 3 insertions(+), 20 deletions(-)
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index f7b9af5065..ab298d0d8f 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -398,7 +398,7 @@ static void powerpc_excp_40x(PowerPCCPU *cpu, int excp)
CPUPPCState *env = &cpu->env;
int excp_model = env->excp_model;
target_ulong msr, new_msr, vector;
- int srr0, srr1, lev = -1;
+ int srr0, srr1;
if (excp <= POWERPC_EXCP_NONE || excp >= POWERPC_EXCP_NB) {
cpu_abort(cs, "Invalid PowerPC exception %d. Aborting\n", excp);
@@ -518,30 +518,13 @@ static void powerpc_excp_40x(PowerPCCPU *cpu, int excp)
}
break;
case POWERPC_EXCP_SYSCALL: /* System call exception */
- lev = env->error_code;
-
- if ((lev == 1) && cpu->vhyp) {
- dump_hcall(env);
- } else {
- dump_syscall(env);
- }
+ dump_syscall(env);
/*
* We need to correct the NIP which in this case is supposed
* to point to the next instruction
*/
- env->nip += 4;
-
- /* "PAPR mode" built-in hypercall emulation */
- if ((lev == 1) && cpu->vhyp) {
- PPCVirtualHypervisorClass *vhc =
- PPC_VIRTUAL_HYPERVISOR_GET_CLASS(cpu->vhyp);
- vhc->hypercall(cpu->vhyp, cpu);
- return;
- }
- if (lev == 1) {
- new_msr |= (target_ulong)MSR_HVB;
- }
+ vector += 4;
break;
case POWERPC_EXCP_FPU: /* Floating-point unavailable exception */
case POWERPC_EXCP_APU: /* Auxiliary processor unavailable */
--
2.33.1
- Re: [PATCH 2/8] target/ppc: 405: Add missing exception handlers, (continued)
[PATCH 5/8] target/ppc: 405: Critical exceptions cleanup, Fabiano Rosas, 2022/01/10
[PATCH 7/8] target/ppc: 405: External exception cleanup, Fabiano Rosas, 2022/01/10
[PATCH 3/8] target/ppc: Introduce powerpc_excp_40x, Fabiano Rosas, 2022/01/10
[PATCH 6/8] target/ppc: 405: Machine check exception cleanup, Fabiano Rosas, 2022/01/10
[PATCH 8/8] target/ppc: 405: System call exception cleanup,
Fabiano Rosas <=
Re: [PATCH 0/8] target/ppc: powerpc_excp improvements [40x] (3/n), Cédric Le Goater, 2022/01/11