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

Small state fixes (#901)

Browse Source 
* small fixes

* catch uncaught exception
This commit is contained in:
water111
2021-10-15 21:31:22 -04:00
committed by GitHub
parent 08e98b49c6
commit f87646e8ce
7 changed files with 118 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/IR2/FormExpressionAnalysis.cpp
+12 -3
View File
@@ -2700,9 +2700,18 @@ void FunctionCallElement::update_from_stack(const Env& env,
std::swap(all_pop_vars.at(0), all_pop_vars.at(1));
}
if (tp_type.kind == TP_Type::Kind::RUN_FUNCTION_IN_PROCESS_FUNCTION &&
unstacked.at(0)->to_string(env) == "run-function-in-process") {
unstacked.at(0) = pool.form<ConstantTokenElement>("run-now-in-process");
if (tp_type.kind == TP_Type::Kind::RUN_FUNCTION_IN_PROCESS_FUNCTION) {
if (unstacked.at(0)->to_string(env) == "run-function-in-process") {
unstacked.at(0) = pool.form<ConstantTokenElement>("run-now-in-process");
} else {
// couldn't pop. need to add a cast.
TypeSpec failed_cast("function");
for (int i = 0; i < ((int)unstacked.size()) - 1; i++) {
failed_cast.add_arg(TypeSpec("object"));
}
failed_cast.add_arg(TypeSpec("none"));
unstacked.at(0) = pool.form<CastElement>(failed_cast, unstacked.at(0));
}
}
if (tp_type.kind == TP_Type::Kind::SET_TO_RUN_FUNCTION) {