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

recognize vector, matrix, quaternion constructors in a better way (#630)

Browse Source 
* recognize vector, matrix, quaternion constructors in a better way

* fix bad bug
This commit is contained in:
water111
2021-06-26 18:30:35 -04:00
committed by GitHub
parent ae2666a7c5
commit 69e24ae577
10 changed files with 415 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/analysis/insert_lets.cpp
-99
View File
@@ -336,100 +336,6 @@ FormElement* fix_up_abs_2(LetElement* in, const Env& env, FormPool& pool) {
return in;
}
FormElement* fix_up_vector_inline_zero(LetElement* in, const Env& env, FormPool& pool) {
/*
* (let ((local-trans (new 'stack-no-clear 'vector)))
* (set! (-> local-trans quad) (the-as uint128 0))
*/
if (in->entries().size() != 1) {
return nullptr;
}
if (in->body()->elts().empty()) {
return nullptr;
}
Form* src = in->entries().at(0).src;
auto src_as_stackvar = src->try_as_element<StackStructureDefElement>();
if (!src_as_stackvar) {
return nullptr;
}
bool is_vector = src_as_stackvar->type() == TypeSpec("vector");
bool is_matrix = src_as_stackvar->type() == TypeSpec("matrix");
if (is_vector) {
auto first_elt = in->body()->elts().at(0);
auto matcher = Matcher::set(
Matcher::deref(Matcher::any_reg(0), false, {DerefTokenMatcher::string("quad")}),
Matcher::cast("uint128", Matcher::integer(0)));
Form hack;
hack.elts().push_back(first_elt);
auto mr = match(matcher, &hack);
if (mr.matched) {
auto var = in->entries().at(0).dest;
auto var_name = env.get_variable_name(var);
if (var_name != env.get_variable_name(*mr.maps.regs.at(0))) {
return nullptr;
}
auto new_op = pool.alloc_single_element_form<GenericElement>(
nullptr,
GenericOperator::make_function(
pool.alloc_single_element_form<ConstantTokenElement>(nullptr, "new-stack-vector0")));
src->parent_element = in;
in->entries().at(0).src = new_op;
in->body()->elts().erase(in->body()->elts().begin());
return in;
}
} else if (is_matrix) {
if (in->body()->elts().size() < 4) {
return nullptr;
}
auto var = in->entries().at(0).dest;
auto var_name = env.get_variable_name(var);
for (int i = 0; i < 4; i++) {
auto elt = in->body()->elts().at(i);
auto matcher = Matcher::set(
Matcher::deref(Matcher::any_reg(0), false,
{DerefTokenMatcher::string("vector"), DerefTokenMatcher::integer(i),
DerefTokenMatcher::string("quad")}),
Matcher::cast("uint128", Matcher::integer(0)));
Form hack;
hack.elts().push_back(elt);
auto mr = match(matcher, &hack);
if (mr.matched) {
if (var_name != env.get_variable_name(*mr.maps.regs.at(0))) {
return nullptr;
}
} else {
return nullptr;
}
}
auto new_op = pool.alloc_single_element_form<GenericElement>(
nullptr,
GenericOperator::make_function(
pool.alloc_single_element_form<ConstantTokenElement>(nullptr, "new-stack-matrix0")));
src->parent_element = in;
in->entries().at(0).src = new_op;
in->body()->elts().erase(in->body()->elts().begin(), in->body()->elts().begin() + 4);
return in;
}
return nullptr;
}
/*!
* Attempt to rewrite a let as another form. If it cannot be rewritten, this will return nullptr.
*/
@@ -454,11 +360,6 @@ FormElement* rewrite_let(LetElement* in, const Env& env, FormPool& pool) {
return as_abs_2;
}
auto as_vector = fix_up_vector_inline_zero(in, env, pool);
if (as_vector) {
return as_vector;
}
// nothing matched.
return nullptr;
}