Archive/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-10-20 11:26:18 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix shl by 16 constant being mistaken for a dynamic bitfield construction (#600)

Browse source
This commit is contained in:
water111 2021-06-16 22:15:22 -04:00 committed by GitHub
parent d26de26d21
commit af49ac60cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
decompiler/IR2/bitfields.cpp
View file

@ -581,6 +581,19 @@ std::optional<u64> get_goal_integer_constant(Form* in, const Env&) {
return result;
}
}
// also (shl <something> 16)
matcher = Matcher::op(GenericOpMatcher::fixed(FixedOperatorKind::SHL),
{Matcher::any(1), Matcher::integer(16)});
mr = match(matcher, in);
if (mr.matched) {
auto arg_as_atom = form_as_atom(mr.maps.forms.at(1));
if (arg_as_atom && arg_as_atom->is_int()) {
u64 result = arg_as_atom->get_int();
result <<= 16ull;
return result;
}
}
return {};
}