From 0d78f4a42b83424cb1794f96c366f1d9b79aab08 Mon Sep 17 00:00:00 2001 From: squidbus <175574877+squidbus@users.noreply.github.com> Date: Mon, 19 Oct 2026 01:26:19 -0700 Subject: [PATCH] tools: Rebase XenonRecomp --- MarathonRecomp/kernel/imports.cpp | 8 ++++---- tools/XenonRecomp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MarathonRecomp/kernel/imports.cpp b/MarathonRecomp/kernel/imports.cpp index 5c55cc3be..a542a909a 100644 --- a/MarathonRecomp/kernel/imports.cpp +++ b/MarathonRecomp/kernel/imports.cpp @@ -765,7 +765,7 @@ void RtlLeaveCriticalSection(XRTL_CRITICAL_SECTION* cs) void RtlEnterCriticalSection(XRTL_CRITICAL_SECTION* cs) { - uint32_t thisThread = g_ppcContext->r13.u32; + be thisThread = g_ppcContext->r13.u32; // printf("RtlEnterCriticalSection %x %x %x %x\n", thisThread, cs->OwningThread, cs->LockCount, cs->RecursionCount); assert(thisThread != NULL); @@ -773,7 +773,7 @@ void RtlEnterCriticalSection(XRTL_CRITICAL_SECTION* cs) while (true) { - uint32_t previousOwner = 0; + be previousOwner = 0; if (owningThread.compare_exchange_weak(previousOwner, thisThread) || previousOwner == thisThread) { @@ -1282,12 +1282,12 @@ void XexGetModuleHandle() bool RtlTryEnterCriticalSection(XRTL_CRITICAL_SECTION* cs) { // printf("RtlTryEnterCriticalSection\n"); - uint32_t thisThread = g_ppcContext->r13.u32; + be thisThread = g_ppcContext->r13.u32; assert(thisThread != NULL); std::atomic_ref owningThread(cs->OwningThread); - uint32_t previousOwner = 0; + be previousOwner = 0; if (owningThread.compare_exchange_weak(previousOwner, thisThread) || previousOwner == thisThread) { diff --git a/tools/XenonRecomp b/tools/XenonRecomp index c4aa9b646..e14693035 160000 --- a/tools/XenonRecomp +++ b/tools/XenonRecomp @@ -1 +1 @@ -Subproject commit c4aa9b646eb7b17e946e41b9d313dbb1279f6b01 +Subproject commit e146930350fd1986f0b53777f11063ad5b738eb8