Skip to content

tools: Rebase XenonRecomp #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
squidbus merged 1 commit into from
Oct 19, 2026
Merged

tools: Rebase XenonRecomp #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions MarathonRecomp/kernel/imports.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,15 +765,15 @@ void RtlLeaveCriticalSection(XRTL_CRITICAL_SECTION* cs)

void RtlEnterCriticalSection(XRTL_CRITICAL_SECTION* cs)
{
uint32_t thisThread = g_ppcContext->r13.u32;
be<uint32_t> thisThread = g_ppcContext->r13.u32;
// printf("RtlEnterCriticalSection %x %x %x %x\n", thisThread, cs->OwningThread, cs->LockCount, cs->RecursionCount);
assert(thisThread != NULL);

std::atomic_ref owningThread(cs->OwningThread);

while (true)
{
uint32_t previousOwner = 0;
be<uint32_t> previousOwner = 0;

if (owningThread.compare_exchange_weak(previousOwner, thisThread) || previousOwner == thisThread)
{
Expand Down Expand Up @@ -1282,12 +1282,12 @@ void XexGetModuleHandle()
bool RtlTryEnterCriticalSection(XRTL_CRITICAL_SECTION* cs)
{
// printf("RtlTryEnterCriticalSection\n");
uint32_t thisThread = g_ppcContext->r13.u32;
be<uint32_t> thisThread = g_ppcContext->r13.u32;
assert(thisThread != NULL);

std::atomic_ref owningThread(cs->OwningThread);

uint32_t previousOwner = 0;
be<uint32_t> previousOwner = 0;

if (owningThread.compare_exchange_weak(previousOwner, thisThread) || previousOwner == thisThread)
{
Expand Down
2 changes: 1 addition & 1 deletion tools/XenonRecomp
Open in desktop
Submodule XenonRecomp updated 9 files
+4 −2 README.md
+35 −13 XenonRecomp/recompiler.cpp
+6 −6 XenonRecomp/recompiler_config.cpp
+2 −1 XenonUtils/image.h
+1 −6 XenonUtils/ppc_context.h
+28 −3 XenonUtils/xbox.h
+69 −6 XenonUtils/xex.cpp
+58 −2 XenonUtils/xex_patcher.cpp
+2 −0 XenonUtils/xex_patcher.h
Loading