Callwitharg: fix argument parsing for aarch64

panda-re · Jun 5, 2024 · d0407b3 · d0407b3
1 parent 4eb0775
commit d0407b3
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/panda/plugins/callwitharg/callwitharg.cpp b/panda/plugins/callwitharg/callwitharg.cpp
@@ -98,10 +98,15 @@ typedef struct {
 } Arguments;
 
 bool _get_args_for_arch(CPUArchState *env, Arguments *args, int N) {
-#ifdef TARGET_ARM
+#if defined(TARGET_ARM) && !defined(TARGET_AARCH64)
   for (int i = 0; i < N; ++i) {
     args->args[i] = env->regs[i];
   }
+#elif defined(TARGET_AARCH64)
+  for (int i = 0; i < N; ++i) {
+    // aarch64 uses xregs over regs
+    args->args[i] = env->xregs[i];
+  }
 #elif defined(TARGET_MIPS)
   for (int i = 0; i < N; ++i) {
     args->args[i] = env->active_tc.gpr[4 + i];