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

W/misc fixes (#1838)

Browse Source 
* temp

* temp

* before cleaning up

* cleanup merge

* fix warnings

* merge fix

* clang format
This commit is contained in:
water111
2022-09-05 20:29:12 -04:00
committed by GitHub
parent 80d0137dba
commit b5d21be9c5
136 changed files with 7191 additions and 1073 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/IR2/FormExpressionAnalysis.cpp
+6 -5
View File
@@ -4913,7 +4913,7 @@ void ReturnElement::push_to_stack(const Env& env, FormPool& pool, FormStack& sta
namespace {
void push_asm_srl_to_stack(const AsmOp* op,
FormElement* /*form_elt*/,
FormElement* form_elt,
const Env& env,
FormPool& pool,
FormStack& stack) {
@@ -4940,7 +4940,7 @@ void push_asm_srl_to_stack(const AsmOp* op,
stack.push_value_to_reg(*dst, pool.alloc_single_form(nullptr, other), true,
env.get_variable_type(*dst, true));
} else {
// stack.push_form_element(form_elt, true);
//
auto src_var = pop_to_forms({*var}, env, pool, stack, true).at(0);
auto as_ba = src_var->try_as_element<BitfieldAccessElement>();
if (as_ba) {
@@ -4950,9 +4950,10 @@ void push_asm_srl_to_stack(const AsmOp* op,
stack.push_value_to_reg(*dst, pool.alloc_single_form(nullptr, other), true,
env.get_variable_type(*dst, true));
} else {
throw std::runtime_error(
fmt::format("Got invalid bitfield manip for srl at op {}: {} type was {}", op->op_id(),
src_var->to_string(env), arg0_type.print()));
stack.push_form_element(form_elt, true);
// throw std::runtime_error(
// fmt::format("Got invalid bitfield manip for srl at op {}: {} type was {}", op->op_id(),
// src_var->to_string(env), arg0_type.print()));
}
}
}