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

decompiler waittill fix

Browse Source
This commit is contained in:
xensik 2021-05-12 11:44:29 +02:00
parent e7f5add67b
commit 39ac8bd592
7 changed files with 168 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,6 +79,7 @@ void decompiler::decompile_function(const gsc::function_ptr& func)
void decompiler::decompile_statements(const gsc::function_ptr& func)
{
std::uint32_t last_null_loc = 0;
bool in_waittill = false;
for (auto& inst : func->instructions)
{
@ -264,8 +265,16 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
break;
case opcode::OP_CreateLocalVariable:
{
auto stmt = std::make_unique<gsc::node_asm_create>(loc, inst->data[0]);
func_->block->stmts.push_back(gsc::stmt_ptr(std::move(stmt)));
if(in_waittill)
{
auto expr = std::make_unique<gsc::node_asm_create>(loc, inst->data[0]);
stack_.push(std::move(expr));
}
else
{
auto stmt = std::make_unique<gsc::node_asm_create>(loc, inst->data[0]);
func_->block->stmts.push_back(gsc::stmt_ptr(std::move(stmt)));
}
}
break;
case opcode::OP_RemoveLocalVariables:
@ -1375,6 +1384,7 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
auto args = std::make_unique<gsc::node_expr_arguments>(loc);
auto stmt = std::make_unique<gsc::node_stmt_waittill>(loc, std::move(obj) , std::move(nstr), std::move(args));
stack_.push(std::move(stmt));
in_waittill = true;
}
break;
case opcode::OP_waittillmatch:
@ -1416,7 +1426,9 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
if(var->type == gsc::node_t::stmt_waittill)
{
std::reverse(args->list.begin(), args->list.end());
(*(gsc::stmt_waittill_ptr*)&var)->args = std::move(args);
in_waittill = false;
}
func_->block->stmts.push_back(gsc::stmt_ptr(std::move(var)));
@ -1575,8 +1587,11 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
break;
case opcode::OP_SafeSetWaittillVariableFieldCached:
{
auto node = std::make_unique<gsc::node_asm_access>(loc, inst->data[0]);
stack_.push(std::move(node));
if(stack_.top()->type != gsc::node_t::asm_create)
{
auto node = std::make_unique<gsc::node_asm_access>(loc, inst->data[0]);
stack_.push(std::move(node));
}
}
break;
case opcode::OP_EvalLocalVariableRefCached0:
@ -2726,7 +2741,11 @@ void decompiler::process_stmt_waittill(const gsc::context_ptr& ctx, const gsc::s
{
process_expr(ctx, stmt->expr);
process_expr(ctx, stmt->obj);
process_expr_arguments(ctx, stmt->args);
for(auto& arg : stmt->args->list)
{
process_expr(ctx, arg);
}
}
void decompiler::process_stmt_waittillmatch(const gsc::context_ptr& ctx, const gsc::stmt_waittillmatch_ptr& stmt)

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

@ -79,6 +79,7 @@ void decompiler::decompile_function(const gsc::function_ptr& func)
void decompiler::decompile_statements(const gsc::function_ptr& func)
{
std::uint32_t last_null_loc = 0;
bool in_waittill = false;
for (auto& inst : func->instructions)
{
@ -264,8 +265,16 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
break;
case opcode::OP_CreateLocalVariable:
{
auto stmt = std::make_unique<gsc::node_asm_create>(loc, inst->data[0]);
func_->block->stmts.push_back(gsc::stmt_ptr(std::move(stmt)));
if(in_waittill)
{
auto expr = std::make_unique<gsc::node_asm_create>(loc, inst->data[0]);
stack_.push(std::move(expr));
}
else
{
auto stmt = std::make_unique<gsc::node_asm_create>(loc, inst->data[0]);
func_->block->stmts.push_back(gsc::stmt_ptr(std::move(stmt)));
}
}
break;
case opcode::OP_RemoveLocalVariables:
@ -1375,6 +1384,7 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
auto args = std::make_unique<gsc::node_expr_arguments>(loc);
auto stmt = std::make_unique<gsc::node_stmt_waittill>(loc, std::move(obj) , std::move(nstr), std::move(args));
stack_.push(std::move(stmt));
in_waittill = true;
}
break;
case opcode::OP_waittillmatch:
@ -1416,7 +1426,9 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
if(var->type == gsc::node_t::stmt_waittill)
{
std::reverse(args->list.begin(), args->list.end());
(*(gsc::stmt_waittill_ptr*)&var)->args = std::move(args);
in_waittill = false;
}
func_->block->stmts.push_back(gsc::stmt_ptr(std::move(var)));
@ -1575,8 +1587,11 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
break;
case opcode::OP_SafeSetWaittillVariableFieldCached:
{
auto node = std::make_unique<gsc::node_asm_access>(loc, inst->data[0]);
stack_.push(std::move(node));
if(stack_.top()->type != gsc::node_t::asm_create)
{
auto node = std::make_unique<gsc::node_asm_access>(loc, inst->data[0]);
stack_.push(std::move(node));
}
}
break;
case opcode::OP_EvalLocalVariableRefCached0:
@ -2726,7 +2741,11 @@ void decompiler::process_stmt_waittill(const gsc::context_ptr& ctx, const gsc::s
{
process_expr(ctx, stmt->expr);
process_expr(ctx, stmt->obj);
process_expr_arguments(ctx, stmt->args);
for(auto& arg : stmt->args->list)
{
process_expr(ctx, arg);
}
}
void decompiler::process_stmt_waittillmatch(const gsc::context_ptr& ctx, const gsc::stmt_waittillmatch_ptr& stmt)

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

@ -79,6 +79,7 @@ void decompiler::decompile_function(const gsc::function_ptr& func)
void decompiler::decompile_statements(const gsc::function_ptr& func)
{
std::uint32_t last_null_loc = 0;
bool in_waittill = false;
for (auto& inst : func->instructions)
{
@ -264,8 +265,16 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
break;
case opcode::OP_CreateLocalVariable:
{
auto stmt = std::make_unique<gsc::node_asm_create>(loc, inst->data[0]);
func_->block->stmts.push_back(gsc::stmt_ptr(std::move(stmt)));
if(in_waittill)
{
auto expr = std::make_unique<gsc::node_asm_create>(loc, inst->data[0]);
stack_.push(std::move(expr));
}
else
{
auto stmt = std::make_unique<gsc::node_asm_create>(loc, inst->data[0]);
func_->block->stmts.push_back(gsc::stmt_ptr(std::move(stmt)));
}
}
break;
case opcode::OP_RemoveLocalVariables:
@ -1369,6 +1378,7 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
auto args = std::make_unique<gsc::node_expr_arguments>(loc);
auto stmt = std::make_unique<gsc::node_stmt_waittill>(loc, std::move(obj) , std::move(nstr), std::move(args));
stack_.push(std::move(stmt));
in_waittill = true;
}
break;
case opcode::OP_waittillmatch:
@ -1410,7 +1420,9 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
if(var->type == gsc::node_t::stmt_waittill)
{
std::reverse(args->list.begin(), args->list.end());
(*(gsc::stmt_waittill_ptr*)&var)->args = std::move(args);
in_waittill = false;
}
func_->block->stmts.push_back(gsc::stmt_ptr(std::move(var)));
@ -1569,8 +1581,11 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
break;
case opcode::OP_SafeSetWaittillVariableFieldCached:
{
auto node = std::make_unique<gsc::node_asm_access>(loc, inst->data[0]);
stack_.push(std::move(node));
if(stack_.top()->type != gsc::node_t::asm_create)
{
auto node = std::make_unique<gsc::node_asm_access>(loc, inst->data[0]);
stack_.push(std::move(node));
}
}
break;
case opcode::OP_EvalLocalVariableRefCached0:
@ -2720,7 +2735,11 @@ void decompiler::process_stmt_waittill(const gsc::context_ptr& ctx, const gsc::s
{
process_expr(ctx, stmt->expr);
process_expr(ctx, stmt->obj);
process_expr_arguments(ctx, stmt->args);
for(auto& arg : stmt->args->list)
{
process_expr(ctx, arg);
}
}
void decompiler::process_stmt_waittillmatch(const gsc::context_ptr& ctx, const gsc::stmt_waittillmatch_ptr& stmt)

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

@ -79,6 +79,7 @@ void decompiler::decompile_function(const gsc::function_ptr& func)
void decompiler::decompile_statements(const gsc::function_ptr& func)
{
std::uint32_t last_null_loc = 0;
bool in_waittill = false;
for (auto& inst : func->instructions)
{
@ -264,8 +265,16 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
break;
case opcode::OP_CreateLocalVariable:
{
auto stmt = std::make_unique<gsc::node_asm_create>(loc, inst->data[0]);
func_->block->stmts.push_back(gsc::stmt_ptr(std::move(stmt)));
if(in_waittill)
{
auto expr = std::make_unique<gsc::node_asm_create>(loc, inst->data[0]);
stack_.push(std::move(expr));
}
else
{
auto stmt = std::make_unique<gsc::node_asm_create>(loc, inst->data[0]);
func_->block->stmts.push_back(gsc::stmt_ptr(std::move(stmt)));
}
}
break;
case opcode::OP_RemoveLocalVariables:
@ -1369,6 +1378,7 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
auto args = std::make_unique<gsc::node_expr_arguments>(loc);
auto stmt = std::make_unique<gsc::node_stmt_waittill>(loc, std::move(obj) , std::move(nstr), std::move(args));
stack_.push(std::move(stmt));
in_waittill = true;
}
break;
case opcode::OP_waittillmatch:
@ -1410,7 +1420,9 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
if(var->type == gsc::node_t::stmt_waittill)
{
std::reverse(args->list.begin(), args->list.end());
(*(gsc::stmt_waittill_ptr*)&var)->args = std::move(args);
in_waittill = false;
}
func_->block->stmts.push_back(gsc::stmt_ptr(std::move(var)));
@ -1569,8 +1581,11 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
break;
case opcode::OP_SafeSetWaittillVariableFieldCached:
{
auto node = std::make_unique<gsc::node_asm_access>(loc, inst->data[0]);
stack_.push(std::move(node));
if(stack_.top()->type != gsc::node_t::asm_create)
{
auto node = std::make_unique<gsc::node_asm_access>(loc, inst->data[0]);
stack_.push(std::move(node));
}
}
break;
case opcode::OP_EvalLocalVariableRefCached0:
@ -2720,7 +2735,11 @@ void decompiler::process_stmt_waittill(const gsc::context_ptr& ctx, const gsc::s
{
process_expr(ctx, stmt->expr);
process_expr(ctx, stmt->obj);
process_expr_arguments(ctx, stmt->args);
for(auto& arg : stmt->args->list)
{
process_expr(ctx, arg);
}
}
void decompiler::process_stmt_waittillmatch(const gsc::context_ptr& ctx, const gsc::stmt_waittillmatch_ptr& stmt)

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

@ -79,6 +79,7 @@ void decompiler::decompile_function(const gsc::function_ptr& func)
void decompiler::decompile_statements(const gsc::function_ptr& func)
{
std::uint32_t last_null_loc = 0;
bool in_waittill = false;
for (auto& inst : func->instructions)
{
@ -264,8 +265,16 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
break;
case opcode::OP_CreateLocalVariable:
{
auto stmt = std::make_unique<gsc::node_asm_create>(loc, inst->data[0]);
func_->block->stmts.push_back(gsc::stmt_ptr(std::move(stmt)));
if(in_waittill)
{
auto expr = std::make_unique<gsc::node_asm_create>(loc, inst->data[0]);
stack_.push(std::move(expr));
}
else
{
auto stmt = std::make_unique<gsc::node_asm_create>(loc, inst->data[0]);
func_->block->stmts.push_back(gsc::stmt_ptr(std::move(stmt)));
}
}
break;
case opcode::OP_RemoveLocalVariables:
@ -1369,6 +1378,7 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
auto args = std::make_unique<gsc::node_expr_arguments>(loc);
auto stmt = std::make_unique<gsc::node_stmt_waittill>(loc, std::move(obj) , std::move(nstr), std::move(args));
stack_.push(std::move(stmt));
in_waittill = true;
}
break;
case opcode::OP_waittillmatch:
@ -1410,7 +1420,9 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
if(var->type == gsc::node_t::stmt_waittill)
{
std::reverse(args->list.begin(), args->list.end());
(*(gsc::stmt_waittill_ptr*)&var)->args = std::move(args);
in_waittill = false;
}
func_->block->stmts.push_back(gsc::stmt_ptr(std::move(var)));
@ -1569,8 +1581,11 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
break;
case opcode::OP_SafeSetWaittillVariableFieldCached:
{
auto node = std::make_unique<gsc::node_asm_access>(loc, inst->data[0]);
stack_.push(std::move(node));
if(stack_.top()->type != gsc::node_t::asm_create)
{
auto node = std::make_unique<gsc::node_asm_access>(loc, inst->data[0]);
stack_.push(std::move(node));
}
}
break;
case opcode::OP_EvalLocalVariableRefCached0:
@ -2720,7 +2735,11 @@ void decompiler::process_stmt_waittill(const gsc::context_ptr& ctx, const gsc::s
{
process_expr(ctx, stmt->expr);
process_expr(ctx, stmt->obj);
process_expr_arguments(ctx, stmt->args);
for(auto& arg : stmt->args->list)
{
process_expr(ctx, arg);
}
}
void decompiler::process_stmt_waittillmatch(const gsc::context_ptr& ctx, const gsc::stmt_waittillmatch_ptr& stmt)

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

@ -79,6 +79,7 @@ void decompiler::decompile_function(const gsc::function_ptr& func)
void decompiler::decompile_statements(const gsc::function_ptr& func)
{
std::uint32_t last_null_loc = 0;
bool in_waittill = false;
for (auto& inst : func->instructions)
{
@ -264,8 +265,16 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
break;
case opcode::OP_CreateLocalVariable:
{
auto stmt = std::make_unique<gsc::node_asm_create>(loc, inst->data[0]);
func_->block->stmts.push_back(gsc::stmt_ptr(std::move(stmt)));
if(in_waittill)
{
auto expr = std::make_unique<gsc::node_asm_create>(loc, inst->data[0]);
stack_.push(std::move(expr));
}
else
{
auto stmt = std::make_unique<gsc::node_asm_create>(loc, inst->data[0]);
func_->block->stmts.push_back(gsc::stmt_ptr(std::move(stmt)));
}
}
break;
case opcode::OP_RemoveLocalVariables:
@ -1375,6 +1384,7 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
auto args = std::make_unique<gsc::node_expr_arguments>(loc);
auto stmt = std::make_unique<gsc::node_stmt_waittill>(loc, std::move(obj) , std::move(nstr), std::move(args));
stack_.push(std::move(stmt));
in_waittill = true;
}
break;
case opcode::OP_waittillmatch:
@ -1416,7 +1426,9 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
if(var->type == gsc::node_t::stmt_waittill)
{
std::reverse(args->list.begin(), args->list.end());
(*(gsc::stmt_waittill_ptr*)&var)->args = std::move(args);
in_waittill = false;
}
func_->block->stmts.push_back(gsc::stmt_ptr(std::move(var)));
@ -1575,8 +1587,11 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
break;
case opcode::OP_SafeSetWaittillVariableFieldCached:
{
auto node = std::make_unique<gsc::node_asm_access>(loc, inst->data[0]);
stack_.push(std::move(node));
if(stack_.top()->type != gsc::node_t::asm_create)
{
auto node = std::make_unique<gsc::node_asm_access>(loc, inst->data[0]);
stack_.push(std::move(node));
}
}
break;
case opcode::OP_EvalLocalVariableRefCached0:
@ -2726,7 +2741,11 @@ void decompiler::process_stmt_waittill(const gsc::context_ptr& ctx, const gsc::s
{
process_expr(ctx, stmt->expr);
process_expr(ctx, stmt->obj);
process_expr_arguments(ctx, stmt->args);
for(auto& arg : stmt->args->list)
{
process_expr(ctx, arg);
}
}
void decompiler::process_stmt_waittillmatch(const gsc::context_ptr& ctx, const gsc::stmt_waittillmatch_ptr& stmt)

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

@ -79,6 +79,7 @@ void decompiler::decompile_function(const gsc::function_ptr& func)
void decompiler::decompile_statements(const gsc::function_ptr& func)
{
std::uint32_t last_null_loc = 0;
bool in_waittill = false;
for (auto& inst : func->instructions)
{
@ -264,8 +265,16 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
break;
case opcode::OP_CreateLocalVariable:
{
auto stmt = std::make_unique<gsc::node_asm_create>(loc, inst->data[0]);
func_->block->stmts.push_back(gsc::stmt_ptr(std::move(stmt)));
if(in_waittill)
{
auto expr = std::make_unique<gsc::node_asm_create>(loc, inst->data[0]);
stack_.push(std::move(expr));
}
else
{
auto stmt = std::make_unique<gsc::node_asm_create>(loc, inst->data[0]);
func_->block->stmts.push_back(gsc::stmt_ptr(std::move(stmt)));
}
}
break;
case opcode::OP_RemoveLocalVariables:
@ -1375,6 +1384,7 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
auto args = std::make_unique<gsc::node_expr_arguments>(loc);
auto stmt = std::make_unique<gsc::node_stmt_waittill>(loc, std::move(obj) , std::move(nstr), std::move(args));
stack_.push(std::move(stmt));
in_waittill = true;
}
break;
case opcode::OP_waittillmatch:
@ -1416,7 +1426,9 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
if(var->type == gsc::node_t::stmt_waittill)
{
std::reverse(args->list.begin(), args->list.end());
(*(gsc::stmt_waittill_ptr*)&var)->args = std::move(args);
in_waittill = false;
}
func_->block->stmts.push_back(gsc::stmt_ptr(std::move(var)));
@ -1575,8 +1587,11 @@ void decompiler::decompile_statements(const gsc::function_ptr& func)
break;
case opcode::OP_SafeSetWaittillVariableFieldCached:
{
auto node = std::make_unique<gsc::node_asm_access>(loc, inst->data[0]);
stack_.push(std::move(node));
if(stack_.top()->type != gsc::node_t::asm_create)
{
auto node = std::make_unique<gsc::node_asm_access>(loc, inst->data[0]);
stack_.push(std::move(node));
}
}
break;
case opcode::OP_EvalLocalVariableRefCached0:
@ -2735,7 +2750,11 @@ void decompiler::process_stmt_waittill(const gsc::context_ptr& ctx, const gsc::s
{
process_expr(ctx, stmt->expr);
process_expr(ctx, stmt->obj);
process_expr_arguments(ctx, stmt->args);
for(auto& arg : stmt->args->list)
{
process_expr(ctx, arg);
}
}
void decompiler::process_stmt_waittillmatch(const gsc::context_ptr& ctx, const gsc::stmt_waittillmatch_ptr& stmt)