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

[decomp] load boundaries (#922)

Browse Source 
* mostly working

* fixes

* very small fixes

* fix tests

* clang
This commit is contained in:
water111
2021-10-20 19:49:32 -04:00
committed by GitHub
parent bdaac86753
commit 18714ba536
57 changed files with 7873 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/ObjectFile/LinkedObjectFile.cpp
+6 -6
View File
@@ -841,8 +841,8 @@ goos::Object LinkedObjectFile::to_form_script(int seg, int word_idx, std::vector
// resulting form. we can't have a totally empty list (as an empty list looks like a symbol,
// so it wouldn't be flagged), so it's safe to make this a pair.
auto result = goos::PairObject::make_new(goos::EmptyListObject::make_new(),
goos::EmptyListObject::make_new());
auto result =
goos::PairObject::make_new(goos::Object::make_empty_list(), goos::Object::make_empty_list());
// the current pair to fill out.
auto fill = result;
@@ -859,7 +859,7 @@ goos::Object LinkedObjectFile::to_form_script(int seg, int word_idx, std::vector
if (is_empty_list(seg, cdr_addr)) {
// the list has ended!
fill.as_pair()->cdr = goos::EmptyListObject::make_new();
fill.as_pair()->cdr = goos::Object::make_empty_list();
return result;
} else {
// cdr object should be aligned.
@@ -869,8 +869,8 @@ goos::Object LinkedObjectFile::to_form_script(int seg, int word_idx, std::vector
if (cdr_word.kind == LinkedWord::PTR && (labels.at(cdr_word.label_id).offset & 7) == 2) {
// yes, proper list. add another pair and link it in to the list.
goal_print_obj = labels.at(cdr_word.label_id).offset;
fill.as_pair()->cdr = goos::PairObject::make_new(goos::EmptyListObject::make_new(),
goos::EmptyListObject::make_new());
fill.as_pair()->cdr = goos::PairObject::make_new(goos::Object::make_empty_list(),
goos::Object::make_empty_list());
fill = fill.as_pair()->cdr;
} else {
// improper list, put the last thing in and end
@@ -936,7 +936,7 @@ goos::Object LinkedObjectFile::to_form_script_object(int seg,
}
}
} else if (word.kind == LinkedWord::EMPTY_PTR) {
result = goos::EmptyListObject::make_new();
result = goos::Object::make_empty_list();
} else {
std::string debug;
append_word_to_string(debug, word);