From 36dc6dd864de83ff64c5a18ab57b8edcdab66a64 Mon Sep 17 00:00:00 2001
From: Ben Vanik <ben.vanik@gmail.com>
Date: Wed, 3 Jun 2015 17:59:25 -0700
Subject: [PATCH] Logging APC delivery.

---
 src/xenia/kernel/objects/xthread.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/xenia/kernel/objects/xthread.cc b/src/xenia/kernel/objects/xthread.cc
index 5a2f00546..289f6e482 100644
--- a/src/xenia/kernel/objects/xthread.cc
+++ b/src/xenia/kernel/objects/xthread.cc
@@ -510,6 +510,8 @@ void XThread::DeliverAPCs(void* data) {
     auto apc = reinterpret_cast<XAPC*>(memory->TranslateVirtual(apc_ptr));
     bool needs_freeing = apc->kernel_routine == XAPC::kDummyKernelRoutine;
 
+    XELOGD("Delivering APC to %.8X", uint32_t(apc->normal_routine));
+
     // Mark as uninserted so that it can be reinserted again by the routine.
     apc->enqueued = 0;
 
@@ -542,12 +544,14 @@ void XThread::DeliverAPCs(void* data) {
     if (normal_routine) {
       thread->UnlockApc(false);
       // normal_routine(normal_context, system_arg1, system_arg2)
-      uint64_t normal_args[] = {normal_context, apc->arg1, apc->arg2};
+      uint64_t normal_args[] = {normal_context, arg1, arg2};
       processor->Execute(thread->thread_state(), normal_routine, normal_args,
                          xe::countof(normal_args));
       thread->LockApc();
     }
 
+    XELOGD("Completed delivery of APC to %.8X", uint32_t(apc->normal_routine));
+
     // If special, free it.
     if (needs_freeing) {
       memory->SystemHeapFree(apc_ptr);