Hello_User/XenonRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/XenonRecomp.git synced 2025-07-22 13:07:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix weird usage of the base variable.

Browse Source
This commit is contained in:
Skyth
2024-09-23 15:33:29 +03:00
parent 255ff2170e
commit 175c0de2ac
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
PowerRecomp/recompiler.cpp
View File

@@ -158,7 +158,7 @@ bool Recompiler::Recompile(const Function& fn, uint32_t base, const ppc_insn& in
if (label < fn.base || label >= fn.base + fn.size) if (label < fn.base || label >= fn.base + fn.size)
{ {
println("\t\t// ERROR: 0x{:X}", label); println("\t\t// ERROR: 0x{:X}", label);
std::println("ERROR: Switch case at {:X} is trying to jump outside function: {:X}", base - 4, label); std::println("ERROR: Switch case at {:X} is trying to jump outside function: {:X}", base, label);
println("\t\treturn;"); println("\t\treturn;");
} }
else else
@@ -181,7 +181,7 @@ bool Recompiler::Recompile(const Function& fn, uint32_t base, const ppc_insn& in
break; break;
case PPC_INST_BCTRL: case PPC_INST_BCTRL:
println("\tctx.lr = 0x{:X};", base); println("\tctx.lr = 0x{:X};", base + 4);
println("\tctx.fn[ctx.ctr.u32 / 4](ctx, base);"); println("\tctx.fn[ctx.ctr.u32 / 4](ctx, base);");
break; break;
@@ -231,7 +231,7 @@ bool Recompiler::Recompile(const Function& fn, uint32_t base, const ppc_insn& in
break; break;
case PPC_INST_BL: case PPC_INST_BL:
println("\tctx.lr = 0x{:X};", base); println("\tctx.lr = 0x{:X};", base + 4);
printFunctionCall(insn.operands[0]); printFunctionCall(insn.operands[0]);
break; break;
@@ -1495,7 +1495,7 @@ bool Recompiler::Recompile(const Function& fn, uint32_t base, const ppc_insn& in
{ {
case 0: // D3D color case 0: // D3D color
if (insn.operands[3] != 1 || insn.operands[4] != 3) if (insn.operands[3] != 1 || insn.operands[4] != 3)
std::println("Unexpected D3D color pack instruction at {:X}", base - 4); std::println("Unexpected D3D color pack instruction at {:X}", base);
for (size_t i = 0; i < 4; i++) for (size_t i = 0; i < 4; i++)
{ {
@@ -1732,7 +1732,7 @@ bool Recompiler::Recompile(const Function& fn, uint32_t base, const ppc_insn& in
{ {
int lastLine = out.find_last_of('\n', out.size() - 2); int lastLine = out.find_last_of('\n', out.size() - 2);
if (out.find("ctx.cr", lastLine + 1) == std::string::npos) if (out.find("ctx.cr", lastLine + 1) == std::string::npos)
std::println("{} at {:X} has RC bit enabled but no comparison was generated", insn.opcode->name, base - 4); std::println("{} at {:X} has RC bit enabled but no comparison was generated", insn.opcode->name, base);
} }
#endif #endif
@@ -1770,24 +1770,25 @@ bool Recompiler::Recompile(const Function& fn)
ppc::Disassemble(data, 4, base, insn); ppc::Disassemble(data, 4, base, insn);
base += 4;
++data;
if (insn.opcode == nullptr) if (insn.opcode == nullptr)
{ {
println("\t// {}", insn.op_str); println("\t// {}", insn.op_str);
#if 1 #if 1
if (*(data - 1) != 0) if (*data != 0)
std::println("Unable to decode instruction {:X} at {:X}", *(data - 1), base - 4); std::println("Unable to decode instruction {:X} at {:X}", *data, base);
#endif #endif
} }
else else
{ {
if (!Recompile(fn, base, insn, switchTable)) if (!Recompile(fn, base, insn, switchTable))
{ {
std::println("Unrecognized instruction at 0x{:X}: {}", base - 4, insn.opcode->name); std::println("Unrecognized instruction at 0x{:X}: {}", base, insn.opcode->name);
allRecompiled = false; allRecompiled = false;
} }
} }
base += 4;
++data;
} }
#if 0 #if 0