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

add treyarch default parameters

Browse Source
This commit is contained in:
xensik 2022-10-15 14:49:29 +02:00
parent 4e4480792a
commit 379e3a03ae
9 changed files with 1728 additions and 1557 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gen/t6/parser.ypp
View File

@ -210,6 +210,8 @@ xsk::arc::t6::parser::symbol_type T6lex(xsk::arc::t6::lexer& lexer);
%type <ast::call> expr_function %type <ast::call> expr_function
%type <ast::call> expr_pointer %type <ast::call> expr_pointer
%type <ast::expr_parameters::ptr> expr_parameters %type <ast::expr_parameters::ptr> expr_parameters
%type <ast::expr> expr_parameters_default
%type <ast::expr> expr_literal
%type <ast::expr_arguments::ptr> expr_arguments %type <ast::expr_arguments::ptr> expr_arguments
%type <ast::expr_arguments::ptr> expr_arguments_no_empty %type <ast::expr_arguments::ptr> expr_arguments_no_empty
%type <ast::expr_getnextarraykey::ptr> expr_getnextarraykey %type <ast::expr_getnextarraykey::ptr> expr_getnextarraykey
@ -724,14 +726,32 @@ expr_pointer
; ;
expr_parameters expr_parameters
: expr_parameters COMMA expr_identifier : expr_parameters COMMA expr_parameters_default
{ $$ = std::move($1); $$->list.push_back(std::move($3)); } { $$ = std::move($1); $$->list.push_back(std::move($3)); }
| expr_identifier | expr_parameters COMMA expr_identifier
{ $$ = std::move($1); $$->list.push_back(ast::expr(std::move($3))); }
| expr_parameters_default
{ $$ = std::make_unique<ast::expr_parameters>(@$); $$->list.push_back(std::move($1)); } { $$ = std::make_unique<ast::expr_parameters>(@$); $$->list.push_back(std::move($1)); }
| expr_identifier
{ $$ = std::make_unique<ast::expr_parameters>(@$); $$->list.push_back(ast::expr(std::move($1))); }
| |
{ $$ = std::make_unique<ast::expr_parameters>(@$); } { $$ = std::make_unique<ast::expr_parameters>(@$); }
; ;
expr_parameters_default
: expr_identifier ASSIGN expr_literal
{ $$.as_node = std::make_unique<ast::expr_assign_equal>(@$, ast::expr(std::move($1)), std::move($3)); }
;
expr_literal
: expr_istring { $$.as_node = std::move($1); }
| expr_string { $$.as_node = std::move($1); }
| expr_float { $$.as_node = std::move($1); }
| expr_integer { $$.as_node = std::move($1); }
| expr_false { $$.as_node = std::move($1); }
| expr_true { $$.as_node = std::move($1); }
;
expr_arguments expr_arguments
: expr_arguments_no_empty : expr_arguments_no_empty
{ $$ = std::move($1); } { $$ = std::move($1); }

4
src/t6/xsk/assembler.cpp
View File

