Skip to content

Port some fixes from MarathonRecomp #160

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Port some fixes from MarathonRecomp #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6675ec
XenonRecomp: Fix compiler warnings about comparing uint32_t to NULL
squidbus Aug 7, 2025
aa65a78
XenonUtils: Fix image size for basic compressed XEX and expose resour…
squidbus Aug 7, 2025
5177661
XenonUtils: Use big endian for XRTL_CRITICAL_SECTION fields.
squidbus Aug 7, 2025
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
16 changes: 8 additions & 8 deletions XenonRecomp/recompiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ bool Recompiler::Recompile(
auto printMidAsmHook = [&]()
{
bool returnsBool = midAsmHook->second.returnOnFalse || midAsmHook->second.returnOnTrue ||
midAsmHook->second.jumpAddressOnFalse != NULL || midAsmHook->second.jumpAddressOnTrue != NULL;
midAsmHook->second.jumpAddressOnFalse != 0 || midAsmHook->second.jumpAddressOnTrue != 0;

print("\t");
if (returnsBool)
Expand Down Expand Up @@ -489,7 +489,7 @@ bool Recompiler::Recompile(

if (midAsmHook->second.returnOnTrue)
println("\t\treturn;");
else if (midAsmHook->second.jumpAddressOnTrue != NULL)
else if (midAsmHook->second.jumpAddressOnTrue != 0)
println("\t\tgoto loc_{:X};", midAsmHook->second.jumpAddressOnTrue);

println("\t}}");
Expand All @@ -498,7 +498,7 @@ bool Recompiler::Recompile(

if (midAsmHook->second.returnOnFalse)
println("\t\treturn;");
else if (midAsmHook->second.jumpAddressOnFalse != NULL)
else if (midAsmHook->second.jumpAddressOnFalse != 0)
println("\t\tgoto loc_{:X};", midAsmHook->second.jumpAddressOnFalse);

println("\t}}");
Expand All @@ -509,7 +509,7 @@ bool Recompiler::Recompile(

if (midAsmHook->second.ret)
println("\treturn;");
else if (midAsmHook->second.jumpAddress != NULL)
else if (midAsmHook->second.jumpAddress != 0)
println("\tgoto loc_{:X};", midAsmHook->second.jumpAddress);
}
};
Expand Down Expand Up @@ -2314,7 +2314,7 @@ bool Recompiler::Recompile(const Function& fn)
if (midAsmHook != config.midAsmHooks.end())
{
if (midAsmHook->second.returnOnFalse || midAsmHook->second.returnOnTrue ||
midAsmHook->second.jumpAddressOnFalse != NULL || midAsmHook->second.jumpAddressOnTrue != NULL)
midAsmHook->second.jumpAddressOnFalse != 0 || midAsmHook->second.jumpAddressOnTrue != 0)
{
print("extern bool ");
}
Expand Down Expand Up @@ -2361,11 +2361,11 @@ bool Recompiler::Recompile(const Function& fn)

println(");\n");

if (midAsmHook->second.jumpAddress != NULL)
if (midAsmHook->second.jumpAddress != 0)
labels.emplace(midAsmHook->second.jumpAddress);
if (midAsmHook->second.jumpAddressOnTrue != NULL)
if (midAsmHook->second.jumpAddressOnTrue != 0)
labels.emplace(midAsmHook->second.jumpAddressOnTrue);
if (midAsmHook->second.jumpAddressOnFalse != NULL)
if (midAsmHook->second.jumpAddressOnFalse != 0)
labels.emplace(midAsmHook->second.jumpAddressOnFalse);
}
}
Expand Down
12 changes: 6 additions & 6 deletions XenonRecomp/recompiler_config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,16 @@ void RecompilerConfig::Load(const std::string_view& configFilePath)
midAsmHook.jumpAddressOnTrue = table["jump_address_on_true"].value_or(0u);
midAsmHook.jumpAddressOnFalse = table["jump_address_on_false"].value_or(0u);

if ((midAsmHook.ret && midAsmHook.jumpAddress != NULL) ||
(midAsmHook.returnOnTrue && midAsmHook.jumpAddressOnTrue != NULL) ||
(midAsmHook.returnOnFalse && midAsmHook.jumpAddressOnFalse != NULL))
if ((midAsmHook.ret && midAsmHook.jumpAddress != 0) ||
(midAsmHook.returnOnTrue && midAsmHook.jumpAddressOnTrue != 0) ||
(midAsmHook.returnOnFalse && midAsmHook.jumpAddressOnFalse != 0))
{
fmt::println("{}: can't return and jump at the same time", midAsmHook.name);
}

if ((midAsmHook.ret || midAsmHook.jumpAddress != NULL) &&
(midAsmHook.returnOnFalse != NULL || midAsmHook.returnOnTrue != NULL ||
midAsmHook.jumpAddressOnFalse != NULL || midAsmHook.jumpAddressOnTrue != NULL))
if ((midAsmHook.ret || midAsmHook.jumpAddress != 0) &&
(midAsmHook.returnOnFalse != 0 || midAsmHook.returnOnTrue != 0 ||
midAsmHook.jumpAddressOnFalse != 0 || midAsmHook.jumpAddressOnTrue != 0))
{
fmt::println("{}: can't mix direct and conditional return/jump", midAsmHook.name);
}
Expand Down
3 changes: 3 additions & 0 deletions XenonUtils/image.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ struct Image
size_t base{};
uint32_t size{};

uint32_t resource_offset{};
uint32_t resource_size{};

size_t entry_point{};
std::set<Section, SectionComparer> sections{};
SymbolTable symbols{};
Expand Down
33 changes: 29 additions & 4 deletions XenonUtils/xbox.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,32 @@ struct be
set(v);
return *this;
}

