Rim/gsc-tool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

improve decompiler empty blocks & do-while bug

Browse Source
This commit is contained in:
xensik 2022-07-16 20:58:59 +02:00
parent 900ce1db26
commit b8cc78d106
9 changed files with 153 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/h1/xsk/decompiler.cpp
View File

@ -1796,11 +1796,16 @@ void decompiler::decompile_infinites(const ast::stmt_list::ptr& stmt)
auto break_loc = last_location_index(stmt, i) ? blocks_.back().loc_end : stmt->list.at(i + 1).loc().label();
auto start = find_location_index(stmt, stmt->list.at(i).as_jump_back->value);
if (i > 0 && stmt->list.at(i - 1).as_node->kind() == ast::kind::asm_jump_cond) // do-while
if (i > 0 && stmt->list.at(i - 1).as_node->kind() == ast::kind::asm_jump_cond)
{
continue;
if (static_cast<std::size_t>(i) < find_location_index(stmt, stmt->list.at(i - 1).as_cond->loc().label()))
{
continue; // do-while
}
// empty if at loop end
}
else if (i == static_cast<std::int32_t>(start)) // empty loop
if (i == static_cast<std::int32_t>(start)) // empty loop
{
decompile_infinite(stmt, start, i);
i = static_cast<std::int32_t>(stmt->list.size());
@ -1891,7 +1896,15 @@ void decompiler::decompile_ifelses(const ast::stmt_list::ptr& stmt)
}
else if (stmt->list.at(j).as_jump->value == entry.as_cond->value)
{
decompile_if(stmt, i, j); // if block, have a last empty else inside
if (find_location_reference(stmt, i + 1, j, entry.as_cond->value))
{
// if block, have a empty else inside at end
decompile_if(stmt, i, j);
}
else
{
decompile_ifelse(stmt, i, j); // if block with empty else
}
}
else
{

21
src/h2/xsk/decompiler.cpp
View File

@ -1796,11 +1796,16 @@ void decompiler::decompile_infinites(const ast::stmt_list::ptr& stmt)
auto break_loc = last_location_index(stmt, i) ? blocks_.back().loc_end : stmt->list.at(i + 1).loc().label();
auto start = find_location_index(stmt, stmt->list.at(i).as_jump_back->value);
if (i > 0 && stmt->list.at(i - 1).as_node->kind() == ast::kind::asm_jump_cond) // do-while
if (i > 0 && stmt->list.at(i - 1).as_node->kind() == ast::kind::asm_jump_cond)
{
continue;
if (static_cast<std::size_t>(i) < find_location_index(stmt, stmt->list.at(i - 1).as_cond->loc().label()))
{
continue; // do-while
}
// empty if at loop end
}
else if (i == static_cast<std::int32_t>(start)) // empty loop
if (i == static_cast<std::int32_t>(start)) // empty loop
{
decompile_infinite(stmt, start, i);
i = static_cast<std::int32_t>(stmt->list.size());
@ -1891,7 +1896,15 @@ void decompiler::decompile_ifelses(const ast::stmt_list::ptr& stmt)
}
else if (stmt->list.at(j).as_jump->value == entry.as_cond->value)
{
decompile_if(stmt, i, j); // if block, have a last empty else inside
if (find_location_reference(stmt, i + 1, j, entry.as_cond->value))
{
// if block, have a empty else inside at end
decompile_if(stmt, i, j);
}
else
{
decompile_ifelse(stmt, i, j); // if block with empty else
}
}
else
{

21
src/iw5/xsk/decompiler.cpp
View File

@ -1790,11 +1790,16 @@ void decompiler::decompile_infinites(const ast::stmt_list::ptr& stmt)
auto break_loc = last_location_index(stmt, i) ? blocks_.back().loc_end : stmt->list.at(i + 1).loc().label();
auto start = find_location_index(stmt, stmt->list.at(i).as_jump_back->value);
if (i > 0 && stmt->list.at(i - 1).as_node->kind() == ast::kind::asm_jump_cond) // do-while
if (i > 0 && stmt->list.at(i - 1).as_node->kind() == ast::kind::asm_jump_cond)
{
continue;
if (static_cast<std::size_t>(i) < find_location_index(stmt, stmt->list.at(i - 1).as_cond->loc().label()))
{
continue; // do-while
}
// empty if at loop end
}
else if (i == static_cast<std::int32_t>(start)) // empty loop
if (i == static_cast<std::int32_t>(start)) // empty loop
{
decompile_infinite(stmt, start, i);
i = static_cast<std::int32_t>(stmt->list.size());
@ -1885,7 +1890,15 @@ void decompiler::decompile_ifelses(const ast::stmt_list::ptr& stmt)
}
else if (stmt->list.at(j).as_jump->value == entry.as_cond->value)
{
decompile_if(stmt, i, j); // if block, have a last empty else inside
if (find_location_reference(stmt, i + 1, j, entry.as_cond->value))
{
// if block, have a empty else inside at end
decompile_if(stmt, i, j);
}
else
{
decompile_ifelse(stmt, i, j); // if block with empty else
}
}
else
{

21
src/iw6/xsk/decompiler.cpp
View File

@ -1790,11 +1790,16 @@ void decompiler::decompile_infinites(const ast::stmt_list::ptr& stmt)
auto break_loc = last_location_index(stmt, i) ? blocks_.back().loc_end : stmt->list.at(i + 1).loc().label();
auto start = find_location_index(stmt, stmt->list.at(i).as_jump_back->value);
if (i > 0 && stmt->list.at(i - 1).as_node->kind() == ast::kind::asm_jump_cond) // do-while
if (i > 0 && stmt->list.at(i - 1).as_node->kind() == ast::kind::asm_jump_cond)
{
continue;
if (static_cast<std::size_t>(i) < find_location_index(stmt, stmt->list.at(i - 1).as_cond->loc().label()))
{
continue; // do-while
}
// empty if at loop end
}
else if (i == static_cast<std::int32_t>(start)) // empty loop
if (i == static_cast<std::int32_t>(start)) // empty loop
{
decompile_infinite(stmt, start, i);
i = static_cast<std::int32_t>(stmt->list.size());
@ -1885,7 +1890,15 @@ void decompiler::decompile_ifelses(const ast::stmt_list::ptr& stmt)
}
else if (stmt->list.at(j).as_jump->value == entry.as_cond->value)
{
decompile_if(stmt, i, j); // if block, have a last empty else inside
if (find_location_reference(stmt, i + 1, j, entry.as_cond->value))
{
// if block, have a empty else inside at end
decompile_if(stmt, i, j);
}
else
{
decompile_ifelse(stmt, i, j); // if block with empty else
}
}
else
{

21
src/iw7/xsk/decompiler.cpp
View File

@ -1790,11 +1790,16 @@ void decompiler::decompile_infinites(const ast::stmt_list::ptr& stmt)
auto break_loc = last_location_index(stmt, i) ? blocks_.back().loc_end : stmt->list.at(i + 1).loc().label();
auto start = find_location_index(stmt, stmt->list.at(i).as_jump_back->value);
if (i > 0 && stmt->list.at(i - 1).as_node->kind() == ast::kind::asm_jump_cond) // do-while
if (i > 0 && stmt->list.at(i - 1).as_node->kind() == ast::kind::asm_jump_cond)
{
continue;
if (static_cast<std::size_t>(i) < find_location_index(stmt, stmt->list.at(i - 1).as_cond->loc().label()))
{
continue; // do-while
}
// empty if at loop end
}
else if (i == static_cast<std::int32_t>(start)) // empty loop
if (i == static_cast<std::int32_t>(start)) // empty loop
{
decompile_infinite(stmt, start, i);
i = static_cast<std::int32_t>(stmt->list.size());
@ -1885,7 +1890,15 @@ void decompiler::decompile_ifelses(const ast::stmt_list::ptr& stmt)
}
else if (stmt->list.at(j).as_jump->value == entry.as_cond->value)
{
decompile_if(stmt, i, j); // if block, have a last empty else inside
if (find_location_reference(stmt, i + 1, j, entry.as_cond->value))
{
// if block, have a empty else inside at end
decompile_if(stmt, i, j);
}
else
{
decompile_ifelse(stmt, i, j); // if block with empty else
}
}
else
{

21
src/iw8/xsk/decompiler.cpp
View File

@ -1827,11 +1827,16 @@ void decompiler::decompile_infinites(const ast::stmt_list::ptr& stmt)
auto break_loc = last_location_index(stmt, i) ? blocks_.back().loc_end : stmt->list.at(i + 1).loc().label();
auto start = find_location_index(stmt, stmt->list.at(i).as_jump_back->value);
if (i > 0 && stmt->list.at(i - 1).as_node->kind() == ast::kind::asm_jump_cond) // do-while
if (i > 0 && stmt->list.at(i - 1).as_node->kind() == ast::kind::asm_jump_cond)
{
continue;
if (static_cast<std::size_t>(i) < find_location_index(stmt, stmt->list.at(i - 1).as_cond->loc().label()))
{
continue; // do-while
}
// empty if at loop end
}
else if (i == static_cast<std::int32_t>(start)) // empty loop
if (i == static_cast<std::int32_t>(start)) // empty loop
{
decompile_infinite(stmt, start, i);
i = static_cast<std::int32_t>(stmt->list.size());
@ -1922,7 +1927,15 @@ void decompiler::decompile_ifelses(const ast::stmt_list::ptr& stmt)
}
else if (stmt->list.at(j).as_jump->value == entry.as_cond->value)
{
decompile_if(stmt, i, j); // if block, have a last empty else inside
if (find_location_reference(stmt, i + 1, j, entry.as_cond->value))
{
// if block, have a empty else inside at end
decompile_if(stmt, i, j);
}
else
{
decompile_ifelse(stmt, i, j); // if block with empty else
}
}
else
{

21
src/s1/xsk/decompiler.cpp
View File

@ -1796,11 +1796,16 @@ void decompiler::decompile_infinites(const ast::stmt_list::ptr& stmt)
auto break_loc = last_location_index(stmt, i) ? blocks_.back().loc_end : stmt->list.at(i + 1).loc().label();
auto start = find_location_index(stmt, stmt->list.at(i).as_jump_back->value);
if (i > 0 && stmt->list.at(i - 1).as_node->kind() == ast::kind::asm_jump_cond) // do-while
if (i > 0 && stmt->list.at(i - 1).as_node->kind() == ast::kind::asm_jump_cond)
{
continue;
if (static_cast<std::size_t>(i) < find_location_index(stmt, stmt->list.at(i - 1).as_cond->loc().label()))
{
continue; // do-while
}
// empty if at loop end
}
else if (i == static_cast<std::int32_t>(start)) // empty loop
if (i == static_cast<std::int32_t>(start)) // empty loop
{
decompile_infinite(stmt, start, i);
i = static_cast<std::int32_t>(stmt->list.size());
@ -1891,7 +1896,15 @@ void decompiler::decompile_ifelses(const ast::stmt_list::ptr& stmt)
}
else if (stmt->list.at(j).as_jump->value == entry.as_cond->value)
{
decompile_if(stmt, i, j); // if block, have a last empty else inside
if (find_location_reference(stmt, i + 1, j, entry.as_cond->value))
{
// if block, have a empty else inside at end
decompile_if(stmt, i, j);
}
else
{
decompile_ifelse(stmt, i, j); // if block with empty else
}
}
else
{

21
src/s2/xsk/decompiler.cpp
View File

@ -1803,11 +1803,16 @@ void decompiler::decompile_infinites(const ast::stmt_list::ptr& stmt)
auto break_loc = last_location_index(stmt, i) ? blocks_.back().loc_end : stmt->list.at(i + 1).loc().label();
auto start = find_location_index(stmt, stmt->list.at(i).as_jump_back->value);
if (i > 0 && stmt->list.at(i - 1).as_node->kind() == ast::kind::asm_jump_cond) // do-while
if (i > 0 && stmt->list.at(i - 1).as_node->kind() == ast::kind::asm_jump_cond)
{
continue;
if (static_cast<std::size_t>(i) < find_location_index(stmt, stmt->list.at(i - 1).as_cond->loc().label()))
{
continue; // do-while
}
// empty if at loop end
}
else if (i == static_cast<std::int32_t>(start)) // empty loop
if (i == static_cast<std::int32_t>(start)) // empty loop
{
decompile_infinite(stmt, start, i);
i = static_cast<std::int32_t>(stmt->list.size());
@ -1898,7 +1903,15 @@ void decompiler::decompile_ifelses(const ast::stmt_list::ptr& stmt)
}
else if (stmt->list.at(j).as_jump->value == entry.as_cond->value)
{
decompile_if(stmt, i, j); // if block, have a last empty else inside
if (find_location_reference(stmt, i + 1, j, entry.as_cond->value))
{
// if block, have a empty else inside at end
decompile_if(stmt, i, j);
}
else
{
decompile_ifelse(stmt, i, j); // if block with empty else
}
}
else
{

21
src/s4/xsk/decompiler.cpp
View File

@ -1827,11 +1827,16 @@ void decompiler::decompile_infinites(const ast::stmt_list::ptr& stmt)
auto break_loc = last_location_index(stmt, i) ? blocks_.back().loc_end : stmt->list.at(i + 1).loc().label();
auto start = find_location_index(stmt, stmt->list.at(i).as_jump_back->value);
if (i > 0 && stmt->list.at(i - 1).as_node->kind() == ast::kind::asm_jump_cond) // do-while
if (i > 0 && stmt->list.at(i - 1).as_node->kind() == ast::kind::asm_jump_cond)
{
continue;
if (static_cast<std::size_t>(i) < find_location_index(stmt, stmt->list.at(i - 1).as_cond->loc().label()))
{
continue; // do-while
}
// empty if at loop end
}
else if (i == static_cast<std::int32_t>(start)) // empty loop
if (i == static_cast<std::int32_t>(start)) // empty loop
{
decompile_infinite(stmt, start, i);
i = static_cast<std::int32_t>(stmt->list.size());
@ -1922,7 +1927,15 @@ void decompiler::decompile_ifelses(const ast::stmt_list::ptr& stmt)
}
else if (stmt->list.at(j).as_jump->value == entry.as_cond->value)
{
decompile_if(stmt, i, j); // if block, have a last empty else inside
if (find_location_reference(stmt, i + 1, j, entry.as_cond->value))
{
// if block, have a empty else inside at end
decompile_if(stmt, i, j);
}
else
{
decompile_ifelse(stmt, i, j); // if block with empty else
}
}
else
{