Game-Decompilation/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-11-27 00:10:31 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Update expression_build.cpp

Browse Source
This commit is contained in:
ManDude 2022-04-16 23:52:59 +01:00
parent f3d871f60a
commit b94d092fc5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
decompiler/analysis/expression_build.cpp
View File

@ -27,7 +27,7 @@ bool convert_to_expressions(
f.guessed_name.kind == FunctionName::FunctionKind::V_STATE) { f.guessed_name.kind == FunctionName::FunctionKind::V_STATE) {
f.ir2.env.set_remap_for_function(f.type); f.ir2.env.set_remap_for_function(f.type);
} else if (f.guessed_name.kind == FunctionName::FunctionKind::METHOD) { } else if (f.guessed_name.kind == FunctionName::FunctionKind::METHOD) {
auto& method_type = auto method_type =
dts.ts.lookup_method(f.guessed_name.type_name, f.guessed_name.method_id).type; dts.ts.lookup_method(f.guessed_name.type_name, f.guessed_name.method_id).type;
if (f.guessed_name.method_id == GOAL_NEW_METHOD) { if (f.guessed_name.method_id == GOAL_NEW_METHOD) {
f.ir2.env.set_remap_for_new_method(method_type); f.ir2.env.set_remap_for_new_method(method_type);
@ -70,7 +70,7 @@ bool convert_to_expressions(
// rewrite the stack to get the correct final value // rewrite the stack to get the correct final value
std::vector<FormElement*> new_entries; std::vector<FormElement*> new_entries;
if (f.type.last_arg() != TypeSpec("none")) { if (f.type.last_arg() != TypeSpec("none")) {
auto return_var = f.ir2.atomic_ops->end_op().return_var(); auto& return_var = f.ir2.atomic_ops->end_op().return_var();
new_entries = rewrite_to_get_var(stack, pool, return_var, f.ir2.env); new_entries = rewrite_to_get_var(stack, pool, return_var, f.ir2.env);
TypeSpec return_type = f.ir2.env.get_types_after_op(f.ir2.atomic_ops->ops.size() - 1) TypeSpec return_type = f.ir2.env.get_types_after_op(f.ir2.atomic_ops->ops.size() - 1)
.get(return_var.reg()) .get(return_var.reg())