be& operator++ ()
{
set(get() + 1);
return *this;
}

be operator++ (int)
{
be old = *this;
set(get() + 1);
return old;
}

be& operator-- ()
{
set(get() - 1);
return *this;
}

be operator-- (int)
{
be old = *this;
set(get() - 1);
return old;
}
};

extern "C" void* MmGetHostAddress(uint32_t ptr);
Expand Down Expand Up @@ -198,13 +224,12 @@ typedef struct _XDISPATCHER_HEADER
XLIST_ENTRY WaitListHead;
} XDISPATCHER_HEADER, * XPDISPATCHER_HEADER;

// These variables are never accessed in guest code, we can safely use them in little endian
typedef struct _XRTL_CRITICAL_SECTION
{
XDISPATCHER_HEADER Header;
int32_t LockCount;
int32_t RecursionCount;
uint32_t OwningThread;
be<int32_t> LockCount;
be<int32_t> RecursionCount;
be<uint32_t> OwningThread;
} XRTL_CRITICAL_SECTION;

typedef struct _XANSI_STRING {
Expand Down
9 changes: 8 additions & 1 deletion XenonUtils/xex.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ Image Xex2LoadImage(const uint8_t* data, size_t dataSize)
}

image.data = std::move(result);
image.size = security->imageSize;
image.size = imageSize;

// Map image
const auto* dosHeader = reinterpret_cast<IMAGE_DOS_HEADER*>(image.data.get());
Expand All @@ -270,6 +270,13 @@ Image Xex2LoadImage(const uint8_t* data, size_t dataSize)
{
image.base = *reinterpret_cast<const be<uint32_t>*>(xex2BaseAddressPtr);
}
const void* xex2ResourceInfoPtr = getOptHeaderPtr(data, XEX_HEADER_RESOURCE_INFO);
if (xex2ResourceInfoPtr != nullptr)
{
const Xex2ResourceInfo* resourceInfo = reinterpret_cast<const Xex2ResourceInfo*>(xex2ResourceInfoPtr);
image.resource_offset = resourceInfo->offset;
image.resource_size = resourceInfo->sizeOfData;
}
const void* xex2EntryPointPtr = getOptHeaderPtr(data, XEX_HEADER_ENTRY_POINT);
if (xex2EntryPointPtr != nullptr)
{
Expand Down