mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-07-07 14:13:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

decompiler: some hacks to allow running decompiler on jak 3 v5 code files, improve all-types generation (#2526)

Browse Source 
Co-authored-by: water <awaterford111445@gmail.com>
This commit is contained in:
Hat Kid
2023-10-07 22:14:12 +02:00
committed by GitHub
parent 5f8415320b
commit bf961a36f4
23 changed files with 4954 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/Function/Function.cpp
+15 -2
View File
@@ -584,6 +584,13 @@ void Function::find_type_defs(LinkedObjectFile& file, DecompilerTypeSystem& dts)
int label_idx = -1;
for (const auto& instr : instructions) {
// far labels
if (label_idx != -1 && state == 5 &&
!(instr.kind == InstructionKind::JALR && instr.get_dst(0).get_reg() == make_gpr(Reg::RA) &&
instr.get_src(0).get_reg() == make_gpr(Reg::T9))) {
continue;
}
// look for lw xx, type(s7)
if (instr.kind == InstructionKind::LW && instr.get_src(0).is_sym() &&
instr.get_src(0).get_sym() == "type" && instr.get_src(1).get_reg() == make_gpr(Reg::S7)) {
@@ -630,8 +637,14 @@ void Function::find_type_defs(LinkedObjectFile& file, DecompilerTypeSystem& dts)
if (state == 4) {
// look for ld a2, LXX(fp)
if (instr.kind == InstructionKind::LD && instr.get_dst(0).get_reg() == make_gpr(Reg::A2) &&
instr.get_src(0).is_label() && instr.get_src(1).get_reg() == make_gpr(Reg::FP)) {
if ((instr.kind == InstructionKind::LD && instr.get_dst(0).get_reg() == make_gpr(Reg::A2) &&
instr.get_src(0).is_label() && instr.get_src(1).get_reg() == make_gpr(Reg::FP))) {
state = 5;
label_idx = instr.get_src(0).get_label();
continue;
} else if ((instr.kind == InstructionKind::LUI &&
instr.get_dst(0).get_reg() == make_gpr(Reg::V1) && instr.get_src(0).is_label())) {
// far labels
state = 5;
label_idx = instr.get_src(0).get_label();
continue;