From 2b607dde0de12348b3ce71dc92b062e739e9cf00 Mon Sep 17 00:00:00 2001
From: kittennbfive <58293822+kittennbfive@users.noreply.github.com>
Date: Fri, 11 Apr 2025 16:05:09 +0000
Subject: [PATCH] fix for #2153

Currently svc $n always passes intno 2 to the hook, this PR should fix this.
---
 qemu/accel/tcg/cpu-exec.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/qemu/accel/tcg/cpu-exec.c b/qemu/accel/tcg/cpu-exec.c
index 09148f1dbc..d57e47bb78 100644
--- a/qemu/accel/tcg/cpu-exec.c
+++ b/qemu/accel/tcg/cpu-exec.c
@@ -397,6 +397,10 @@ static inline bool cpu_handle_exception(CPUState *cpu, int *ret)
 #if defined(TARGET_PPC)
         CPUPPCState *env = &(POWERPC_CPU(uc->cpu)->env);
         env->nip += 4;
+#endif
+#if defined(TARGET_ARM)
+        CPUARMState *env = &(ARM_CPU(uc->cpu)->env);
+        cpu->exception_index=env->exception.syndrome&0xff; //save svc call number so it will be passed to uc-hook
 #endif
         // Unicorn: call registered interrupt callbacks
         catched = false;