mirror/PS2Recomp
1
0
Fork 0
mirror of https://github.com/ran-j/PS2Recomp.git synced 2026-09-26 08:51:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix some parsing logic

Browse Source 
feat: added a lot of try/catch to make debug more easy
This commit is contained in:
Ran-j
2025-11-29 01:13:18 -03:00
parent 95c824ea61
commit 68a8fc0fdd
2 changed files with 63 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ps2xRecomp/src/code_generator.cpp
+30 -15
View File
@@ -4,6 +4,7 @@
#include <sstream>
#include <algorithm>
#include <unordered_set>
#include <iostream>
namespace ps2recomp
{
@@ -491,17 +492,31 @@ namespace ps2recomp
ss << " // 0x" << std::hex << inst.address << ": 0x" << inst.raw << std::dec << "\n";
if (inst.hasDelaySlot && i + 1 < instructions.size())
try
{
const Instruction &delaySlot = instructions[i + 1];
ss << handleBranchDelaySlots(inst, delaySlot);
if (inst.hasDelaySlot && i + 1 < instructions.size())
{
const Instruction &delaySlot = instructions[i + 1];
ss << handleBranchDelaySlots(inst, delaySlot);
// Skip the delay slot instruction as we've already handled it
++i;
// Skip the delay slot instruction as we've already handled it
++i;
}
else
{
ss << " " << translateInstruction(inst) << "\n";
}
}
else
catch (const std::exception &e)
{
ss << " " << translateInstruction(inst) << "\n";
std::cerr << "Error in CodeGenerator::generateFunction while translating instruction\n"
<< " Function: " << function.name << "\n"
<< " Start: 0x" << std::hex << function.start << "\n"
<< " Instruction address: 0x" << inst.address << "\n"
<< " Raw: 0x" << inst.raw << "\n"
<< " What: " << e.what() << std::endl;
throw;
}
}
@@ -533,10 +548,10 @@ namespace ps2recomp
if (inst.rt == 0)
return "// NOP (addi to $zero)";
return fmt::format(
fmt::runtime("{ { uint32_t tmp; bool ov; "
"ADD32_OV(GPR_U32(ctx, {}), (int32_t){}, tmp, ov); "
"if (ov) runtime->SignalException(ctx, EXCEPTION_INTEGER_OVERFLOW); "
"else SET_GPR_S32(ctx, {}, (int32_t)tmp); } }"),
"{{ uint32_t tmp; bool ov; "
"ADD32_OV(GPR_U32(ctx, {}), (int32_t){}, tmp, ov); "
"if (ov) runtime->SignalException(ctx, EXCEPTION_INTEGER_OVERFLOW); "
"else SET_GPR_S32(ctx, {}, (int32_t)tmp); }}",
inst.rs, inst.simmediate, inst.rt);
case OPCODE_ADDIU:
@@ -753,10 +768,10 @@ namespace ps2recomp
return fmt::format("SET_GPR_U32(ctx, {}, ADD32(GPR_U32(ctx, {}), GPR_U32(ctx, {})));", inst.rd, inst.rs, inst.rt);
case SPECIAL_SUB:
return fmt::format(
fmt::runtime("{ { uint32_t tmp; bool ov; "
"SUB32_OV(GPR_U32(ctx, {}), GPR_U32(ctx, {}), tmp, ov); "
"if (ov) runtime->SignalException(ctx, EXCEPTION_INTEGER_OVERFLOW); "
"else SET_GPR_S32(ctx, {}, (int32_t)tmp); } }"),
"{{ uint32_t tmp; bool ov; "
"SUB32_OV(GPR_U32(ctx, {}), GPR_U32(ctx, {}), tmp, ov); "
"if (ov) runtime->SignalException(ctx, EXCEPTION_INTEGER_OVERFLOW); "
"else SET_GPR_S32(ctx, {}, (int32_t)tmp); }}",
inst.rs, inst.rt, inst.rd);
case SPECIAL_SUBU:
return fmt::format("SET_GPR_U32(ctx, {}, SUB32(GPR_U32(ctx, {}), GPR_U32(ctx, {})));", inst.rd, inst.rs, inst.rt);
ps2xRecomp/src/ps2_recompiler.cpp
+33 -11
View File
@@ -126,15 +126,26 @@ namespace ps2recomp
continue;
}
if (function.isStub)
try
{
combinedOutput << m_generatedStubs[function.start] << "\n\n";
if (function.isStub)
{
combinedOutput << m_generatedStubs.at(function.start) << "\n\n";
}
else
{
const auto &instructions = m_decodedFunctions.at(function.start);
std::string code = m_codeGenerator->generateFunction(function, instructions, false);
combinedOutput << code << "\n\n";
}
}
else
catch (const std::exception &e)
{
const auto &instructions = m_decodedFunctions[function.start];
std::string code = m_codeGenerator->generateFunction(function, instructions, false);
combinedOutput << code << "\n\n";
std::cerr << "Error generating code for function "
<< function.name << " (start 0x"
<< std::hex << function.start << "): "
<< e.what() << std::endl;
throw;
}
}
@@ -152,14 +163,25 @@ namespace ps2recomp
}
std::string code;
if (function.isStub)
try
{
code = m_generatedStubs[function.start];
if (function.isStub)
{
code = m_generatedStubs[function.start];
}
else
{
const auto &instructions = m_decodedFunctions[function.start];
code = m_codeGenerator->generateFunction(function, instructions, true);
}
}
else
catch (const std::exception &e)
{
const auto &instructions = m_decodedFunctions[function.start];
code = m_codeGenerator->generateFunction(function, instructions, true);
std::cerr << "Error generating code for function "
<< function.name << " (start 0x"
<< std::hex << function.start << "): "
<< e.what() << std::endl;
throw;
}
fs::path outputPath = getOutputPath(function);