mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-05-23 06:54:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

[Decompiler] Put likely delay slots in their own block (#237)

Browse Source 
* first part of fix

* atomic op conversion fix

* update tests

* oops
This commit is contained in:
water111
2021-02-06 17:04:03 -05:00
committed by GitHub
parent 5b6a8dcf98
commit f8b63a3f92
16 changed files with 669 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/ObjectFile/ObjectFileDB_IR2.cpp
+14 -1
View File
@@ -187,12 +187,14 @@ void ObjectFileDB::ir2_basic_block_pass() {
// run analysis
// build a control flow graph, just looking at branch instructions.
// if (func.guessed_name.to_string() == "abs") {
func.cfg = build_cfg(data.linked_data, segment_id, func);
if (!func.cfg->is_fully_resolved()) {
lg::warn("Function {} from {} failed to build control flow graph!",
func.guessed_name.to_string(), data.to_unique_name());
failed_to_build_cfg++;
}
// }
// if we got an inspect method, inspect it.
if (func.is_inspect_method) {
@@ -604,7 +606,8 @@ std::string ObjectFileDB::ir2_function_to_string(ObjectFileData& data, Function&
auto& op = func.get_atomic_op_at_instr(instr_id);
op_id = func.ir2.atomic_ops->instruction_to_atomic_op.at(instr_id);
append_commented(line, printed_comment,
op.to_form(data.linked_data.labels, func.ir2.env).print());
op.to_form(data.linked_data.labels, func.ir2.env).print() + "[" +
std::to_string(op_id) + "]");
if (func.ir2.env.has_type_analysis()) {
append_commented(
@@ -650,6 +653,16 @@ std::string ObjectFileDB::ir2_function_to_string(ObjectFileData& data, Function&
print_instr_end(i);
}
if (func.cfg) {
result += func.cfg->to_form_string();
if (!func.cfg->is_fully_resolved()) {
result += "\n";
result += func.cfg->to_dot();
result += "\n";
}
}
result += "\n";
assert(total_instructions_printed == (func.end_word - func.start_word - 1));