@ -728,6 +728,10 @@ void assembler::process_instruction(const instruction::ptr& inst)
{ {
switch (static_cast<opcode>(inst->opcode)) switch (static_cast<opcode>(inst->opcode))
{ {
case opcode::OP_GetInteger:
if (inst->data.size() == 2)
process_string(inst->data[0]);
break;
case opcode::OP_GetString: case opcode::OP_GetString:
case opcode::OP_GetIString: case opcode::OP_GetIString:
process_string(inst->data[0]); process_string(inst->data[0]);

25
src/t6/xsk/compiler.cpp
View File

@ -1361,7 +1361,7 @@ void compiler::emit_expr_method_function(const ast::expr_function::ptr& expr, co
emit_opcode(opcode::OP_DecTop); emit_opcode(opcode::OP_DecTop);
} }
void compiler::emit_expr_parameters(const ast::expr_parameters::ptr&) void compiler::emit_expr_parameters(const ast::expr_parameters::ptr& expr)
{ {
if (local_stack_.size() == 0) if (local_stack_.size() == 0)
{ {
@ -1371,6 +1371,20 @@ void compiler::emit_expr_parameters(const ast::expr_parameters::ptr&)
{ {
emit_opcode(opcode::OP_SafeCreateLocalVariables, local_stack_); emit_opcode(opcode::OP_SafeCreateLocalVariables, local_stack_);
} }
for (auto& entry : expr->list)
{
if (entry == ast::kind::expr_assign_equal)
{
auto end_loc = create_label();
emit_expr_variable(entry.as_assign_equal->lvalue);
emit_opcode(opcode::OP_IsDefined);
emit_opcode(opcode::OP_JumpOnTrue, end_loc);
emit_expr(entry.as_assign_equal->rvalue);
emit_expr_variable_ref(entry.as_assign_equal->lvalue, true);
insert_label(end_loc);
}
}
} }
void compiler::emit_expr_arguments(const ast::expr_arguments::ptr& expr) void compiler::emit_expr_arguments(const ast::expr_arguments::ptr& expr)
@ -2270,7 +2284,14 @@ void compiler::process_expr_parameters(const ast::expr_parameters::ptr& expr)
{ {
for (const auto& entry : expr->list) for (const auto& entry : expr->list)
{ {
variable_register(entry->value); if (entry == ast::kind::expr_identifier)
{
variable_register(entry.as_identifier->value);
}
else if (entry == ast::kind::expr_assign_equal)
{
process_expr(entry.as_assign_equal->lvalue);
}
} }
} }

43
src/t6/xsk/decompiler.cpp
View File

@ -55,7 +55,7 @@ void decompiler::decompile(const std::string& file, const assembly::ptr& data)
for (auto i = 0; i < func->params; i++) for (auto i = 0; i < func->params; i++)
{ {
func_->params->list.push_back(std::make_unique<ast::expr_identifier>(locals_.at(locals_.size() - 1 - i))); func_->params->list.push_back(ast::expr(std::make_unique<ast::expr_identifier>(locals_.at(locals_.size() - 1 - i))));
} }
process_thread(func_); process_thread(func_);
@ -2146,6 +2146,7 @@ auto decompiler::resolve_label(const std::string& name) -> std::uint32_t
void decompiler::process_thread(const ast::decl_thread::ptr& thread) void decompiler::process_thread(const ast::decl_thread::ptr& thread)
{ {
process_stmt_list(thread->stmt); process_stmt_list(thread->stmt);
process_expr_parameters(thread->params);
} }
void decompiler::process_stmt(const ast::stmt& stmt) void decompiler::process_stmt(const ast::stmt& stmt)
@ -2792,4 +2793,44 @@ void decompiler::process_expr_vector(const ast::expr_vector::ptr& expr)
process_expr(expr->x); process_expr(expr->x);
} }
void decompiler::process_expr_parameters(const ast::expr_parameters::ptr& expr)
{
if (expr->list.empty()) return;
while (!func_->stmt->list.empty())
{
auto& stmt = func_->stmt->list.at(0);
if (stmt != ast::kind::stmt_if || stmt.as_if->test != ast::kind::expr_not)
return;
auto& test = stmt.as_if->test.as_not->rvalue;
if (test != ast::kind::expr_isdefined || test.as_isdefined->arg != ast::kind::expr_identifier)
return;
if (stmt.as_if->stmt != ast::kind::stmt_assign || stmt.as_if->stmt.as_assign->expr != ast::kind::expr_assign_equal)
return;
if (test.as_isdefined->arg != stmt.as_if->stmt.as_assign->expr.as_assign_equal->lvalue)
return;
auto index = 0u;
for (auto& entry : expr->list)
{
if (entry == ast::kind::expr_identifier && entry.as_identifier->value == test.as_isdefined->arg.as_identifier->value)
{
expr->list.erase(expr->list.begin() + index);
expr->list.insert(expr->list.begin() + index, std::move(stmt.as_if->stmt.as_assign->expr));
func_->stmt->list.erase(func_->stmt->list.begin());
break;
}
index++;
}
if (index == expr->list.size()) return;
}
}
} // namespace xsk::arc::t6 } // namespace xsk::arc::t6

1
src/t6/xsk/decompiler.hpp
View File

@ -94,6 +94,7 @@ private:
void process_array_variable(const ast::expr_array::ptr& expr); void process_array_variable(const ast::expr_array::ptr& expr);
void process_field_variable(const ast::expr_field::ptr& expr); void process_field_variable(const ast::expr_field::ptr& expr);
void process_expr_vector(const ast::expr_vector::ptr& expr); void process_expr_vector(const ast::expr_vector::ptr& expr);
void process_expr_parameters(const ast::expr_parameters::ptr& expr);
}; };
} // namespace xsk::arc::t6 } // namespace xsk::arc::t6

