From d0407b35746cc4f50f2ca8239f5a281957ca1c30 Mon Sep 17 00:00:00 2001
From: Andrew Fasano <fasano@mit.edu>
Date: Tue, 4 Jun 2024 13:02:42 -0400
Subject: [PATCH] Callwitharg: fix argument parsing for aarch64

---
 panda/plugins/callwitharg/callwitharg.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/panda/plugins/callwitharg/callwitharg.cpp b/panda/plugins/callwitharg/callwitharg.cpp
index e5dccddffaa..f0b9f0114ed 100644
--- 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];