mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-08-09 02:49:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

[decompiler] handle types without inspects better in all-types (#1735)

Browse Source 
* [decompiler] handle types without inspects better in all-types

* move a few types I missed
This commit is contained in:
water111
2022-08-06 12:17:24 -04:00
committed by GitHub
parent a72b6e5e01
commit 666a19dd96
5 changed files with 556 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/ObjectFile/ObjectFileDB.h
+12 -1
View File
@@ -201,7 +201,18 @@ class ObjectFileDB {
// symbol-name : type-name
std::unordered_map<std::string, std::string> symbol_types;
std::vector<std::string> type_defs;
struct TypeInfo {
bool from_inspect_method = false; // does this come from an inspect method?
// if from inspect method:
std::string type_definition; // the deftype generated from the inspect method.
// if not from inspect method:
u32 flags = 0;
std::string parent;
};
std::vector<std::string> type_names_in_order;
std::unordered_map<std::string, TypeInfo> type_info;
std::string symbol_defs;
};
void ir2_analyze_all_types(const fs::path& output_file,
decompiler/ObjectFile/ObjectFileDB_IR2.cpp
+12 -4
View File
@@ -328,9 +328,16 @@ void ObjectFileDB::ir2_analyze_all_types(const fs::path& output_file,
for_each_function_def_order_in_obj(data, [&](Function& f, int seg) {
if (seg != TOP_LEVEL_SEGMENT) {
if (f.is_inspect_method && bad_types.find(f.guessed_name.type_name) == bad_types.end()) {
object_result.type_defs.push_back(
auto deftype_from_inspect =
inspect_inspect_method(f, f.guessed_name.type_name, dts, data.linked_data,
previous_game_ts, ti_cache, object_result));
previous_game_ts, ti_cache, object_result);
bool already_seen = object_result.type_info.count(f.guessed_name.type_name) > 0;
if (!already_seen) {
object_result.type_names_in_order.push_back(f.guessed_name.type_name);
}
auto& info = object_result.type_info[f.guessed_name.type_name];
info.from_inspect_method = true;
info.type_definition = deftype_from_inspect;
} else {
// no inspect methods
// - can we solve custom print methods in a generic way? ie `entity-links`
@@ -351,8 +358,9 @@ void ObjectFileDB::ir2_analyze_all_types(const fs::path& output_file,
result += fmt::format(";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\n");
result += fmt::format(";; {:30s} ;;\n", obj.object_name);
result += fmt::format(";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\n\n");
for (auto& t : obj.type_defs) {
result += t;
for (const auto& type_name : obj.type_names_in_order) {
auto& info = obj.type_info.at(type_name);
result += info.type_definition;
result += "\n";
}
result += obj.symbol_defs;