[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 5/9] target/ppc: Simplify syscall exception handlers
From: |
BALATON Zoltan |
Subject: |
[PATCH v6 5/9] target/ppc: Simplify syscall exception handlers |
Date: |
Thu, 22 Feb 2024 12:33:59 +0100 (CET) |
After previous changes the hypercall handling in 7xx and 74xx
exception handlers can be folded into one if statement to simpilfy
this code. Also add "unlikely" to mark the less freqiently used branch
for the compiler.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
---
target/ppc/excp_helper.c | 24 ++++++++----------------
1 file changed, 8 insertions(+), 16 deletions(-)
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index 411d67376c..035a9fd968 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -762,26 +762,22 @@ static void powerpc_excp_7xx(PowerPCCPU *cpu, int excp)
case POWERPC_EXCP_SYSCALL: /* System call exception */
{
int lev = env->error_code;
-
- if (lev == 1 && cpu->vhyp) {
- dump_hcall(env);
- } else {
- dump_syscall(env);
- }
/*
* The Virtual Open Firmware (VOF) relies on the 'sc 1'
* instruction to communicate with QEMU. The pegasos2 machine
* uses VOF and the 7xx CPUs, so although the 7xx don't have
* HV mode, we need to keep hypercall support.
*/
- if (lev == 1 && cpu->vhyp) {
+ if (unlikely(lev == 1 && cpu->vhyp)) {
PPCVirtualHypervisorClass *vhc =
PPC_VIRTUAL_HYPERVISOR_GET_CLASS(cpu->vhyp);
+ dump_hcall(env);
vhc->hypercall(cpu->vhyp, cpu);
powerpc_reset_excp_state(cpu);
return;
+ } else {
+ dump_syscall(env);
}
-
break;
}
case POWERPC_EXCP_FPU: /* Floating-point unavailable exception */
@@ -907,26 +903,22 @@ static void powerpc_excp_74xx(PowerPCCPU *cpu, int excp)
case POWERPC_EXCP_SYSCALL: /* System call exception */
{
int lev = env->error_code;
-
- if (lev == 1 && cpu->vhyp) {
- dump_hcall(env);
- } else {
- dump_syscall(env);
- }
/*
* The Virtual Open Firmware (VOF) relies on the 'sc 1'
* instruction to communicate with QEMU. The pegasos2 machine
* uses VOF and the 74xx CPUs, so although the 74xx don't have
* HV mode, we need to keep hypercall support.
*/
- if (lev == 1 && cpu->vhyp) {
+ if (unlikely(lev == 1 && cpu->vhyp)) {
PPCVirtualHypervisorClass *vhc =
PPC_VIRTUAL_HYPERVISOR_GET_CLASS(cpu->vhyp);
+ dump_hcall(env);
vhc->hypercall(cpu->vhyp, cpu);
powerpc_reset_excp_state(cpu);
return;
+ } else {
+ dump_syscall(env);
}
-
break;
}
case POWERPC_EXCP_FPU: /* Floating-point unavailable exception */
--
2.30.9
- [PATCH v6 0/9] Misc clean ups to target/ppc exception handling, BALATON Zoltan, 2024/02/22
- [PATCH v6 3/9] target/ppc: Fix gen_sc to use correct nip, BALATON Zoltan, 2024/02/22
- [PATCH v6 1/9] target/ppc: Use env_cpu for cpu_abort in excp_helper, BALATON Zoltan, 2024/02/22
- [PATCH v6 6/9] target/ppc: Clean up ifdefs in excp_helper.c, part 1, BALATON Zoltan, 2024/02/22
- [PATCH v6 7/9] target/ppc: Clean up ifdefs in excp_helper.c, part 2, BALATON Zoltan, 2024/02/22
- [PATCH v6 5/9] target/ppc: Simplify syscall exception handlers,
BALATON Zoltan <=
- Re: [PATCH v6 5/9] target/ppc: Simplify syscall exception handlers, Nicholas Piggin, 2024/02/27
- [PATCH v6 8/9] target/ppc: Clean up ifdefs in excp_helper.c, part 3, BALATON Zoltan, 2024/02/22
- [PATCH v6 2/9] target/ppc: Readability improvements in exception handlers, BALATON Zoltan, 2024/02/22
- [PATCH v6 9/9] target/ppc: Remove interrupt handler wrapper functions, BALATON Zoltan, 2024/02/22
- [PATCH v6 4/9] target/ppc: Move patching nip from exception handler to helper_scv, BALATON Zoltan, 2024/02/22