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

[decompiler] Cleanup for Jak 3 (#3845)

Browse Source 
This PR does a few cleanups:
- improve method names/comments/flags for `enemy.gc` and a few other
files
- fix `new-stack-matrix0` not working for jak 3
- add `matrix-copy!` detection for jak 3
- add `vector-copy!` detection

---------

Co-authored-by: water111 <awaterford1111445@gmail.com>
This commit is contained in:
water111
2025-01-20 10:31:29 -05:00
committed by GitHub
parent 341f6117d5
commit 3ee2b4423c
1009 changed files with 21570 additions and 22558 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/analysis/insert_lets.cpp
+22 -13
View File
@@ -2716,8 +2716,12 @@ FormElement* rewrite_launch_particles(LetElement* in, const Env& env, FormPool&
}
auto set_elt = dynamic_cast<SetFormFormElement*>(in->body()->at(0));
GenericElement* vector_copy_elt = nullptr;
if (!set_elt) {
return nullptr;
vector_copy_elt = dynamic_cast<GenericElement*>(in->body()->at(0));
if (!vector_copy_elt || vector_copy_elt->op().to_form(env).print() != "vector-copy!") {
return nullptr;
}
}
auto func_elt = dynamic_cast<GenericElement*>(in->body()->at(1));
@@ -2747,19 +2751,24 @@ FormElement* rewrite_launch_particles(LetElement* in, const Env& env, FormPool&
return nullptr;
}
auto origin = dynamic_cast<DerefElement*>(set_elt->src()->elts().at(0));
if (!origin) {
return nullptr;
}
auto tokens = origin->tokens().size();
Form* origin_form;
// remove only the quad if there are multiple derefs
if (tokens > 1) {
origin_form = pool.form<DerefElement>(origin->base(), false, origin->tokens());
auto orig = dynamic_cast<DerefElement*>(origin_form->elts().at(0));
orig->tokens().pop_back();
Form* origin_form = nullptr;
if (set_elt) {
auto origin = dynamic_cast<DerefElement*>(set_elt->src()->elts().at(0));
auto tokens = origin->tokens().size();
// remove only the quad if there are multiple derefs
if (tokens > 1) {
origin_form = pool.form<DerefElement>(origin->base(), false, origin->tokens());
auto orig = dynamic_cast<DerefElement*>(origin_form->elts().at(0));
orig->tokens().pop_back();
} else {
origin_form = origin->base();
}
} else {
origin_form = origin->base();
// the vector copy rewrite already did the logic above.
origin_form = vector_copy_elt->elts().at(1);
}
if (!origin_form) {
return nullptr;
}
auto launch_state = func_elt->elts().at(func_elt->elts().size() - 3);