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

small cleanup on camera code (#2010)

Browse Source 
fixes https://github.com/open-goal/jak-project/issues/1960 and patches
scratchpad use in cam-debug
This commit is contained in:
water111
2022-11-11 17:27:09 -05:00
committed by GitHub
parent b2b47eec5c
commit b90b6c9aff
15 changed files with 431 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/IR2/FormExpressionAnalysis.cpp
+24 -2
View File
@@ -4439,6 +4439,28 @@ std::vector<Form*> cast_to_64_bit(const std::vector<Form*>& forms,
return result;
}
std::vector<Form*> cast_for_64bit_equality_check(const std::vector<Form*>& forms,
const std::vector<TypeSpec>& types,
FormPool& pool,
const Env& env) {
if (env.version == GameVersion::Jak1) {
return cast_to_64_bit(forms, types, pool, env);
}
std::vector<Form*> result;
for (size_t i = 0; i < forms.size(); i++) {
if (env.dts->ts.tc(TypeSpec("uint128"), types.at(i))) {
result.push_back(cast_form(forms[i], TypeSpec("uint"), pool, env));
} else if (env.dts->ts.tc(TypeSpec("int128"), types.at(i))) {
result.push_back(cast_form(forms[i], TypeSpec("int"), pool, env));
} else if (env.dts->ts.tc(TypeSpec("float"), types.at(i))) {
result.push_back(cast_form(forms[i], TypeSpec("int"), pool, env));
} else {
result.push_back(forms[i]);
}
}
return result;
}
FormElement* try_make_nonzero_logtest(Form* in, FormPool& pool) {
/*
(defmacro logtest? (a b)
@@ -4661,7 +4683,7 @@ FormElement* ConditionElement::make_equal_check_generic(const Env& env,
}
return pool.alloc_element<GenericElement>(
GenericOperator::make_fixed(FixedOperatorKind::EQ),
cast_to_64_bit(source_forms, source_types, pool, env));
cast_for_64bit_equality_check(source_forms, source_types, pool, env));
}
}
}
@@ -4692,7 +4714,7 @@ FormElement* ConditionElement::make_not_equal_check_generic(
} else {
return pool.alloc_element<GenericElement>(
GenericOperator::make_fixed(FixedOperatorKind::NEQ),
cast_to_64_bit(source_forms, source_types, pool, env));
cast_for_64bit_equality_check(source_forms, source_types, pool, env));
}
}
}