Hello_User/XenonRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/XenonRecomp.git synced 2025-11-04 06:47:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for placing midasm hooks after instructions.

Browse Source
This commit is contained in:
Skyth
2025-01-22 19:58:00 +03:00
parent 87e350906b
commit 3280a7cf9f
3 changed files with 73 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
XenonRecomp/recompiler.cpp
View File

@@ -333,7 +333,8 @@ bool Recompiler::Recompile(
}; };
auto midAsmHook = config.midAsmHooks.find(base); auto midAsmHook = config.midAsmHooks.find(base);
if (midAsmHook != config.midAsmHooks.end())
auto printMidAsmHook = [&]()
{ {
bool returnsBool = midAsmHook->second.returnOnFalse || midAsmHook->second.returnOnTrue || bool returnsBool = midAsmHook->second.returnOnFalse || midAsmHook->second.returnOnTrue ||
midAsmHook->second.jumpAddressOnFalse != NULL || midAsmHook->second.jumpAddressOnTrue != NULL; midAsmHook->second.jumpAddressOnFalse != NULL || midAsmHook->second.jumpAddressOnTrue != NULL;
@@ -410,7 +411,10 @@ bool Recompiler::Recompile(
else if (midAsmHook->second.jumpAddress != NULL) else if (midAsmHook->second.jumpAddress != NULL)
println("\tgoto loc_{:X};", midAsmHook->second.jumpAddress); println("\tgoto loc_{:X};", midAsmHook->second.jumpAddress);
} }
} };
if (midAsmHook != config.midAsmHooks.end() && !midAsmHook->second.afterInstruction)
printMidAsmHook();
int id = insn.opcode->id; int id = insn.opcode->id;
@@ -2149,6 +2153,9 @@ bool Recompiler::Recompile(
} }
#endif #endif
if (midAsmHook != config.midAsmHooks.end() && midAsmHook->second.afterInstruction)
printMidAsmHook();
return true; return true;
} }

2
XenonRecomp/recompiler_config.cpp
View File

@@ -118,6 +118,8 @@ void RecompilerConfig::Load(const std::string_view& configFilePath)
fmt::println("{}: can't mix direct and conditional return/jump", midAsmHook.name); fmt::println("{}: can't mix direct and conditional return/jump", midAsmHook.name);
} }
midAsmHook.afterInstruction = table["after_instruction"].value_or(false);
midAsmHooks.emplace(*table["address"].value<uint32_t>(), std::move(midAsmHook)); midAsmHooks.emplace(*table["address"].value<uint32_t>(), std::move(midAsmHook));
} }
} }

2
XenonRecomp/recompiler_config.h
View File

@@ -18,6 +18,8 @@ struct RecompilerMidAsmHook
uint32_t jumpAddress = 0; uint32_t jumpAddress = 0;
uint32_t jumpAddressOnTrue = 0; uint32_t jumpAddressOnTrue = 0;
uint32_t jumpAddressOnFalse = 0; uint32_t jumpAddressOnFalse = 0;
bool afterInstruction = false;
}; };
struct RecompilerConfig struct RecompilerConfig