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

[decompiler] Get rid of FormStack peek and fix virtual method calls (#488)

Browse Source 
* fix, but it was too easy

* try again
This commit is contained in:
water111
2021-05-15 13:11:20 -04:00
committed by GitHub
parent 613efbd768
commit d73501cf19
6 changed files with 40 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/IR2/FormStack.cpp
-21
View File
@@ -193,27 +193,6 @@ Form* FormStack::pop_reg(Register reg,
return nullptr;
}
Form* FormStack::unsafe_peek(Register reg, const Env& env) {
RegSet modified;
for (size_t i = m_stack.size(); i-- > 0;) {
auto& entry = m_stack.at(i);
if (entry.active) {
fmt::print("PEEK ERROR {}:\n{}\n", reg.to_string(), print(env));
throw std::runtime_error("Failed to unsafe peek 1");
}
entry.source->get_modified_regs(modified);
if (modified.find(reg) != modified.end()) {
throw std::runtime_error("Failed to unsafe peek 2");
}
if (entry.destination.has_value() && entry.destination->reg() == reg) {
return entry.source;
}
}
return nullptr;
}
FormElement* FormStack::pop_back(FormPool& pool) {
auto& back = m_stack.back();
assert(back.active);