3074
src/t6/xsk/parser.cpp
View File

File diff suppressed because it is too large Load Diff

110
src/t6/xsk/parser.hpp
View File

@ -446,6 +446,8 @@ namespace xsk { namespace arc { namespace t6 {
// expr_ternary // expr_ternary
// expr_binary // expr_binary
// expr_primitive // expr_primitive
// expr_parameters_default
// expr_literal
// expr_object // expr_object
char dummy6[sizeof (ast::expr)]; char dummy6[sizeof (ast::expr)];
@ -1068,52 +1070,54 @@ namespace xsk { namespace arc { namespace t6 {
S_expr_function = 178, // expr_function S_expr_function = 178, // expr_function
S_expr_pointer = 179, // expr_pointer S_expr_pointer = 179, // expr_pointer
S_expr_parameters = 180, // expr_parameters S_expr_parameters = 180, // expr_parameters
S_expr_arguments = 181, // expr_arguments S_expr_parameters_default = 181, // expr_parameters_default
S_expr_arguments_no_empty = 182, // expr_arguments_no_empty S_expr_literal = 182, // expr_literal
S_expr_getnextarraykey = 183, // expr_getnextarraykey S_expr_arguments = 183, // expr_arguments
S_expr_getfirstarraykey = 184, // expr_getfirstarraykey S_expr_arguments_no_empty = 184, // expr_arguments_no_empty
S_expr_getdvarcoloralpha = 185, // expr_getdvarcoloralpha S_expr_getnextarraykey = 185, // expr_getnextarraykey
S_expr_getdvarcolorblue = 186, // expr_getdvarcolorblue S_expr_getfirstarraykey = 186, // expr_getfirstarraykey
S_expr_getdvarcolorgreen = 187, // expr_getdvarcolorgreen S_expr_getdvarcoloralpha = 187, // expr_getdvarcoloralpha
S_expr_getdvarcolorred = 188, // expr_getdvarcolorred S_expr_getdvarcolorblue = 188, // expr_getdvarcolorblue
S_expr_getdvarvector = 189, // expr_getdvarvector S_expr_getdvarcolorgreen = 189, // expr_getdvarcolorgreen
S_expr_getdvarfloat = 190, // expr_getdvarfloat S_expr_getdvarcolorred = 190, // expr_getdvarcolorred
S_expr_getdvarint = 191, // expr_getdvarint S_expr_getdvarvector = 191, // expr_getdvarvector
S_expr_getdvar = 192, // expr_getdvar S_expr_getdvarfloat = 192, // expr_getdvarfloat
S_expr_gettime = 193, // expr_gettime S_expr_getdvarint = 193, // expr_getdvarint
S_expr_abs = 194, // expr_abs S_expr_getdvar = 194, // expr_getdvar
S_expr_vectortoangles = 195, // expr_vectortoangles S_expr_gettime = 195, // expr_gettime
S_expr_angleclamp180 = 196, // expr_angleclamp180 S_expr_abs = 196, // expr_abs
S_expr_anglestoforward = 197, // expr_anglestoforward S_expr_vectortoangles = 197, // expr_vectortoangles
S_expr_anglestoright = 198, // expr_anglestoright S_expr_angleclamp180 = 198, // expr_angleclamp180
S_expr_anglestoup = 199, // expr_anglestoup S_expr_anglestoforward = 199, // expr_anglestoforward
S_expr_vectorscale = 200, // expr_vectorscale S_expr_anglestoright = 200, // expr_anglestoright
S_expr_isdefined = 201, // expr_isdefined S_expr_anglestoup = 201, // expr_anglestoup
S_expr_reference = 202, // expr_reference S_expr_vectorscale = 202, // expr_vectorscale
S_expr_array = 203, // expr_array S_expr_isdefined = 203, // expr_isdefined
S_expr_field = 204, // expr_field S_expr_reference = 204, // expr_reference
S_expr_size = 205, // expr_size S_expr_array = 205, // expr_array
S_expr_paren = 206, // expr_paren S_expr_field = 206, // expr_field
S_expr_object = 207, // expr_object S_expr_size = 207, // expr_size
S_expr_empty_array = 208, // expr_empty_array S_expr_paren = 208, // expr_paren
S_expr_undefined = 209, // expr_undefined S_expr_object = 209, // expr_object
S_expr_game = 210, // expr_game S_expr_empty_array = 210, // expr_empty_array
S_expr_self = 211, // expr_self S_expr_undefined = 211, // expr_undefined
S_expr_anim = 212, // expr_anim S_expr_game = 212, // expr_game
S_expr_level = 213, // expr_level S_expr_self = 213, // expr_self
S_expr_animation = 214, // expr_animation S_expr_anim = 214, // expr_anim
S_expr_animtree = 215, // expr_animtree S_expr_level = 215, // expr_level
S_expr_identifier_nosize = 216, // expr_identifier_nosize S_expr_animation = 216, // expr_animation
S_expr_identifier = 217, // expr_identifier S_expr_animtree = 217, // expr_animtree
S_expr_path = 218, // expr_path S_expr_identifier_nosize = 218, // expr_identifier_nosize
S_expr_istring = 219, // expr_istring S_expr_identifier = 219, // expr_identifier
S_expr_string = 220, // expr_string S_expr_path = 220, // expr_path
S_expr_vector = 221, // expr_vector S_expr_istring = 221, // expr_istring
S_expr_hash = 222, // expr_hash S_expr_string = 222, // expr_string
S_expr_float = 223, // expr_float S_expr_vector = 223, // expr_vector
S_expr_integer = 224, // expr_integer S_expr_hash = 224, // expr_hash
S_expr_false = 225, // expr_false S_expr_float = 225, // expr_float
S_expr_true = 226 // expr_true S_expr_integer = 226, // expr_integer
S_expr_false = 227, // expr_false
S_expr_true = 228 // expr_true
}; };
}; };
@ -1179,6 +1183,8 @@ namespace xsk { namespace arc { namespace t6 {
case symbol_kind::S_expr_ternary: // expr_ternary case symbol_kind::S_expr_ternary: // expr_ternary
case symbol_kind::S_expr_binary: // expr_binary case symbol_kind::S_expr_binary: // expr_binary
case symbol_kind::S_expr_primitive: // expr_primitive case symbol_kind::S_expr_primitive: // expr_primitive
case symbol_kind::S_expr_parameters_default: // expr_parameters_default
case symbol_kind::S_expr_literal: // expr_literal
case symbol_kind::S_expr_object: // expr_object case symbol_kind::S_expr_object: // expr_object
value.move< ast::expr > (std::move (that.value)); value.move< ast::expr > (std::move (that.value));
break; break;
@ -2758,6 +2764,8 @@ switch (yykind)
case symbol_kind::S_expr_ternary: // expr_ternary case symbol_kind::S_expr_ternary: // expr_ternary
case symbol_kind::S_expr_binary: // expr_binary case symbol_kind::S_expr_binary: // expr_binary
case symbol_kind::S_expr_primitive: // expr_primitive case symbol_kind::S_expr_primitive: // expr_primitive
case symbol_kind::S_expr_parameters_default: // expr_parameters_default
case symbol_kind::S_expr_literal: // expr_literal
case symbol_kind::S_expr_object: // expr_object case symbol_kind::S_expr_object: // expr_object
value.template destroy< ast::expr > (); value.template destroy< ast::expr > ();
break; break;
@ -5496,8 +5504,8 @@ switch (yykind)
/// Constants. /// Constants.
enum enum
{ {
yylast_ = 3632, ///< Last index in yytable_. yylast_ = 3634, ///< Last index in yytable_.
yynnts_ = 100, ///< Number of nonterminal symbols. yynnts_ = 102, ///< Number of nonterminal symbols.
yyfinal_ = 22 ///< Termination state number. yyfinal_ = 22 ///< Termination state number.
}; };
@ -5553,6 +5561,8 @@ switch (yykind)
case symbol_kind::S_expr_ternary: // expr_ternary case symbol_kind::S_expr_ternary: // expr_ternary
case symbol_kind::S_expr_binary: // expr_binary case symbol_kind::S_expr_binary: // expr_binary
case symbol_kind::S_expr_primitive: // expr_primitive case symbol_kind::S_expr_primitive: // expr_primitive
case symbol_kind::S_expr_parameters_default: // expr_parameters_default
case symbol_kind::S_expr_literal: // expr_literal
case symbol_kind::S_expr_object: // expr_object case symbol_kind::S_expr_object: // expr_object
value.copy< ast::expr > (YY_MOVE (that.value)); value.copy< ast::expr > (YY_MOVE (that.value));
break; break;
@ -5940,6 +5950,8 @@ switch (yykind)
case symbol_kind::S_expr_ternary: // expr_ternary case symbol_kind::S_expr_ternary: // expr_ternary
case symbol_kind::S_expr_binary: // expr_binary case symbol_kind::S_expr_binary: // expr_binary
case symbol_kind::S_expr_primitive: // expr_primitive case symbol_kind::S_expr_primitive: // expr_primitive
case symbol_kind::S_expr_parameters_default: // expr_parameters_default
case symbol_kind::S_expr_literal: // expr_literal
case symbol_kind::S_expr_object: // expr_object case symbol_kind::S_expr_object: // expr_object
value.move< ast::expr > (YY_MOVE (s.value)); value.move< ast::expr > (YY_MOVE (s.value));
break; break;
@ -6334,7 +6346,7 @@ switch (yykind)
#line 13 "parser.ypp" #line 13 "parser.ypp"
} } } // xsk::arc::t6 } } } // xsk::arc::t6
#line 6338 "parser.hpp" #line 6350 "parser.hpp"

2
src/utils/xsk/arc/nodetree.cpp
View File

@ -772,7 +772,7 @@ auto expr_parameters::print() const -> std::string
for (const auto& entry : list) for (const auto& entry : list)
{ {
data += " " + entry->print(); data += " " + entry.print();
data += (&entry != &list.back()) ? "," : " "; data += (&entry != &list.back()) ? "," : " ";
} }

2
src/utils/xsk/arc/nodetree.hpp
View File

@ -999,7 +999,7 @@ struct expr_parameters : public node
{ {
using ptr = std::unique_ptr<expr_parameters>; using ptr = std::unique_ptr<expr_parameters>;
std::vector<expr_identifier::ptr> list; std::vector<expr> list;
expr_parameters(); expr_parameters();
expr_parameters(const location& loc); expr_parameters(const location& loc);