X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=ast.cpp;h=7b444f8a402dfdf18efaab0ae3d171c1174972ae;hp=df2d6769ccafbfb75c3e568400a9c5f73bf355f5;hb=092067482fddeccf1b3e42ff09a046f6555cd11e;hpb=90b5a6538a10f60d08ee3059b8f70e4e076dc30d diff --git a/ast.cpp b/ast.cpp index df2d676..7b444f8 100644 --- a/ast.cpp +++ b/ast.cpp @@ -10,53 +10,6 @@ #include "algo.h" -#define ast_instantiate(T, ctx, destroyfn) \ - T* self = new T; \ - if (!self) return nullptr; \ - ast_node_init(self, ctx, TYPE_##T); \ - self->m_destroy = (ast_node_delete*)destroyfn - -/* - * forward declarations, these need not be in ast.h for obvious - * static reasons. - */ -static bool ast_member_codegen(ast_member*, ast_function*, bool lvalue, ir_value**); -static void ast_array_index_delete(ast_array_index*); -static bool ast_array_index_codegen(ast_array_index*, ast_function*, bool lvalue, ir_value**); -static void ast_argpipe_delete(ast_argpipe*); -static bool ast_argpipe_codegen(ast_argpipe*, ast_function*, bool lvalue, ir_value**); -static void ast_store_delete(ast_store*); -static bool ast_store_codegen(ast_store*, ast_function*, bool lvalue, ir_value**); -static void ast_ifthen_delete(ast_ifthen*); -static bool ast_ifthen_codegen(ast_ifthen*, ast_function*, bool lvalue, ir_value**); -static void ast_ternary_delete(ast_ternary*); -static bool ast_ternary_codegen(ast_ternary*, ast_function*, bool lvalue, ir_value**); -static void ast_loop_delete(ast_loop*); -static bool ast_loop_codegen(ast_loop*, ast_function*, bool lvalue, ir_value**); -static void ast_breakcont_delete(ast_breakcont*); -static bool ast_breakcont_codegen(ast_breakcont*, ast_function*, bool lvalue, ir_value**); -static void ast_switch_delete(ast_switch*); -static bool ast_switch_codegen(ast_switch*, ast_function*, bool lvalue, ir_value**); -static void ast_label_delete(ast_label*); -static void ast_label_register_goto(ast_label*, ast_goto*); -static bool ast_label_codegen(ast_label*, ast_function*, bool lvalue, ir_value**); -static bool ast_goto_codegen(ast_goto*, ast_function*, bool lvalue, ir_value**); -static void ast_goto_delete(ast_goto*); -static void ast_call_delete(ast_call*); -static bool ast_call_codegen(ast_call*, ast_function*, bool lvalue, ir_value**); -static bool ast_block_codegen(ast_block*, ast_function*, bool lvalue, ir_value**); -static void ast_unary_delete(ast_unary*); -static bool ast_unary_codegen(ast_unary*, ast_function*, bool lvalue, ir_value**); -static void ast_entfield_delete(ast_entfield*); -static bool ast_entfield_codegen(ast_entfield*, ast_function*, bool lvalue, ir_value**); -static void ast_return_delete(ast_return*); -static bool ast_return_codegen(ast_return*, ast_function*, bool lvalue, ir_value**); -static void ast_binstore_delete(ast_binstore*); -static bool ast_binstore_codegen(ast_binstore*, ast_function*, bool lvalue, ir_value**); -static void ast_binary_delete(ast_binary*); -static bool ast_binary_codegen(ast_binary*, ast_function*, bool lvalue, ir_value**); -static bool ast_state_codegen(ast_state*, ast_function*, bool lvalue, ir_value**); - /* Initialize main ast node aprts */ ast_node::ast_node(lex_ctx_t ctx, int node_type) : m_context(ctx) @@ -71,9 +24,10 @@ ast_node::~ast_node() } /* weight and side effects */ -void ast_node::propagate_side_effects(ast_node *other) const +void ast_node::propagateSideEffects(const ast_node *other) { - other->m_side_effects = m_side_effects; + if (other->m_side_effects) + m_side_effects = true; } /* General expression initialization */ @@ -83,6 +37,8 @@ ast_expression::ast_expression(lex_ctx_t ctx, int nodetype, qc_type type) { if (OPTS_OPTION_BOOL(OPTION_COVERAGE)) m_flags |= AST_FLAG_BLOCK_COVERAGE; + if (OPTS_FLAG(DEFAULT_ERASEABLE)) + m_flags |= AST_FLAG_ERASEABLE; } ast_expression::ast_expression(lex_ctx_t ctx, int nodetype) : ast_expression(ctx, nodetype, TYPE_VOID) @@ -96,34 +52,43 @@ ast_expression::~ast_expression() delete m_varparam; } +ast_expression::ast_expression(ast_copy_type_t, const ast_expression &other) + : ast_expression(ast_copy_type, other.m_context, other) +{} + +ast_expression::ast_expression(ast_copy_type_t, lex_ctx_t ctx, const ast_expression &other) + : ast_expression(ast_copy_type, TYPE_ast_expression, ctx, other) +{} + ast_expression::ast_expression(ast_copy_type_t, int nodetype, const ast_expression &other) - : ast_expression(other.m_context, nodetype) + : ast_expression(ast_copy_type, nodetype, other.m_context, other) +{} + +ast_expression::ast_expression(ast_copy_type_t, int nodetype, lex_ctx_t ctx, const ast_expression &other) + : ast_expression(ctx, nodetype) { m_vtype = other.m_vtype; m_count = other.m_count; m_flags = other.m_flags; if (other.m_next) - m_next = new ast_expression(ast_copy_type, TYPE_ast_expression, *other.m_next); + m_next = new ast_expression(ast_copy_type, *other.m_next); m_type_params.reserve(other.m_type_params.size()); for (auto &it : other.m_type_params) m_type_params.emplace_back(new ast_value(ast_copy_type, *it)); } -ast_expression::ast_expression(ast_copy_type_t, const ast_expression &other) - : ast_expression(other.m_context, TYPE_ast_expression) -{} -ast_expression *ast_expression::shallow_type(lex_ctx_t ctx, qc_type vtype) { +ast_expression *ast_expression::shallowType(lex_ctx_t ctx, qc_type vtype) { auto expr = new ast_expression(ctx, TYPE_ast_expression); expr->m_vtype = vtype; return expr; } -void ast_expression::adopt_type(const ast_expression &other) +void ast_expression::adoptType(const ast_expression &other) { m_vtype = other.m_vtype; if (other.m_next) - m_next = new ast_expression(ast_copy_type, TYPE_ast_expression, *other.m_next); + m_next = new ast_expression(ast_copy_type, *other.m_next); m_count = other.m_count; m_flags = other.m_flags; m_type_params.clear(); @@ -132,7 +97,7 @@ void ast_expression::adopt_type(const ast_expression &other) m_type_params.emplace_back(new ast_value(ast_copy_type, *it)); } -bool ast_expression::compare_type(const ast_expression &other) const +bool ast_expression::compareType(const ast_expression &other) const { if (m_vtype == TYPE_NIL || other.m_vtype == TYPE_NIL) @@ -151,27 +116,42 @@ bool ast_expression::compare_type(const ast_expression &other) const if (m_type_params.size()) { size_t i; for (i = 0; i < m_type_params.size(); ++i) { - if (!m_type_params[i]->compare_type(*other.m_type_params[i])) + if (!m_type_params[i]->compareType(*other.m_type_params[i])) return false; } } if (m_next) - return m_next->compare_type(*other.m_next); + return m_next->compareType(*other.m_next); return true; } +bool ast_expression::codegen(ast_function*, bool, ir_value**) { + compile_error(m_context, "ast_expression::codegen called!"); + abort(); + return false; +} + ast_value::ast_value(ast_copy_type_t, const ast_value &other, const std::string &name) : ast_value(ast_copy_type, static_cast(other), name) -{} +{ + m_keep_node = true; // keep values, always + memset(&m_constval, 0, sizeof(m_constval)); +} ast_value::ast_value(ast_copy_type_t, const ast_value &other) : ast_value(ast_copy_type, static_cast(other), other.m_name) -{} +{ + m_keep_node = true; // keep values, always + memset(&m_constval, 0, sizeof(m_constval)); +} ast_value::ast_value(ast_copy_type_t, const ast_expression &other, const std::string &name) - : ast_expression(ast_copy_type, other) + : ast_expression(ast_copy_type, TYPE_ast_value, other) , m_name(name) -{} +{ + m_keep_node = true; // keep values, always + memset(&m_constval, 0, sizeof(m_constval)); +} ast_value::ast_value(lex_ctx_t ctx, const std::string &name, qc_type t) : ast_expression(ctx, TYPE_ast_value, t) @@ -201,8 +181,6 @@ ast_value::~ast_value() break; } } - if (m_ir_values) - mem_d(m_ir_values); // initlist imples an array which implies .next in the expression exists. if (m_initlist.size() && m_next->m_vtype == TYPE_STRING) { @@ -304,7 +282,7 @@ void ast_type_to_string(const ast_expression *e, char *buf, size_t bufsize) buf[pos] = 0; } -void ast_value::add_param(ast_value *p) +void ast_value::addParam(ast_value *p) { m_type_params.emplace_back(p); } @@ -337,14 +315,14 @@ ast_binary::ast_binary(lex_ctx_t ctx, int op, m_left = left; m_right = right; - propagate_side_effects(left); - propagate_side_effects(right); + propagateSideEffects(left); + propagateSideEffects(right); if (op >= INSTR_EQ_F && op <= INSTR_GT) m_vtype = TYPE_FLOAT; else if (op == INSTR_AND || op == INSTR_OR) { if (OPTS_FLAG(PERL_LOGIC)) - adopt_type(*right); + adoptType(*right); else m_vtype = TYPE_FLOAT; } @@ -377,7 +355,7 @@ ast_binstore::ast_binstore(lex_ctx_t ctx, int storop, int mathop, , m_keep_dest(false) { m_side_effects = true; - adopt_type(*left); + adoptType(*left); } ast_binstore::~ast_binstore() @@ -389,16 +367,20 @@ ast_binstore::~ast_binstore() ast_unary* ast_unary::make(lex_ctx_t ctx, int op, ast_expression *expr) { - if (ast_istype(expr, ast_unary) && OPTS_OPTIMIZATION(OPTIM_PEEPHOLE)) { - ast_unary *prev = (ast_unary*)((ast_unary*)expr)->m_operand; - - /* Handle for double negation */ - if (((ast_unary*)expr)->m_op == op) - prev = (ast_unary*)((ast_unary*)expr)->m_operand; - - if (ast_istype(prev, ast_unary)) { - ++opts_optimizationcount[OPTIM_PEEPHOLE]; - return prev; + // handle double negation, double bitwise or logical not + if (op == opid2('!','P') || + op == opid2('~','P') || + op == opid2('-','P')) + { + if (ast_istype(expr, ast_unary) && OPTS_OPTIMIZATION(OPTIM_PEEPHOLE)) { + ast_unary *unary = reinterpret_cast(expr); + if (unary->m_op == op) { + auto out = reinterpret_cast(unary->m_operand); + unary->m_operand = nullptr; + delete unary; + ++opts_optimizationcount[OPTIM_PEEPHOLE]; + return out; + } } } @@ -410,7 +392,7 @@ ast_unary::ast_unary(lex_ctx_t ctx, int op, ast_expression *expr) , m_op(op) , m_operand(expr) { - propagate_side_effects(expr); + propagateSideEffects(expr); if ((op >= INSTR_NOT_F && op <= INSTR_NOT_FNC) || op == VINSTR_NEG_F) { m_vtype = TYPE_FLOAT; } else if (op == VINSTR_NEG_V) { @@ -431,7 +413,7 @@ ast_return::ast_return(lex_ctx_t ctx, ast_expression *expr) , m_operand(expr) { if (expr) - propagate_side_effects(expr); + propagateSideEffects(expr); } ast_return::~ast_return() @@ -452,15 +434,15 @@ ast_entfield::ast_entfield(lex_ctx_t ctx, ast_expression *entity, ast_expression , m_entity(entity) , m_field(field) { - propagate_side_effects(m_entity); - propagate_side_effects(m_field); + propagateSideEffects(m_entity); + propagateSideEffects(m_field); if (!outtype) { compile_error(ctx, "ast_entfield: field has no type"); m_vtype = TYPE_VOID; } else - adopt_type(*outtype); + adoptType(*outtype); } ast_entfield::~ast_entfield() @@ -498,10 +480,10 @@ ast_member::ast_member(lex_ctx_t ctx, ast_expression *owner, unsigned int field, m_next = nullptr; } else { m_vtype = TYPE_FIELD; - m_next = ast_shallow_type(ctx, TYPE_FLOAT); + m_next = ast_expression::shallowType(ctx, TYPE_FLOAT); } - propagate_side_effects(owner); + propagateSideEffects(owner); } ast_member::~ast_member() @@ -531,14 +513,14 @@ ast_array_index::ast_array_index(lex_ctx_t ctx, ast_expression *array, ast_expre , m_array(array) , m_index(index) { - propagate_side_effects(array); - propagate_side_effects(index); + propagateSideEffects(array); + propagateSideEffects(index); ast_expression *outtype = m_array->m_next; - adopt_type(*outtype); + adoptType(*outtype); if (array->m_vtype == TYPE_FIELD && outtype->m_vtype == TYPE_ARRAY) { - // FIXME: investigate - this is not possible after adopt_type + // FIXME: investigate - this is not possible after adoptType //if (m_vtype != TYPE_ARRAY) { // compile_error(self->m_context, "array_index node on type"); // ast_array_index_delete(self); @@ -578,7 +560,7 @@ ast_store::ast_store(lex_ctx_t ctx, int op, ast_expression *dest, ast_expression , m_source(source) { m_side_effects = true; - adopt_type(*dest); + adoptType(*dest); } ast_store::~ast_store() @@ -593,11 +575,11 @@ ast_ifthen::ast_ifthen(lex_ctx_t ctx, ast_expression *cond, ast_expression *ontr , m_on_true(ontrue) , m_on_false(onfalse) { - propagate_side_effects(cond); + propagateSideEffects(cond); if (ontrue) - propagate_side_effects(ontrue); + propagateSideEffects(ontrue); if (onfalse) - propagate_side_effects(onfalse); + propagateSideEffects(onfalse); } ast_ifthen::~ast_ifthen() @@ -615,14 +597,14 @@ ast_ternary::ast_ternary(lex_ctx_t ctx, ast_expression *cond, ast_expression *on , m_on_true(ontrue) , m_on_false(onfalse) { - propagate_side_effects(cond); - propagate_side_effects(ontrue); - propagate_side_effects(onfalse); + propagateSideEffects(cond); + propagateSideEffects(ontrue); + propagateSideEffects(onfalse); if (ontrue->m_vtype == TYPE_NIL) - adopt_type(onfalse); + adoptType(*onfalse); else - adopt_type(ontrue); + adoptType(*ontrue); } ast_ternary::~ast_ternary() @@ -641,7 +623,7 @@ ast_loop::ast_loop(lex_ctx_t ctx, ast_expression *postcond, bool post_not, ast_expression *increment, ast_expression *body) - , ast_expression(ctx, TYPE_ast_loop) + : ast_expression(ctx, TYPE_ast_loop) , m_initexpr(initexpr) , m_precond(precond) , m_postcond(postcond) @@ -651,15 +633,15 @@ ast_loop::ast_loop(lex_ctx_t ctx, , m_post_not(post_not) { if (initexpr) - propagate_side_effects(initexpr); + propagateSideEffects(initexpr); if (precond) - propagate_side_effects(precond); + propagateSideEffects(precond); if (postcond) - propagate_side_effects(postcond); + propagateSideEffects(postcond); if (increment) - propagate_side_effects(increment); + propagateSideEffects(increment); if (body) - propagate_side_effects(body); + propagateSideEffects(body); } ast_loop::~ast_loop() @@ -676,180 +658,134 @@ ast_loop::~ast_loop() ast_unref(m_body); } -ast_breakcont* ast_breakcont_new(lex_ctx_t ctx, bool iscont, unsigned int levels) +ast_breakcont::ast_breakcont(lex_ctx_t ctx, bool iscont, unsigned int levels) + : ast_expression(ctx, TYPE_ast_breakcont) + , m_is_continue(iscont) + , m_levels(levels) { - ast_instantiate(ast_breakcont, ctx, ast_breakcont_delete); - ast_expression_init((ast_expression*)self, (ast_expression_codegen*)&ast_breakcont_codegen); - - self->m_is_continue = iscont; - self->m_levels = levels; - - return self; } -void ast_breakcont_delete(ast_breakcont *self) +ast_breakcont::~ast_breakcont() { - ast_expression_delete((ast_expression*)self); - self->~ast_breakcont(); - mem_d(self); } -ast_switch* ast_switch_new(lex_ctx_t ctx, ast_expression *op) +ast_switch::ast_switch(lex_ctx_t ctx, ast_expression *op) + : ast_expression(ctx, TYPE_ast_switch) + , m_operand(op) { - ast_instantiate(ast_switch, ctx, ast_switch_delete); - ast_expression_init((ast_expression*)self, (ast_expression_codegen*)&ast_switch_codegen); - - self->m_operand = op; - - self->propagate_side_effects(op); - - return self; + propagateSideEffects(op); } -void ast_switch_delete(ast_switch *self) +ast_switch::~ast_switch() { - ast_unref(self->m_operand); + ast_unref(m_operand); - for (auto &it : self->m_cases) { + for (auto &it : m_cases) { if (it.m_value) ast_unref(it.m_value); ast_unref(it.m_code); } - - ast_expression_delete((ast_expression*)self); - self->~ast_switch(); - mem_d(self); } -ast_label* ast_label_new(lex_ctx_t ctx, const char *name, bool undefined) +ast_label::ast_label(lex_ctx_t ctx, const std::string &name, bool undefined) + : ast_expression(ctx, TYPE_ast_label) + , m_name(name) + , m_irblock(nullptr) + , m_undefined(undefined) { - ast_instantiate(ast_label, ctx, ast_label_delete); - ast_expression_init((ast_expression*)self, (ast_expression_codegen*)&ast_label_codegen); - - self->m_vtype = TYPE_NOEXPR; - - self->m_name = util_strdup(name); - self->m_irblock = nullptr; - self->m_undefined = undefined; - - return self; + m_vtype = TYPE_NOEXPR; } -void ast_label_delete(ast_label *self) +ast_label::~ast_label() { - mem_d((void*)self->m_name); - ast_expression_delete((ast_expression*)self); - self->~ast_label(); - mem_d(self); } -static void ast_label_register_goto(ast_label *self, ast_goto *g) +void ast_label::registerGoto(ast_goto *g) { - self->m_gotos.push_back(g); + m_gotos.push_back(g); } -ast_goto* ast_goto_new(lex_ctx_t ctx, const char *name) +ast_goto::ast_goto(lex_ctx_t ctx, const std::string &name) + : ast_expression(ctx, TYPE_ast_goto) + , m_name(name) + , m_target(nullptr) + , m_irblock_from(nullptr) { - ast_instantiate(ast_goto, ctx, ast_goto_delete); - ast_expression_init((ast_expression*)self, (ast_expression_codegen*)&ast_goto_codegen); - - self->m_name = util_strdup(name); - self->m_target = nullptr; - self->m_irblock_from = nullptr; - - return self; } -void ast_goto_delete(ast_goto *self) +ast_goto::~ast_goto() { - mem_d((void*)self->m_name); - ast_expression_delete((ast_expression*)self); - self->~ast_goto(); - mem_d(self); } -void ast_goto_set_label(ast_goto *self, ast_label *label) +void ast_goto::setLabel(ast_label *label) { - self->m_target = label; + m_target = label; } -ast_state* ast_state_new(lex_ctx_t ctx, ast_expression *frame, ast_expression *think) +ast_state::ast_state(lex_ctx_t ctx, ast_expression *frame, ast_expression *think) + : ast_expression(ctx, TYPE_ast_expression) + , m_framenum(frame) + , m_nextthink(think) { - ast_instantiate(ast_state, ctx, ast_state_delete); - ast_expression_init((ast_expression*)self, (ast_expression_codegen*)&ast_state_codegen); - self->m_framenum = frame; - self->m_nextthink = think; - return self; } -void ast_state_delete(ast_state *self) +ast_state::~ast_state() { - if (self->m_framenum) - ast_unref(self->m_framenum); - if (self->m_nextthink) - ast_unref(self->m_nextthink); - - ast_expression_delete((ast_expression*)self); - self->~ast_state(); - mem_d(self); + if (m_framenum) + ast_unref(m_framenum); + if (m_nextthink) + ast_unref(m_nextthink); } -ast_call* ast_call_new(lex_ctx_t ctx, - ast_expression *funcexpr) +ast_call *ast_call::make(lex_ctx_t ctx, ast_expression *funcexpr) { - ast_instantiate(ast_call, ctx, ast_call_delete); if (!funcexpr->m_next) { compile_error(ctx, "not a function"); - mem_d(self); return nullptr; } - ast_expression_init((ast_expression*)self, (ast_expression_codegen*)&ast_call_codegen); - - self->m_side_effects = true; - - self->m_func = funcexpr; - self->m_va_count = nullptr; - - ast_type_adopt(self, funcexpr->m_next); + return new ast_call(ctx, funcexpr); +} - return self; +ast_call::ast_call(lex_ctx_t ctx, ast_expression *funcexpr) + : ast_expression(ctx, TYPE_ast_call) + , m_func(funcexpr) + , m_va_count(nullptr) +{ + m_side_effects = true; + adoptType(*funcexpr->m_next); } -void ast_call_delete(ast_call *self) +ast_call::~ast_call() { - for (auto &it : self->m_params) + for (auto &it : m_params) ast_unref(it); - if (self->m_func) - ast_unref(self->m_func); - - if (self->m_va_count) - ast_unref(self->m_va_count); + if (m_func) + ast_unref(m_func); - ast_expression_delete((ast_expression*)self); - self->~ast_call(); - mem_d(self); + if (m_va_count) + ast_unref(m_va_count); } -static bool ast_call_check_vararg(ast_call *self, ast_expression *va_type, ast_expression *exp_type) +bool ast_call::checkVararg(ast_expression *va_type, ast_expression *exp_type) const { char texp[1024]; char tgot[1024]; if (!exp_type) return true; - if (!va_type || !ast_compare_type(va_type, exp_type)) + if (!va_type || !va_type->compareType(*exp_type)) { if (va_type && exp_type) { ast_type_to_string(va_type, tgot, sizeof(tgot)); ast_type_to_string(exp_type, texp, sizeof(texp)); if (OPTS_FLAG(UNSAFE_VARARGS)) { - if (compile_warning(self->m_context, WARN_UNSAFE_TYPES, + if (compile_warning(m_context, WARN_UNSAFE_TYPES, "piped variadic argument differs in type: constrained to type %s, expected type %s", tgot, texp)) return false; } else { - compile_error(self->m_context, + compile_error(m_context, "piped variadic argument differs in type: constrained to type %s, expected type %s", tgot, texp); return false; @@ -859,12 +795,12 @@ static bool ast_call_check_vararg(ast_call *self, ast_expression *va_type, ast_e { ast_type_to_string(exp_type, texp, sizeof(texp)); if (OPTS_FLAG(UNSAFE_VARARGS)) { - if (compile_warning(self->m_context, WARN_UNSAFE_TYPES, + if (compile_warning(m_context, WARN_UNSAFE_TYPES, "piped variadic argument may differ in type: expected type %s", texp)) return false; } else { - compile_error(self->m_context, + compile_error(m_context, "piped variadic argument may differ in type: expected type %s", texp); return false; @@ -874,54 +810,54 @@ static bool ast_call_check_vararg(ast_call *self, ast_expression *va_type, ast_e return true; } -bool ast_call_check_types(ast_call *self, ast_expression *va_type) +bool ast_call::checkTypes(ast_expression *va_type) const { char texp[1024]; char tgot[1024]; size_t i; bool retval = true; - const ast_expression *func = self->m_func; - size_t count = self->m_params.size(); - if (count > func->m_type_params.size()) - count = func->m_type_params.size(); + + size_t count = m_params.size(); + if (count > m_func->m_type_params.size()) + count = m_func->m_type_params.size(); for (i = 0; i < count; ++i) { - if (ast_istype(self->m_params[i], ast_argpipe)) { + if (ast_istype(m_params[i], ast_argpipe)) { /* warn about type safety instead */ if (i+1 != count) { - compile_error(self->m_context, "argpipe must be the last parameter to a function call"); + compile_error(m_context, "argpipe must be the last parameter to a function call"); return false; } - if (!ast_call_check_vararg(self, va_type, (ast_expression*)func->m_type_params[i])) + if (!checkVararg(va_type, m_func->m_type_params[i].get())) retval = false; } - else if (!ast_compare_type(self->m_params[i], (ast_expression*)(func->m_type_params[i]))) + else if (!m_params[i]->compareType(*m_func->m_type_params[i])) { - ast_type_to_string(self->m_params[i], tgot, sizeof(tgot)); - ast_type_to_string((ast_expression*)func->m_type_params[i], texp, sizeof(texp)); - compile_error(self->m_context, "invalid type for parameter %u in function call: expected %s, got %s", + ast_type_to_string(m_params[i], tgot, sizeof(tgot)); + ast_type_to_string(m_func->m_type_params[i].get(), texp, sizeof(texp)); + compile_error(m_context, "invalid type for parameter %u in function call: expected %s, got %s", (unsigned int)(i+1), texp, tgot); /* we don't immediately return */ retval = false; } } - count = self->m_params.size(); - if (count > func->m_type_params.size() && func->m_varparam) { + count = m_params.size(); + if (count > m_func->m_type_params.size() && m_func->m_varparam) { for (; i < count; ++i) { - if (ast_istype(self->m_params[i], ast_argpipe)) { + if (ast_istype(m_params[i], ast_argpipe)) { /* warn about type safety instead */ if (i+1 != count) { - compile_error(self->m_context, "argpipe must be the last parameter to a function call"); + compile_error(m_context, "argpipe must be the last parameter to a function call"); return false; } - if (!ast_call_check_vararg(self, va_type, func->m_varparam)) + if (!checkVararg(va_type, m_func->m_varparam)) retval = false; } - else if (!ast_compare_type(self->m_params[i], func->m_varparam)) + else if (!m_params[i]->compareType(*m_func->m_varparam)) { - ast_type_to_string(self->m_params[i], tgot, sizeof(tgot)); - ast_type_to_string(func->m_varparam, texp, sizeof(texp)); - compile_error(self->m_context, "invalid type for variadic parameter %u in function call: expected %s, got %s", + ast_type_to_string(m_params[i], tgot, sizeof(tgot)); + ast_type_to_string(m_func->m_varparam, texp, sizeof(texp)); + compile_error(m_context, "invalid type for variadic parameter %u in function call: expected %s, got %s", (unsigned int)(i+1), texp, tgot); /* we don't immediately return */ retval = false; @@ -931,120 +867,99 @@ bool ast_call_check_types(ast_call *self, ast_expression *va_type) return retval; } -ast_block* ast_block_new(lex_ctx_t ctx) +ast_block::ast_block(lex_ctx_t ctx) + : ast_expression(ctx, TYPE_ast_block) { - ast_instantiate(ast_block, ctx, ast_block_delete); - ast_expression_init((ast_expression*)self, - (ast_expression_codegen*)&ast_block_codegen); - return self; } -bool ast_block_add_expr(ast_block *self, ast_expression *e) +ast_block::~ast_block() { - self->propagate_side_effects(e); - self->m_exprs.push_back(e); - if (self->m_next) { - ast_delete(self->m_next); - self->m_next = nullptr; - } - ast_type_adopt(self, e); - return true; + for (auto &it : m_exprs) ast_unref(it); + for (auto &it : m_locals) delete it; + for (auto &it : m_collect) delete it; } -void ast_block_collect(ast_block *self, ast_expression *expr) +void ast_block::setType(const ast_expression &from) { - self->m_collect.push_back(expr); - expr->m_keep_node = true; + if (m_next) + delete m_next; + adoptType(from); } -void ast_block_delete(ast_block *self) + +bool ast_block::addExpr(ast_expression *e) { - for (auto &it : self->m_exprs) ast_unref(it); - for (auto &it : self->m_locals) ast_delete(it); - for (auto &it : self->m_collect) ast_delete(it); - ast_expression_delete((ast_expression*)self); - self->~ast_block(); - mem_d(self); + propagateSideEffects(e); + m_exprs.push_back(e); + if (m_next) { + delete m_next; + m_next = nullptr; + } + adoptType(*e); + return true; } -void ast_block_set_type(ast_block *self, ast_expression *from) +void ast_block::collect(ast_expression *expr) { - if (self->m_next) - ast_delete(self->m_next); - ast_type_adopt(self, from); + m_collect.push_back(expr); + expr->m_keep_node = true; } -ast_function* ast_function_new(lex_ctx_t ctx, const char *name, ast_value *vtype) +ast_function *ast_function::make(lex_ctx_t ctx, const std::string &name, ast_value *vtype) { - ast_instantiate(ast_function, ctx, ast_function_delete); - if (!vtype) { - compile_error(self->m_context, "internal error: ast_function_new condition 0"); - goto cleanup; + compile_error(ctx, "internal error: ast_function_new condition 0"); + return nullptr; } else if (vtype->m_hasvalue || vtype->m_vtype != TYPE_FUNCTION) { - compile_error(self->m_context, "internal error: ast_function_new condition %i %i type=%i (probably 2 bodies?)", + compile_error(ctx, "internal error: ast_function_new condition %i %i type=%i (probably 2 bodies?)", (int)!vtype, (int)vtype->m_hasvalue, vtype->m_vtype); - goto cleanup; + return nullptr; } + return new ast_function(ctx, name, vtype); +} - self->m_function_type = vtype; - self->m_name = name ? util_strdup(name) : nullptr; - - self->m_labelcount = 0; - self->m_builtin = 0; - - self->m_ir_func = nullptr; - self->m_curblock = nullptr; - +ast_function::ast_function(lex_ctx_t ctx, const std::string &name, ast_value *vtype) + : ast_node(ctx, TYPE_ast_function) + , m_function_type(vtype) + , m_name(name) + , m_builtin(0) + , m_static_count(0) + , m_ir_func(nullptr) + , m_curblock(nullptr) + , m_labelcount(0) + , m_varargs(nullptr) + , m_argc(nullptr) + , m_fixedparams(nullptr) + , m_return_value(nullptr) +{ vtype->m_hasvalue = true; - vtype->m_constval.vfunc = self; + vtype->m_constval.vfunc = this; +} - self->m_varargs = nullptr; - self->m_argc = nullptr; - self->m_fixedparams = nullptr; - self->m_return_value = nullptr; - self->m_static_count = 0; +ast_function::~ast_function() +{ + if (m_function_type) { + // ast_value_delete(m_function_type); + m_function_type->m_hasvalue = false; + m_function_type->m_constval.vfunc = nullptr; + // We use unref - if it was stored in a global table it is supposed + // to be deleted from *there* + ast_unref(m_function_type); + } - return self; + if (m_fixedparams) + ast_unref(m_fixedparams); + if (m_return_value) + ast_unref(m_return_value); -cleanup: - mem_d(self); - return nullptr; + // force this to be cleared before m_varargs/m_argc as blocks might + // try to access them via ast_unref() + m_blocks.clear(); } -void ast_function_delete(ast_function *self) -{ - if (self->m_name) - mem_d((void*)self->m_name); - if (self->m_function_type) { - /* ast_value_delete(self->m_function_type); */ - self->m_function_type->m_hasvalue = false; - self->m_function_type->m_constval.vfunc = nullptr; - /* We use unref - if it was stored in a global table it is supposed - * to be deleted from *there* - */ - ast_unref(self->m_function_type); - } - for (auto &it : self->m_static_names) - mem_d(it); - // FIXME::DELME:: unique_ptr used on ast_block - //for (auto &it : self->m_blocks) - // ast_delete(it); - if (self->m_varargs) - ast_delete(self->m_varargs); - if (self->m_argc) - ast_delete(self->m_argc); - if (self->m_fixedparams) - ast_unref(self->m_fixedparams); - if (self->m_return_value) - ast_unref(self->m_return_value); - self->~ast_function(); - mem_d(self); -} - -const char* ast_function_label(ast_function *self, const char *prefix) +const char* ast_function::makeLabel(const char *prefix) { size_t id; size_t len; @@ -1057,10 +972,10 @@ const char* ast_function_label(ast_function *self, const char *prefix) return nullptr; } - id = (self->m_labelcount++); + id = (m_labelcount++); len = strlen(prefix); - from = self->m_labelbuf + sizeof(self->m_labelbuf)-1; + from = m_labelbuf + sizeof(m_labelbuf)-1; *from-- = 0; do { *from-- = (id%10) + '0'; @@ -1078,7 +993,7 @@ const char* ast_function_label(ast_function *self, const char *prefix) * But I can't imagine a pituation where the output is truly unnecessary. */ -static void _ast_codegen_output_type(ast_expression *self, ir_value *out) +static void codegen_output_type(ast_expression *self, ir_value *out) { if (out->m_vtype == TYPE_FIELD) out->m_fieldtype = self->m_next->m_vtype; @@ -1086,349 +1001,350 @@ static void _ast_codegen_output_type(ast_expression *self, ir_value *out) out->m_outtype = self->m_next->m_vtype; } -#define codegen_output_type(a,o) (_ast_codegen_output_type(static_cast((a)),(o))) - -bool ast_value_codegen(ast_value *self, ast_function *func, bool lvalue, ir_value **out) +bool ast_value::codegen(ast_function *func, bool lvalue, ir_value **out) { (void)func; (void)lvalue; - if (self->m_vtype == TYPE_NIL) { + if (m_vtype == TYPE_NIL) { *out = func->m_ir_func->m_owner->m_nil; return true; } - /* NOTE: This is the codegen for a variable used in an - * It is not the codegen to generate the value. For this purpose, - * ast_local_codegen and ast_global_codegen are to be used before this - * is executed. ast_function_codegen should take care of its locals, - * and the ast-user should take care of ast_global_codegen to be used - * on all the globals. - */ - if (!self->m_ir_v) { + // NOTE: This is the codegen for a variable used in an expression. + // It is not the codegen to generate the value storage. For this purpose, + // generateLocal and generateGlobal are to be used before this + // is executed. ast_function::generateFunction should take care of its + // locals, and the ast-user should take care of generateGlobal to be used + // on all the globals. + if (!m_ir_v) { char tname[1024]; /* typename is reserved in C++ */ - ast_type_to_string((ast_expression*)self, tname, sizeof(tname)); - compile_error(self->m_context, "ast_value used before generated %s %s", tname, self->m_name); + ast_type_to_string(this, tname, sizeof(tname)); + compile_error(m_context, "ast_value used before generated %s %s", tname, m_name); return false; } - *out = self->m_ir_v; + *out = m_ir_v; return true; } -static bool ast_global_array_set(ast_value *self) +bool ast_value::setGlobalArray() { - size_t count = self->m_initlist.size(); + size_t count = m_initlist.size(); size_t i; - if (count > self->m_count) { - compile_error(self->m_context, "too many elements in initializer"); - count = self->m_count; + if (count > m_count) { + compile_error(m_context, "too many elements in initializer"); + count = m_count; } - else if (count < self->m_count) { + else if (count < m_count) { /* add this? - compile_warning(self->m_context, "not all elements are initialized"); + compile_warning(m_context, "not all elements are initialized"); */ } for (i = 0; i != count; ++i) { - switch (self->m_next->m_vtype) { + switch (m_next->m_vtype) { case TYPE_FLOAT: - if (!ir_value_set_float(self->m_ir_values[i], self->m_initlist[i].vfloat)) + if (!m_ir_values[i]->setFloat(m_initlist[i].vfloat)) return false; break; case TYPE_VECTOR: - if (!ir_value_set_vector(self->m_ir_values[i], self->m_initlist[i].vvec)) + if (!m_ir_values[i]->setVector(m_initlist[i].vvec)) return false; break; case TYPE_STRING: - if (!ir_value_set_string(self->m_ir_values[i], self->m_initlist[i].vstring)) + if (!m_ir_values[i]->setString(m_initlist[i].vstring)) return false; break; case TYPE_ARRAY: /* we don't support them in any other place yet either */ - compile_error(self->m_context, "TODO: nested arrays"); + compile_error(m_context, "TODO: nested arrays"); return false; case TYPE_FUNCTION: /* this requiers a bit more work - similar to the fields I suppose */ - compile_error(self->m_context, "global of type function not properly generated"); + compile_error(m_context, "global of type function not properly generated"); return false; case TYPE_FIELD: - if (!self->m_initlist[i].vfield) { - compile_error(self->m_context, "field constant without vfield set"); + if (!m_initlist[i].vfield) { + compile_error(m_context, "field constant without vfield set"); return false; } - if (!self->m_initlist[i].vfield->m_ir_v) { - compile_error(self->m_context, "field constant generated before its field"); + if (!m_initlist[i].vfield->m_ir_v) { + compile_error(m_context, "field constant generated before its field"); return false; } - if (!ir_value_set_field(self->m_ir_values[i], self->m_initlist[i].vfield->m_ir_v)) + if (!m_ir_values[i]->setField(m_initlist[i].vfield->m_ir_v)) return false; break; default: - compile_error(self->m_context, "TODO: global constant type %i", self->m_vtype); + compile_error(m_context, "TODO: global constant type %i", m_vtype); break; } } return true; } -static bool check_array(ast_value *self, ast_value *array) +bool ast_value::checkArray(const ast_value &array) const { - if (array->m_flags & AST_FLAG_ARRAY_INIT && array->m_initlist.empty()) { - compile_error(self->m_context, "array without size: %s", self->m_name); + if (array.m_flags & AST_FLAG_ARRAY_INIT && array.m_initlist.empty()) { + compile_error(m_context, "array without size: %s", m_name); return false; } - /* we are lame now - considering the way QC works we won't tolerate arrays > 1024 elements */ - if (!array->m_count || array->m_count > OPTS_OPTION_U32(OPTION_MAX_ARRAY_SIZE)) { - compile_error(self->m_context, "Invalid array of size %lu", (unsigned long)array->m_count); + // we are lame now - considering the way QC works we won't tolerate arrays > 1024 elements + if (!array.m_count || array.m_count > OPTS_OPTION_U32(OPTION_MAX_ARRAY_SIZE)) { + compile_error(m_context, "Invalid array of size %lu", (unsigned long)array.m_count); return false; } return true; } -bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield) +bool ast_value::generateGlobal(ir_builder *ir, bool isfield) { - ir_value *v = nullptr; - - if (self->m_vtype == TYPE_NIL) { - compile_error(self->m_context, "internal error: trying to generate a variable of TYPE_NIL"); + if (m_vtype == TYPE_NIL) { + compile_error(m_context, "internal error: trying to generate a variable of TYPE_NIL"); return false; } - if (self->m_hasvalue && self->m_vtype == TYPE_FUNCTION) - { - ir_function *func = ir_builder_create_function(ir, self->m_name, self->m_next->m_vtype); - if (!func) - return false; - func->m_context = self->m_context; - func->m_value->m_context = self->m_context; - - self->m_constval.vfunc->m_ir_func = func; - self->m_ir_v = func->m_value; - if (self->m_flags & AST_FLAG_INCLUDE_DEF) - self->m_ir_v->m_flags |= IR_FLAG_INCLUDE_DEF; - if (self->m_flags & AST_FLAG_ERASEABLE) - self->m_ir_v->m_flags |= IR_FLAG_ERASABLE; - if (self->m_flags & AST_FLAG_BLOCK_COVERAGE) - func->m_flags |= IR_FLAG_BLOCK_COVERAGE; - /* The function is filled later on ast_function_codegen... */ - return true; - } + if (m_hasvalue && m_vtype == TYPE_FUNCTION) + return generateGlobalFunction(ir); - if (isfield && self->m_vtype == TYPE_FIELD) { - ast_expression *fieldtype = self->m_next; + if (isfield && m_vtype == TYPE_FIELD) + return generateGlobalField(ir); - if (self->m_hasvalue) { - compile_error(self->m_context, "TODO: constant field pointers with value"); - goto error; + ir_value *v = nullptr; + if (m_vtype == TYPE_ARRAY) { + v = prepareGlobalArray(ir); + if (!v) + return false; + } else { + // Arrays don't do this since there's no "array" value which spans across the + // whole thing. + v = ir->createGlobal(m_name, m_vtype); + if (!v) { + compile_error(m_context, "ir_builder::createGlobal failed on `%s`", m_name); + return false; } + codegen_output_type(this, v); + v->m_context = m_context; + } - if (fieldtype->m_vtype == TYPE_ARRAY) { - size_t ai; - char *name; - size_t namelen; - - ast_expression *elemtype; - qc_type vtype; - ast_value *array = (ast_value*)fieldtype; - - if (!ast_istype(fieldtype, ast_value)) { - compile_error(self->m_context, "internal error: ast_value required"); - return false; - } - - if (!check_array(self, array)) - return false; + /* link us to the ir_value */ + v->m_cvq = m_cvq; + m_ir_v = v; - elemtype = array->m_next; - vtype = elemtype->m_vtype; + if (m_flags & AST_FLAG_INCLUDE_DEF) + m_ir_v->m_flags |= IR_FLAG_INCLUDE_DEF; + if (m_flags & AST_FLAG_ERASEABLE && !(m_flags & AST_FLAG_NOERASE)) + m_ir_v->m_flags |= IR_FLAG_ERASABLE; + if (m_flags & AST_FLAG_NOREF) + m_ir_v->m_flags |= IR_FLAG_NOREF; - v = ir_builder_create_field(ir, self->m_name, vtype); - if (!v) { - compile_error(self->m_context, "ir_builder_create_global failed on `%s`", self->m_name); + /* initialize */ + if (m_hasvalue) { + switch (m_vtype) + { + case TYPE_FLOAT: + if (!v->setFloat(m_constval.vfloat)) + return false; + break; + case TYPE_VECTOR: + if (!v->setVector(m_constval.vvec)) + return false; + break; + case TYPE_STRING: + if (!v->setString(m_constval.vstring)) + return false; + break; + case TYPE_ARRAY: + if (!setGlobalArray()) + return false; + break; + case TYPE_FUNCTION: + compile_error(m_context, "global of type function not properly generated"); return false; - } - v->m_context = self->m_context; - v->m_unique_life = true; - v->m_locked = true; - array->m_ir_v = self->m_ir_v = v; - - if (self->m_flags & AST_FLAG_INCLUDE_DEF) - self->m_ir_v->m_flags |= IR_FLAG_INCLUDE_DEF; - if (self->m_flags & AST_FLAG_ERASEABLE) - self->m_ir_v->m_flags |= IR_FLAG_ERASABLE; - - namelen = strlen(self->m_name); - name = (char*)mem_a(namelen + 16); - util_strncpy(name, self->m_name, namelen); - - array->m_ir_values = (ir_value**)mem_a(sizeof(array->m_ir_values[0]) * array->m_count); - array->m_ir_values[0] = v; - for (ai = 1; ai < array->m_count; ++ai) { - util_snprintf(name + namelen, 16, "[%u]", (unsigned int)ai); - array->m_ir_values[ai] = ir_builder_create_field(ir, name, vtype); - if (!array->m_ir_values[ai]) { - mem_d(name); - compile_error(self->m_context, "ir_builder_create_global failed on `%s`", name); + /* Cannot generate an IR value for a function, + * need a pointer pointing to a function rather. + */ + case TYPE_FIELD: + if (!m_constval.vfield) { + compile_error(m_context, "field constant without vfield set"); return false; } - array->m_ir_values[ai]->m_context = self->m_context; - array->m_ir_values[ai]->m_unique_life = true; - array->m_ir_values[ai]->m_locked = true; - if (self->m_flags & AST_FLAG_INCLUDE_DEF) - self->m_ir_values[ai]->m_flags |= IR_FLAG_INCLUDE_DEF; - } - mem_d(name); - } - else - { - v = ir_builder_create_field(ir, self->m_name, self->m_next->m_vtype); - if (!v) - return false; - v->m_context = self->m_context; - self->m_ir_v = v; - if (self->m_flags & AST_FLAG_INCLUDE_DEF) - self->m_ir_v->m_flags |= IR_FLAG_INCLUDE_DEF; - - if (self->m_flags & AST_FLAG_ERASEABLE) - self->m_ir_v->m_flags |= IR_FLAG_ERASABLE; + if (!m_constval.vfield->m_ir_v) { + compile_error(m_context, "field constant generated before its field"); + return false; + } + if (!v->setField(m_constval.vfield->m_ir_v)) + return false; + break; + default: + compile_error(m_context, "TODO: global constant type %i", m_vtype); + break; } - return true; } - if (self->m_vtype == TYPE_ARRAY) { - size_t ai; - char *name; - size_t namelen; + return true; +} - ast_expression *elemtype = self->m_next; - qc_type vtype = elemtype->m_vtype; +bool ast_value::generateGlobalFunction(ir_builder *ir) +{ + ir_function *func = ir->createFunction(m_name, m_next->m_vtype); + if (!func) + return false; + func->m_context = m_context; + func->m_value->m_context = m_context; + + m_constval.vfunc->m_ir_func = func; + m_ir_v = func->m_value; + if (m_flags & AST_FLAG_INCLUDE_DEF) + m_ir_v->m_flags |= IR_FLAG_INCLUDE_DEF; + if (m_flags & AST_FLAG_ERASEABLE && !(m_flags & AST_FLAG_NOERASE)) + m_ir_v->m_flags |= IR_FLAG_ERASABLE; + if (m_flags & AST_FLAG_BLOCK_COVERAGE) + func->m_flags |= IR_FLAG_BLOCK_COVERAGE; + // The function is filled later on ast_function::generateFunction... + return true; +} + +bool ast_value::generateGlobalField(ir_builder *ir) +{ + ast_expression *fieldtype = m_next; + + if (m_hasvalue) { + compile_error(m_context, "TODO: constant field pointers with value"); + return false; + } - if (self->m_flags & AST_FLAG_ARRAY_INIT && !self->m_count) { - compile_error(self->m_context, "array `%s' has no size", self->m_name); + if (fieldtype->m_vtype == TYPE_ARRAY) { + if (!ast_istype(fieldtype, ast_value)) { + compile_error(m_context, "internal error: ast_value required"); return false; } + ast_value *array = reinterpret_cast(fieldtype); - /* same as with field arrays */ - if (!check_array(self, self)) + if (!checkArray(*array)) return false; - v = ir_builder_create_global(ir, self->m_name, vtype); + ast_expression *elemtype = array->m_next; + qc_type vtype = elemtype->m_vtype; + + ir_value *v = ir->createField(m_name, vtype); if (!v) { - compile_error(self->m_context, "ir_builder_create_global failed `%s`", self->m_name); + compile_error(m_context, "ir_builder::createGlobal failed on `%s`", m_name); return false; } - v->m_context = self->m_context; + v->m_context = m_context; v->m_unique_life = true; v->m_locked = true; - - if (self->m_flags & AST_FLAG_INCLUDE_DEF) - v->m_flags |= IR_FLAG_INCLUDE_DEF; - if (self->m_flags & AST_FLAG_ERASEABLE) - self->m_ir_v->m_flags |= IR_FLAG_ERASABLE; - - namelen = strlen(self->m_name); - name = (char*)mem_a(namelen + 16); - util_strncpy(name, self->m_name, namelen); - - self->m_ir_values = (ir_value**)mem_a(sizeof(self->m_ir_values[0]) * self->m_count); - self->m_ir_values[0] = v; - for (ai = 1; ai < self->m_count; ++ai) { - util_snprintf(name + namelen, 16, "[%u]", (unsigned int)ai); - self->m_ir_values[ai] = ir_builder_create_global(ir, name, vtype); - if (!self->m_ir_values[ai]) { - mem_d(name); - compile_error(self->m_context, "ir_builder_create_global failed `%s`", name); + array->m_ir_v = m_ir_v = v; + + if (m_flags & AST_FLAG_INCLUDE_DEF) + m_ir_v->m_flags |= IR_FLAG_INCLUDE_DEF; + if (m_flags & AST_FLAG_ERASEABLE && !(m_flags & AST_FLAG_NOERASE)) + m_ir_v->m_flags |= IR_FLAG_ERASABLE; + if (m_flags & AST_FLAG_NOREF) + m_ir_v->m_flags |= IR_FLAG_NOREF; + + const size_t namelen = m_name.length(); + std::unique_ptr name(new char[namelen+16]); + util_strncpy(name.get(), m_name.c_str(), namelen); + + array->m_ir_values.resize(array->m_count); + array->m_ir_values[0] = v; + for (size_t ai = 1; ai < array->m_count; ++ai) { + util_snprintf(name.get() + namelen, 16, "[%u]", (unsigned int)ai); + array->m_ir_values[ai] = ir->createField(name.get(), vtype); + if (!array->m_ir_values[ai]) { + compile_error(m_context, "ir_builder::createGlobal failed on `%s`", name.get()); return false; } - self->m_ir_values[ai]->m_context = self->m_context; - self->m_ir_values[ai]->m_unique_life = true; - self->m_ir_values[ai]->m_locked = true; - if (self->m_flags & AST_FLAG_INCLUDE_DEF) - self->m_ir_values[ai]->m_flags |= IR_FLAG_INCLUDE_DEF; + array->m_ir_values[ai]->m_context = m_context; + array->m_ir_values[ai]->m_unique_life = true; + array->m_ir_values[ai]->m_locked = true; + if (m_flags & AST_FLAG_INCLUDE_DEF) + array->m_ir_values[ai]->m_flags |= IR_FLAG_INCLUDE_DEF; + if (m_flags & AST_FLAG_NOREF) + array->m_ir_values[ai]->m_flags |= IR_FLAG_NOREF; } - mem_d(name); } else { - /* Arrays don't do this since there's no "array" value which spans across the - * whole thing. - */ - v = ir_builder_create_global(ir, self->m_name, self->m_vtype); - if (!v) { - compile_error(self->m_context, "ir_builder_create_global failed on `%s`", self->m_name); + ir_value *v = ir->createField(m_name, m_next->m_vtype); + if (!v) return false; - } - codegen_output_type(self, v); - v->m_context = self->m_context; + v->m_context = m_context; + m_ir_v = v; + if (m_flags & AST_FLAG_INCLUDE_DEF) + m_ir_v->m_flags |= IR_FLAG_INCLUDE_DEF; + if (m_flags & AST_FLAG_ERASEABLE && !(m_flags & AST_FLAG_NOERASE)) + m_ir_v->m_flags |= IR_FLAG_ERASABLE; + if (m_flags & AST_FLAG_NOREF) + m_ir_v->m_flags |= IR_FLAG_NOREF; } + return true; +} - /* link us to the ir_value */ - v->m_cvq = self->m_cvq; - self->m_ir_v = v; +ir_value *ast_value::prepareGlobalArray(ir_builder *ir) +{ + ast_expression *elemtype = m_next; + qc_type vtype = elemtype->m_vtype; - if (self->m_flags & AST_FLAG_INCLUDE_DEF) - self->m_ir_v->m_flags |= IR_FLAG_INCLUDE_DEF; - if (self->m_flags & AST_FLAG_ERASEABLE) - self->m_ir_v->m_flags |= IR_FLAG_ERASABLE; + if (m_flags & AST_FLAG_ARRAY_INIT && !m_count) { + compile_error(m_context, "array `%s' has no size", m_name); + return nullptr; + } - /* initialize */ - if (self->m_hasvalue) { - switch (self->m_vtype) - { - case TYPE_FLOAT: - if (!ir_value_set_float(v, self->m_constval.vfloat)) - goto error; - break; - case TYPE_VECTOR: - if (!ir_value_set_vector(v, self->m_constval.vvec)) - goto error; - break; - case TYPE_STRING: - if (!ir_value_set_string(v, self->m_constval.vstring)) - goto error; - break; - case TYPE_ARRAY: - ast_global_array_set(self); - break; - case TYPE_FUNCTION: - compile_error(self->m_context, "global of type function not properly generated"); - goto error; - /* Cannot generate an IR value for a function, - * need a pointer pointing to a function rather. - */ - case TYPE_FIELD: - if (!self->m_constval.vfield) { - compile_error(self->m_context, "field constant without vfield set"); - goto error; - } - if (!self->m_constval.vfield->m_ir_v) { - compile_error(self->m_context, "field constant generated before its field"); - goto error; - } - if (!ir_value_set_field(v, self->m_constval.vfield->m_ir_v)) - goto error; - break; - default: - compile_error(self->m_context, "TODO: global constant type %i", self->m_vtype); - break; + /* same as with field arrays */ + if (!checkArray(*this)) + return nullptr; + + ir_value *v = ir->createGlobal(m_name, vtype); + if (!v) { + compile_error(m_context, "ir_builder::createGlobal failed `%s`", m_name); + return nullptr; + } + v->m_context = m_context; + v->m_unique_life = true; + v->m_locked = true; + + if (m_flags & AST_FLAG_INCLUDE_DEF) + v->m_flags |= IR_FLAG_INCLUDE_DEF; + if (m_flags & AST_FLAG_ERASEABLE && !(m_flags & AST_FLAG_NOERASE)) + v->m_flags |= IR_FLAG_ERASABLE; + if (m_flags & AST_FLAG_NOREF) + v->m_flags |= IR_FLAG_NOREF; + + const size_t namelen = m_name.length(); + std::unique_ptr name(new char[namelen+16]); + util_strncpy(name.get(), m_name.c_str(), namelen); + + m_ir_values.resize(m_count); + m_ir_values[0] = v; + for (size_t ai = 1; ai < m_count; ++ai) { + util_snprintf(name.get() + namelen, 16, "[%u]", (unsigned int)ai); + m_ir_values[ai] = ir->createGlobal(name.get(), vtype); + if (!m_ir_values[ai]) { + compile_error(m_context, "ir_builder::createGlobal failed `%s`", name.get()); + return nullptr; } + m_ir_values[ai]->m_context = m_context; + m_ir_values[ai]->m_unique_life = true; + m_ir_values[ai]->m_locked = true; + if (m_flags & AST_FLAG_INCLUDE_DEF) + m_ir_values[ai]->m_flags |= IR_FLAG_INCLUDE_DEF; + if (m_flags & AST_FLAG_NOREF) + m_ir_values[ai]->m_flags |= IR_FLAG_NOREF; } - return true; -error: /* clean up */ - if (v) delete v; - return false; + return v; } -static bool ast_local_codegen(ast_value *self, ir_function *func, bool param) +bool ast_value::generateLocal(ir_function *func, bool param) { - ir_value *v = nullptr; - - if (self->m_vtype == TYPE_NIL) { - compile_error(self->m_context, "internal error: trying to generate a variable of TYPE_NIL"); + if (m_vtype == TYPE_NIL) { + compile_error(m_context, "internal error: trying to generate a variable of TYPE_NIL"); return false; } - if (self->m_hasvalue && self->m_vtype == TYPE_FUNCTION) + if (m_hasvalue && m_vtype == TYPE_FUNCTION) { /* Do we allow local functions? I think not... * this is NOT a function pointer atm. @@ -1436,96 +1352,95 @@ static bool ast_local_codegen(ast_value *self, ir_function *func, bool param) return false; } - if (self->m_vtype == TYPE_ARRAY) { - size_t ai; - char *name; - size_t namelen; - - ast_expression *elemtype = self->m_next; + ir_value *v = nullptr; + if (m_vtype == TYPE_ARRAY) { + ast_expression *elemtype = m_next; qc_type vtype = elemtype->m_vtype; func->m_flags |= IR_FLAG_HAS_ARRAYS; - if (param && !(self->m_flags & AST_FLAG_IS_VARARG)) { - compile_error(self->m_context, "array-parameters are not supported"); + if (param && !(m_flags & AST_FLAG_IS_VARARG)) { + compile_error(m_context, "array-parameters are not supported"); return false; } /* we are lame now - considering the way QC works we won't tolerate arrays > 1024 elements */ - if (!check_array(self, self)) - return false; - - self->m_ir_values = (ir_value**)mem_a(sizeof(self->m_ir_values[0]) * self->m_count); - if (!self->m_ir_values) { - compile_error(self->m_context, "failed to allocate array values"); + if (!checkArray(*this)) return false; - } - v = ir_function_create_local(func, self->m_name, vtype, param); + m_ir_values.resize(m_count); + v = ir_function_create_local(func, m_name, vtype, param); if (!v) { - compile_error(self->m_context, "internal error: ir_function_create_local failed"); + compile_error(m_context, "internal error: ir_function_create_local failed"); return false; } - v->m_context = self->m_context; + v->m_context = m_context; v->m_unique_life = true; v->m_locked = true; - namelen = strlen(self->m_name); - name = (char*)mem_a(namelen + 16); - util_strncpy(name, self->m_name, namelen); + if (m_flags & AST_FLAG_NOREF) + v->m_flags |= IR_FLAG_NOREF; - self->m_ir_values[0] = v; - for (ai = 1; ai < self->m_count; ++ai) { - util_snprintf(name + namelen, 16, "[%u]", (unsigned int)ai); - self->m_ir_values[ai] = ir_function_create_local(func, name, vtype, param); - if (!self->m_ir_values[ai]) { - compile_error(self->m_context, "internal_error: ir_builder_create_global failed on `%s`", name); + const size_t namelen = m_name.length(); + std::unique_ptr name(new char[namelen+16]); + util_strncpy(name.get(), m_name.c_str(), namelen); + + m_ir_values[0] = v; + for (size_t ai = 1; ai < m_count; ++ai) { + util_snprintf(name.get() + namelen, 16, "[%u]", (unsigned int)ai); + m_ir_values[ai] = ir_function_create_local(func, name.get(), vtype, param); + if (!m_ir_values[ai]) { + compile_error(m_context, "internal_error: ir_builder::createGlobal failed on `%s`", name.get()); return false; } - self->m_ir_values[ai]->m_context = self->m_context; - self->m_ir_values[ai]->m_unique_life = true; - self->m_ir_values[ai]->m_locked = true; + m_ir_values[ai]->m_context = m_context; + m_ir_values[ai]->m_unique_life = true; + m_ir_values[ai]->m_locked = true; + + if (m_flags & AST_FLAG_NOREF) + m_ir_values[ai]->m_flags |= IR_FLAG_NOREF; } - mem_d(name); } else { - v = ir_function_create_local(func, self->m_name, self->m_vtype, param); + v = ir_function_create_local(func, m_name, m_vtype, param); if (!v) return false; - codegen_output_type(self, v); - v->m_context = self->m_context; + codegen_output_type(this, v); + v->m_context = m_context; } - /* A constant local... hmmm... - * I suppose the IR will have to deal with this - */ - if (self->m_hasvalue) { - switch (self->m_vtype) + // A constant local... hmmm... + // I suppose the IR will have to deal with this + if (m_hasvalue) { + switch (m_vtype) { case TYPE_FLOAT: - if (!ir_value_set_float(v, self->m_constval.vfloat)) + if (!v->setFloat(m_constval.vfloat)) goto error; break; case TYPE_VECTOR: - if (!ir_value_set_vector(v, self->m_constval.vvec)) + if (!v->setVector(m_constval.vvec)) goto error; break; case TYPE_STRING: - if (!ir_value_set_string(v, self->m_constval.vstring)) + if (!v->setString(m_constval.vstring)) goto error; break; default: - compile_error(self->m_context, "TODO: global constant type %i", self->m_vtype); + compile_error(m_context, "TODO: global constant type %i", m_vtype); break; } } - /* link us to the ir_value */ - v->m_cvq = self->m_cvq; - self->m_ir_v = v; + // link us to the ir_value + v->m_cvq = m_cvq; + m_ir_v = v; - if (!ast_generate_accessors(self, func->m_owner)) + if (m_flags & AST_FLAG_NOREF) + m_ir_v->m_flags |= IR_FLAG_NOREF; + + if (!generateAccessors(func->m_owner)) return false; return true; @@ -1534,172 +1449,164 @@ error: /* clean up */ return false; } -bool ast_generate_accessors(ast_value *self, ir_builder *ir) +bool ast_value::generateAccessors(ir_builder *ir) { size_t i; bool warn = OPTS_WARN(WARN_USED_UNINITIALIZED); - if (!self->m_setter || !self->m_getter) + if (!m_setter || !m_getter) return true; - for (i = 0; i < self->m_count; ++i) { - if (!self->m_ir_values) { - compile_error(self->m_context, "internal error: no array values generated for `%s`", self->m_name); - return false; - } - if (!self->m_ir_values[i]) { - compile_error(self->m_context, "internal error: not all array values have been generated for `%s`", self->m_name); + if (m_count && m_ir_values.empty()) { + compile_error(m_context, "internal error: no array values generated for `%s`", m_name); + return false; + } + for (i = 0; i < m_count; ++i) { + if (!m_ir_values[i]) { + compile_error(m_context, "internal error: not all array values have been generated for `%s`", m_name); return false; } - if (!self->m_ir_values[i]->m_life.empty()) { - compile_error(self->m_context, "internal error: function containing `%s` already generated", self->m_name); + if (!m_ir_values[i]->m_life.empty()) { + compile_error(m_context, "internal error: function containing `%s` already generated", m_name); return false; } } opts_set(opts.warn, WARN_USED_UNINITIALIZED, false); - if (self->m_setter) { - if (!ast_global_codegen (self->m_setter, ir, false) || - !ast_function_codegen(self->m_setter->m_constval.vfunc, ir) || - !ir_function_finalize(self->m_setter->m_constval.vfunc->m_ir_func)) + if (m_setter) { + if (!m_setter->generateGlobal(ir, false) || + !m_setter->m_constval.vfunc->generateFunction(ir) || + !ir_function_finalize(m_setter->m_constval.vfunc->m_ir_func)) { - compile_error(self->m_context, "internal error: failed to generate setter for `%s`", self->m_name); + compile_error(m_context, "internal error: failed to generate setter for `%s`", m_name); opts_set(opts.warn, WARN_USED_UNINITIALIZED, warn); return false; } } - if (self->m_getter) { - if (!ast_global_codegen (self->m_getter, ir, false) || - !ast_function_codegen(self->m_getter->m_constval.vfunc, ir) || - !ir_function_finalize(self->m_getter->m_constval.vfunc->m_ir_func)) + if (m_getter) { + if (!m_getter->generateGlobal(ir, false) || + !m_getter->m_constval.vfunc->generateFunction(ir) || + !ir_function_finalize(m_getter->m_constval.vfunc->m_ir_func)) { - compile_error(self->m_context, "internal error: failed to generate getter for `%s`", self->m_name); + compile_error(m_context, "internal error: failed to generate getter for `%s`", m_name); opts_set(opts.warn, WARN_USED_UNINITIALIZED, warn); return false; } } - for (i = 0; i < self->m_count; ++i) - self->m_ir_values[i]->m_life.clear(); + for (i = 0; i < m_count; ++i) + m_ir_values[i]->m_life.clear(); opts_set(opts.warn, WARN_USED_UNINITIALIZED, warn); return true; } -bool ast_function_codegen(ast_function *self, ir_builder *ir) +bool ast_function::generateFunction(ir_builder *ir) { - ir_function *irf; - ir_value *dummy; - ast_expression *ec; - ast_expression_codegen *cgen; - (void)ir; - irf = self->m_ir_func; + ir_value *dummy; + + ir_function *irf = m_ir_func; if (!irf) { - compile_error(self->m_context, "internal error: ast_function's related ast_value was not generated yet"); + compile_error(m_context, "internal error: ast_function's related ast_value was not generated yet"); return false; } /* fill the parameter list */ - ec = self->m_function_type; - for (auto &it : ec->m_type_params) { + for (auto &it : m_function_type->m_type_params) { if (it->m_vtype == TYPE_FIELD) - vec_push(irf->m_params, it->m_next->m_vtype); + irf->m_params.push_back(it->m_next->m_vtype); else - vec_push(irf->m_params, it->m_vtype); - if (!self->m_builtin) { - if (!ast_local_codegen(it, self->m_ir_func, true)) + irf->m_params.push_back(it->m_vtype); + if (!m_builtin) { + if (!it->generateLocal(m_ir_func, true)) return false; } } - if (self->m_varargs) { - if (!ast_local_codegen(self->m_varargs, self->m_ir_func, true)) + if (m_varargs) { + if (!m_varargs->generateLocal(m_ir_func, true)) return false; - irf->m_max_varargs = self->m_varargs->m_count; + irf->m_max_varargs = m_varargs->m_count; } - if (self->m_builtin) { - irf->m_builtin = self->m_builtin; + if (m_builtin) { + irf->m_builtin = m_builtin; return true; } /* have a local return value variable? */ - if (self->m_return_value) { - if (!ast_local_codegen(self->m_return_value, self->m_ir_func, false)) + if (m_return_value) { + if (!m_return_value->generateLocal(m_ir_func, false)) return false; } - if (self->m_blocks.empty()) { - compile_error(self->m_context, "function `%s` has no body", self->m_name); + if (m_blocks.empty()) { + compile_error(m_context, "function `%s` has no body", m_name); return false; } - irf->m_first = self->m_curblock = ir_function_create_block(self->m_context, irf, "entry"); - if (!self->m_curblock) { - compile_error(self->m_context, "failed to allocate entry block for `%s`", self->m_name); + irf->m_first = m_curblock = ir_function_create_block(m_context, irf, "entry"); + if (!m_curblock) { + compile_error(m_context, "failed to allocate entry block for `%s`", m_name); return false; } - if (self->m_argc) { + if (m_argc) { ir_value *va_count; ir_value *fixed; ir_value *sub; - if (!ast_local_codegen(self->m_argc, self->m_ir_func, true)) + if (!m_argc->generateLocal(m_ir_func, true)) return false; - cgen = self->m_argc->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_argc), self, false, &va_count)) + if (!m_argc->codegen(this, false, &va_count)) return false; - cgen = self->m_fixedparams->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_fixedparams), self, false, &fixed)) + if (!m_fixedparams->codegen(this, false, &fixed)) return false; - sub = ir_block_create_binop(self->m_curblock, self->m_context, - ast_function_label(self, "va_count"), INSTR_SUB_F, - ir_builder_get_va_count(ir), fixed); + sub = ir_block_create_binop(m_curblock, m_context, + makeLabel("va_count"), INSTR_SUB_F, + ir->get_va_count(), fixed); if (!sub) return false; - if (!ir_block_create_store_op(self->m_curblock, self->m_context, INSTR_STORE_F, + if (!ir_block_create_store_op(m_curblock, m_context, INSTR_STORE_F, va_count, sub)) { return false; } } - for (auto &it : self->m_blocks) { - cgen = it->m_codegen; - if (!(*cgen)(it.get(), self, false, &dummy)) - return false; + for (auto &it : m_blocks) { + if (!it->codegen(this, false, &dummy)) + return false; } /* TODO: check return types */ - if (!self->m_curblock->m_final) + if (!m_curblock->m_final) { - if (!self->m_function_type->m_next || - self->m_function_type->m_next->m_vtype == TYPE_VOID) + if (!m_function_type->m_next || + m_function_type->m_next->m_vtype == TYPE_VOID) { - return ir_block_create_return(self->m_curblock, self->m_context, nullptr); + return ir_block_create_return(m_curblock, m_context, nullptr); } - else if (vec_size(self->m_curblock->m_entries) || self->m_curblock == irf->m_first) + else if (m_curblock->m_entries.size() || m_curblock == irf->m_first) { - if (self->m_return_value) { - cgen = self->m_return_value->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_return_value), self, false, &dummy)) + if (m_return_value) { + if (!m_return_value->codegen(this, false, &dummy)) return false; - return ir_block_create_return(self->m_curblock, self->m_context, dummy); + return ir_block_create_return(m_curblock, m_context, dummy); } - else if (compile_warning(self->m_context, WARN_MISSING_RETURN_VALUES, + else if (compile_warning(m_context, WARN_MISSING_RETURN_VALUES, "control reaches end of non-void function (`%s`) via %s", - self->m_name, self->m_curblock->m_label.c_str())) + m_name.c_str(), m_curblock->m_label.c_str())) { return false; } - return ir_block_create_return(self->m_curblock, self->m_context, nullptr); + return ir_block_create_return(m_curblock, m_context, nullptr); } } return true; } -static bool starts_a_label(ast_expression *ex) +static bool starts_a_label(const ast_expression *ex) { while (ex && ast_istype(ex, ast_block)) { - ast_block *b = (ast_block*)ex; + auto b = reinterpret_cast(ex); ex = b->m_exprs[0]; } if (!ex) @@ -1713,19 +1620,19 @@ static bool starts_a_label(ast_expression *ex) * curly braces {...}. * While in the IR it represents a block in terms of control-flow. */ -bool ast_block_codegen(ast_block *self, ast_function *func, bool lvalue, ir_value **out) +bool ast_block::codegen(ast_function *func, bool lvalue, ir_value **out) { /* We don't use this * Note: an ast-representation using the comma-operator * of the form: (a, b, c) = x should not assign to c... */ if (lvalue) { - compile_error(self->m_context, "not an l-value (code-block)"); + compile_error(m_context, "not an l-value (code-block)"); return false; } - if (self->m_outr) { - *out = self->m_outr; + if (m_outr) { + *out = m_outr; return true; } @@ -1738,55 +1645,51 @@ bool ast_block_codegen(ast_block *self, ast_function *func, bool lvalue, ir_valu *out = nullptr; /* generate locals */ - for (auto &it : self->m_locals) { - if (!ast_local_codegen(it, func->m_ir_func, false)) { + for (auto &it : m_locals) { + if (!it->generateLocal(func->m_ir_func, false)) { if (OPTS_OPTION_BOOL(OPTION_DEBUG)) - compile_error(self->m_context, "failed to generate local `%s`", it->m_name); + compile_error(m_context, "failed to generate local `%s`", it->m_name); return false; } } - for (auto &it : self->m_exprs) { - ast_expression_codegen *gen; + for (auto &it : m_exprs) { if (func->m_curblock->m_final && !starts_a_label(it)) { if (compile_warning(it->m_context, WARN_UNREACHABLE_CODE, "unreachable statement")) return false; continue; } - gen = it->m_codegen; - if (!(*gen)(it, func, false, out)) + if (!it->codegen(func, false, out)) return false; } - self->m_outr = *out; + m_outr = *out; return true; } -bool ast_store_codegen(ast_store *self, ast_function *func, bool lvalue, ir_value **out) +bool ast_store::codegen(ast_function *func, bool lvalue, ir_value **out) { - ast_expression_codegen *cgen; ir_value *left = nullptr; ir_value *right = nullptr; - ast_value *arr; ast_value *idx = 0; ast_array_index *ai = nullptr; - if (lvalue && self->m_outl) { - *out = self->m_outl; + if (lvalue && m_outl) { + *out = m_outl; return true; } - if (!lvalue && self->m_outr) { - *out = self->m_outr; + if (!lvalue && m_outr) { + *out = m_outr; return true; } - if (ast_istype(self->m_dest, ast_array_index)) + if (ast_istype(m_dest, ast_array_index)) { - ai = (ast_array_index*)self->m_dest; + ai = (ast_array_index*)m_dest; idx = (ast_value*)ai->m_index; if (ast_istype(ai->m_index, ast_value) && idx->m_hasvalue && idx->m_cvq == CV_CONST) @@ -1799,53 +1702,48 @@ bool ast_store_codegen(ast_store *self, ast_function *func, bool lvalue, ir_valu ir_instr *call; if (lvalue) { - compile_error(self->m_context, "array-subscript assignment cannot produce lvalues"); + compile_error(m_context, "array-subscript assignment cannot produce lvalues"); return false; } - arr = (ast_value*)ai->m_array; + auto arr = reinterpret_cast(ai->m_array); if (!ast_istype(ai->m_array, ast_value) || !arr->m_setter) { - compile_error(self->m_context, "value has no setter (%s)", arr->m_name); + compile_error(m_context, "value has no setter (%s)", arr->m_name); return false; } - cgen = idx->m_codegen; - if (!(*cgen)((ast_expression*)(idx), func, false, &iridx)) + if (!idx->codegen(func, false, &iridx)) return false; - cgen = arr->m_setter->m_codegen; - if (!(*cgen)((ast_expression*)(arr->m_setter), func, true, &funval)) + if (!arr->m_setter->codegen(func, true, &funval)) return false; - cgen = self->m_source->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_source), func, false, &right)) + if (!m_source->codegen(func, false, &right)) return false; - call = ir_block_create_call(func->m_curblock, self->m_context, ast_function_label(func, "store"), funval, false); + call = ir_block_create_call(func->m_curblock, m_context, func->makeLabel("store"), funval, false); if (!call) return false; ir_call_param(call, iridx); ir_call_param(call, right); - self->m_outr = right; + m_outr = right; } else { - /* regular code */ + // regular code - cgen = self->m_dest->m_codegen; - /* lvalue! */ - if (!(*cgen)((ast_expression*)(self->m_dest), func, true, &left)) + // lvalue! + if (!m_dest->codegen(func, true, &left)) return false; - self->m_outl = left; + m_outl = left; - cgen = self->m_source->m_codegen; /* rvalue! */ - if (!(*cgen)((ast_expression*)(self->m_source), func, false, &right)) + if (!m_source->codegen(func, false, &right)) return false; - if (!ir_block_create_store_op(func->m_curblock, self->m_context, self->m_op, left, right)) + if (!ir_block_create_store_op(func->m_curblock, m_context, m_op, left, right)) return false; - self->m_outr = right; + m_outr = right; } /* Theoretically, an assinment returns its left side as an @@ -1860,24 +1758,23 @@ bool ast_store_codegen(ast_store *self, ast_function *func, bool lvalue, ir_valu return true; } -bool ast_binary_codegen(ast_binary *self, ast_function *func, bool lvalue, ir_value **out) +bool ast_binary::codegen(ast_function *func, bool lvalue, ir_value **out) { - ast_expression_codegen *cgen; ir_value *left, *right; /* A binary operation cannot yield an l-value */ if (lvalue) { - compile_error(self->m_context, "not an l-value (binop)"); + compile_error(m_context, "not an l-value (binop)"); return false; } - if (self->m_outr) { - *out = self->m_outr; + if (m_outr) { + *out = m_outr; return true; } if ((OPTS_FLAG(SHORT_LOGIC) || OPTS_FLAG(PERL_LOGIC)) && - (self->m_op == INSTR_AND || self->m_op == INSTR_OR)) + (m_op == INSTR_AND || m_op == INSTR_OR)) { /* NOTE: The short-logic path will ignore right_first */ @@ -1889,40 +1786,38 @@ bool ast_binary_codegen(ast_binary *self, ast_function *func, bool lvalue, ir_va /* prepare end-block */ merge_id = func->m_ir_func->m_blocks.size(); - merge = ir_function_create_block(self->m_context, func->m_ir_func, ast_function_label(func, "sce_merge")); + merge = ir_function_create_block(m_context, func->m_ir_func, func->makeLabel("sce_merge")); /* generate the left expression */ - cgen = self->m_left->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_left), func, false, &left)) + if (!m_left->codegen(func, false, &left)) return false; /* remember the block */ from_left = func->m_curblock; /* create a new block for the right expression */ - other = ir_function_create_block(self->m_context, func->m_ir_func, ast_function_label(func, "sce_other")); - if (self->m_op == INSTR_AND) { + other = ir_function_create_block(m_context, func->m_ir_func, func->makeLabel("sce_other")); + if (m_op == INSTR_AND) { /* on AND: left==true -> other */ - if (!ir_block_create_if(func->m_curblock, self->m_context, left, other, merge)) + if (!ir_block_create_if(func->m_curblock, m_context, left, other, merge)) return false; } else { /* on OR: left==false -> other */ - if (!ir_block_create_if(func->m_curblock, self->m_context, left, merge, other)) + if (!ir_block_create_if(func->m_curblock, m_context, left, merge, other)) return false; } /* use the likely flag */ - vec_last(func->m_curblock->m_instr)->m_likely = true; + func->m_curblock->m_instr.back()->m_likely = true; /* enter the right-expression's block */ func->m_curblock = other; /* generate */ - cgen = self->m_right->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_right), func, false, &right)) + if (!m_right->codegen(func, false, &right)) return false; /* remember block */ from_right = func->m_curblock; /* jump to the merge block */ - if (!ir_block_create_jump(func->m_curblock, self->m_context, merge)) + if (!ir_block_create_jump(func->m_curblock, m_context, merge)) return false; algo::shiftback(func->m_ir_func->m_blocks.begin() + merge_id, @@ -1933,9 +1828,9 @@ bool ast_binary_codegen(ast_binary *self, ast_function *func, bool lvalue, ir_va //func->m_ir_func->m_blocks.emplace_back(merge); func->m_curblock = merge; - phi = ir_block_create_phi(func->m_curblock, self->m_context, - ast_function_label(func, "sce_value"), - self->m_vtype); + phi = ir_block_create_phi(func->m_curblock, m_context, + func->makeLabel("sce_value"), + m_vtype); ir_phi_add(phi, from_left, left); ir_phi_add(phi, from_right, right); *out = ir_phi_value(phi); @@ -1945,72 +1840,67 @@ bool ast_binary_codegen(ast_binary *self, ast_function *func, bool lvalue, ir_va if (!OPTS_FLAG(PERL_LOGIC)) { /* cast-to-bool */ if (OPTS_FLAG(CORRECT_LOGIC) && (*out)->m_vtype == TYPE_VECTOR) { - *out = ir_block_create_unary(func->m_curblock, self->m_context, - ast_function_label(func, "sce_bool_v"), + *out = ir_block_create_unary(func->m_curblock, m_context, + func->makeLabel("sce_bool_v"), INSTR_NOT_V, *out); if (!*out) return false; - *out = ir_block_create_unary(func->m_curblock, self->m_context, - ast_function_label(func, "sce_bool"), + *out = ir_block_create_unary(func->m_curblock, m_context, + func->makeLabel("sce_bool"), INSTR_NOT_F, *out); if (!*out) return false; } else if (OPTS_FLAG(FALSE_EMPTY_STRINGS) && (*out)->m_vtype == TYPE_STRING) { - *out = ir_block_create_unary(func->m_curblock, self->m_context, - ast_function_label(func, "sce_bool_s"), + *out = ir_block_create_unary(func->m_curblock, m_context, + func->makeLabel("sce_bool_s"), INSTR_NOT_S, *out); if (!*out) return false; - *out = ir_block_create_unary(func->m_curblock, self->m_context, - ast_function_label(func, "sce_bool"), + *out = ir_block_create_unary(func->m_curblock, m_context, + func->makeLabel("sce_bool"), INSTR_NOT_F, *out); if (!*out) return false; } else { - *out = ir_block_create_binop(func->m_curblock, self->m_context, - ast_function_label(func, "sce_bool"), + *out = ir_block_create_binop(func->m_curblock, m_context, + func->makeLabel("sce_bool"), INSTR_AND, *out, *out); if (!*out) return false; } } - self->m_outr = *out; - codegen_output_type(self, *out); + m_outr = *out; + codegen_output_type(this, *out); return true; } - if (self->m_right_first) { - cgen = self->m_right->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_right), func, false, &right)) + if (m_right_first) { + if (!m_right->codegen(func, false, &right)) return false; - cgen = self->m_left->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_left), func, false, &left)) + if (!m_left->codegen(func, false, &left)) return false; } else { - cgen = self->m_left->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_left), func, false, &left)) + if (!m_left->codegen(func, false, &left)) return false; - cgen = self->m_right->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_right), func, false, &right)) + if (!m_right->codegen(func, false, &right)) return false; } - *out = ir_block_create_binop(func->m_curblock, self->m_context, ast_function_label(func, "bin"), - self->m_op, left, right); + *out = ir_block_create_binop(func->m_curblock, m_context, func->makeLabel("bin"), + m_op, left, right); if (!*out) return false; - self->m_outr = *out; - codegen_output_type(self, *out); + m_outr = *out; + codegen_output_type(this, *out); return true; } -bool ast_binstore_codegen(ast_binstore *self, ast_function *func, bool lvalue, ir_value **out) +bool ast_binstore::codegen(ast_function *func, bool lvalue, ir_value **out) { - ast_expression_codegen *cgen; ir_value *leftl = nullptr, *leftr, *right, *bin; ast_value *arr; @@ -2018,20 +1908,20 @@ bool ast_binstore_codegen(ast_binstore *self, ast_function *func, bool lvalue, i ast_array_index *ai = nullptr; ir_value *iridx = nullptr; - if (lvalue && self->m_outl) { - *out = self->m_outl; + if (lvalue && m_outl) { + *out = m_outl; return true; } - if (!lvalue && self->m_outr) { - *out = self->m_outr; + if (!lvalue && m_outr) { + *out = m_outr; return true; } - if (ast_istype(self->m_dest, ast_array_index)) + if (ast_istype(m_dest, ast_array_index)) { - ai = (ast_array_index*)self->m_dest; + ai = (ast_array_index*)m_dest; idx = (ast_value*)ai->m_index; if (ast_istype(ai->m_index, ast_value) && idx->m_hasvalue && idx->m_cvq == CV_CONST) @@ -2041,23 +1931,21 @@ bool ast_binstore_codegen(ast_binstore *self, ast_function *func, bool lvalue, i /* for a binstore we need both an lvalue and an rvalue for the left side */ /* rvalue of destination! */ if (ai) { - cgen = idx->m_codegen; - if (!(*cgen)((ast_expression*)(idx), func, false, &iridx)) + if (!idx->codegen(func, false, &iridx)) return false; } - cgen = self->m_dest->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_dest), func, false, &leftr)) + + if (!m_dest->codegen(func, false, &leftr)) return false; /* source as rvalue only */ - cgen = self->m_source->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_source), func, false, &right)) + if (!m_source->codegen(func, false, &right)) return false; /* now the binary */ - bin = ir_block_create_binop(func->m_curblock, self->m_context, ast_function_label(func, "binst"), - self->m_opbin, leftr, right); - self->m_outr = bin; + bin = ir_block_create_binop(func->m_curblock, m_context, func->makeLabel("binst"), + m_opbin, leftr, right); + m_outr = bin; if (ai) { /* we need to call the setter */ @@ -2065,37 +1953,35 @@ bool ast_binstore_codegen(ast_binstore *self, ast_function *func, bool lvalue, i ir_instr *call; if (lvalue) { - compile_error(self->m_context, "array-subscript assignment cannot produce lvalues"); + compile_error(m_context, "array-subscript assignment cannot produce lvalues"); return false; } arr = (ast_value*)ai->m_array; if (!ast_istype(ai->m_array, ast_value) || !arr->m_setter) { - compile_error(self->m_context, "value has no setter (%s)", arr->m_name); + compile_error(m_context, "value has no setter (%s)", arr->m_name); return false; } - cgen = arr->m_setter->m_codegen; - if (!(*cgen)((ast_expression*)(arr->m_setter), func, true, &funval)) + if (!arr->m_setter->codegen(func, true, &funval)) return false; - call = ir_block_create_call(func->m_curblock, self->m_context, ast_function_label(func, "store"), funval, false); + call = ir_block_create_call(func->m_curblock, m_context, func->makeLabel("store"), funval, false); if (!call) return false; ir_call_param(call, iridx); ir_call_param(call, bin); - self->m_outr = bin; + m_outr = bin; } else { - /* now store them */ - cgen = self->m_dest->m_codegen; - /* lvalue of destination */ - if (!(*cgen)((ast_expression*)(self->m_dest), func, true, &leftl)) + // now store them + // lvalue of destination + if (!m_dest->codegen(func, true, &leftl)) return false; - self->m_outl = leftl; + m_outl = leftl; - if (!ir_block_create_store_op(func->m_curblock, self->m_context, self->m_opstore, leftl, bin)) + if (!ir_block_create_store_op(func->m_curblock, m_context, m_opstore, leftl, bin)) return false; - self->m_outr = bin; + m_outr = bin; } /* Theoretically, an assinment returns its left side as an @@ -2110,39 +1996,36 @@ bool ast_binstore_codegen(ast_binstore *self, ast_function *func, bool lvalue, i return true; } -bool ast_unary_codegen(ast_unary *self, ast_function *func, bool lvalue, ir_value **out) +bool ast_unary::codegen(ast_function *func, bool lvalue, ir_value **out) { - ast_expression_codegen *cgen; ir_value *operand; /* An unary operation cannot yield an l-value */ if (lvalue) { - compile_error(self->m_context, "not an l-value (binop)"); + compile_error(m_context, "not an l-value (binop)"); return false; } - if (self->m_outr) { - *out = self->m_outr; + if (m_outr) { + *out = m_outr; return true; } - cgen = self->m_operand->m_codegen; /* lvalue! */ - if (!(*cgen)((ast_expression*)(self->m_operand), func, false, &operand)) + if (!m_operand->codegen(func, false, &operand)) return false; - *out = ir_block_create_unary(func->m_curblock, self->m_context, ast_function_label(func, "unary"), - self->m_op, operand); + *out = ir_block_create_unary(func->m_curblock, m_context, func->makeLabel("unary"), + m_op, operand); if (!*out) return false; - self->m_outr = *out; + m_outr = *out; return true; } -bool ast_return_codegen(ast_return *self, ast_function *func, bool lvalue, ir_value **out) +bool ast_return::codegen(ast_function *func, bool lvalue, ir_value **out) { - ast_expression_codegen *cgen; ir_value *operand; *out = nullptr; @@ -2151,136 +2034,170 @@ bool ast_return_codegen(ast_return *self, ast_function *func, bool lvalue, ir_va * anything... */ if (lvalue) { - compile_error(self->m_context, "return-expression is not an l-value"); + compile_error(m_context, "return-expression is not an l-value"); return false; } - if (self->m_outr) { - compile_error(self->m_context, "internal error: ast_return cannot be reused, it bears no result!"); + if (m_outr) { + compile_error(m_context, "internal error: ast_return cannot be reused, it bears no result!"); return false; } - self->m_outr = (ir_value*)1; + m_outr = (ir_value*)1; - if (self->m_operand) { - cgen = self->m_operand->m_codegen; + if (m_operand) { /* lvalue! */ - if (!(*cgen)((ast_expression*)(self->m_operand), func, false, &operand)) + if (!m_operand->codegen(func, false, &operand)) return false; - if (!ir_block_create_return(func->m_curblock, self->m_context, operand)) + if (!ir_block_create_return(func->m_curblock, m_context, operand)) return false; } else { - if (!ir_block_create_return(func->m_curblock, self->m_context, nullptr)) + if (!ir_block_create_return(func->m_curblock, m_context, nullptr)) return false; } return true; } -bool ast_entfield_codegen(ast_entfield *self, ast_function *func, bool lvalue, ir_value **out) +bool ast_entfield::codegen(ast_function *func, bool lvalue, ir_value **out) { - ast_expression_codegen *cgen; ir_value *ent, *field; - /* This function needs to take the 'lvalue' flag into account! - * As lvalue we provide a field-pointer, as rvalue we provide the - * value in a temp. - */ + // This function needs to take the 'lvalue' flag into account! + // As lvalue we provide a field-pointer, as rvalue we provide the + // value in a temp. - if (lvalue && self->m_outl) { - *out = self->m_outl; + if (lvalue && m_outl) { + *out = m_outl; return true; } - if (!lvalue && self->m_outr) { - *out = self->m_outr; + if (!lvalue && m_outr) { + *out = m_outr; return true; } - cgen = self->m_entity->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_entity), func, false, &ent)) + if (!m_entity->codegen(func, false, &ent)) return false; - cgen = self->m_field->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_field), func, false, &field)) + if (!m_field->codegen(func, false, &field)) return false; if (lvalue) { /* address! */ - *out = ir_block_create_fieldaddress(func->m_curblock, self->m_context, ast_function_label(func, "efa"), + *out = ir_block_create_fieldaddress(func->m_curblock, m_context, func->makeLabel("efa"), ent, field); } else { - *out = ir_block_create_load_from_ent(func->m_curblock, self->m_context, ast_function_label(func, "efv"), - ent, field, self->m_vtype); + *out = ir_block_create_load_from_ent(func->m_curblock, m_context, func->makeLabel("efv"), + ent, field, m_vtype); /* Done AFTER error checking: - codegen_output_type(self, *out); + codegen_output_type(this, *out); */ } if (!*out) { - compile_error(self->m_context, "failed to create %s instruction (output type %s)", + compile_error(m_context, "failed to create %s instruction (output type %s)", (lvalue ? "ADDRESS" : "FIELD"), - type_name[self->m_vtype]); + type_name[m_vtype]); return false; } if (!lvalue) - codegen_output_type(self, *out); + codegen_output_type(this, *out); if (lvalue) - self->m_outl = *out; + m_outl = *out; else - self->m_outr = *out; + m_outr = *out; - /* Hm that should be it... */ + // Hm that should be it... return true; } -bool ast_member_codegen(ast_member *self, ast_function *func, bool lvalue, ir_value **out) +bool ast_member::codegen(ast_function *func, bool lvalue, ir_value **out) { - ast_expression_codegen *cgen; ir_value *vec; /* in QC this is always an lvalue */ - if (lvalue && self->m_rvalue) { - compile_error(self->m_context, "not an l-value (member access)"); + if (lvalue && m_rvalue) { + compile_error(m_context, "not an l-value (member access)"); return false; } - if (self->m_outl) { - *out = self->m_outl; + if (lvalue && m_outl) { + *out = m_outl; + return true; + } + if (!lvalue && m_outr) { + *out = m_outr; return true; } - cgen = self->m_owner->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_owner), func, false, &vec)) + if (ast_istype(m_owner, ast_entfield)) { + ir_value *ent, *field; + auto entfield = reinterpret_cast(m_owner); + if (!entfield->m_entity->codegen(func, false, &ent)) + return false; + if (!entfield->m_field->codegen(func, false, &vec)) + return false; + field = vec->vectorMember(m_field); + if (lvalue) { + *out = ir_block_create_fieldaddress(func->m_curblock, m_context, func->makeLabel("mefa"), + ent, field); + } else { + *out = ir_block_create_load_from_ent(func->m_curblock, m_context, func->makeLabel("mefv"), + ent, field, m_vtype); + } + if (!*out) { + compile_error(m_context, "failed to create %s instruction (output type %s)", + (lvalue ? "ADDRESS" : "FIELD"), + type_name[m_vtype]); + return false; + } + if (lvalue) + m_outl = *out; + else + m_outr = *out; + return (*out != nullptr); + } + + // Vector member access + if (!m_owner->codegen(func, lvalue, &vec)) return false; if (vec->m_vtype != TYPE_VECTOR && - !(vec->m_vtype == TYPE_FIELD && self->m_owner->m_next->m_vtype == TYPE_VECTOR)) + !(vec->m_vtype == TYPE_FIELD && m_owner->m_next->m_vtype == TYPE_VECTOR)) { + compile_error(m_context, "vector member produced neither vector nor field"); return false; } - *out = ir_value_vector_member(vec, self->m_field); - self->m_outl = *out; + *out = vec->vectorMember(m_field); + if (!*out) { + compile_error(m_context, "internal error: failed to create vector member access"); + return false; + } + if (lvalue) + m_outl = *out; + else + m_outr = *out; return (*out != nullptr); } -bool ast_array_index_codegen(ast_array_index *self, ast_function *func, bool lvalue, ir_value **out) +bool ast_array_index::codegen(ast_function *func, bool lvalue, ir_value **out) { ast_value *arr; ast_value *idx; - if (!lvalue && self->m_outr) { - *out = self->m_outr; + if (!lvalue && m_outr) { + *out = m_outr; return true; } - if (lvalue && self->m_outl) { - *out = self->m_outl; + if (lvalue && m_outl) { + *out = m_outl; return true; } - if (!ast_istype(self->m_array, ast_value)) { - compile_error(self->m_context, "array indexing this way is not supported"); + if (!ast_istype(m_array, ast_value)) { + compile_error(m_context, "array indexing this way is not supported"); /* note this would actually be pointer indexing because the left side is * not an actual array but (hopefully) an indexable expression. * Once we get integer arithmetic, and GADDRESS/GSTORE/GLOAD instruction @@ -2289,89 +2206,84 @@ bool ast_array_index_codegen(ast_array_index *self, ast_function *func, bool lva return false; } - arr = (ast_value*)self->m_array; - idx = (ast_value*)self->m_index; + arr = reinterpret_cast(m_array); + idx = reinterpret_cast(m_index); - if (!ast_istype(self->m_index, ast_value) || !idx->m_hasvalue || idx->m_cvq != CV_CONST) { + if (!ast_istype(m_index, ast_value) || !idx->m_hasvalue || idx->m_cvq != CV_CONST) { /* Time to use accessor functions */ - ast_expression_codegen *cgen; ir_value *iridx, *funval; ir_instr *call; if (lvalue) { - compile_error(self->m_context, "(.2) array indexing here needs a compile-time constant"); + compile_error(m_context, "(.2) array indexing here needs a compile-time constant"); return false; } if (!arr->m_getter) { - compile_error(self->m_context, "value has no getter, don't know how to index it"); + compile_error(m_context, "value has no getter, don't know how to index it"); return false; } - cgen = self->m_index->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_index), func, false, &iridx)) + if (!m_index->codegen(func, false, &iridx)) return false; - cgen = arr->m_getter->m_codegen; - if (!(*cgen)((ast_expression*)(arr->m_getter), func, true, &funval)) + if (!arr->m_getter->codegen(func, true, &funval)) return false; - call = ir_block_create_call(func->m_curblock, self->m_context, ast_function_label(func, "fetch"), funval, false); + call = ir_block_create_call(func->m_curblock, m_context, func->makeLabel("fetch"), funval, false); if (!call) return false; ir_call_param(call, iridx); *out = ir_call_value(call); - self->m_outr = *out; - (*out)->m_vtype = self->m_vtype; - codegen_output_type(self, *out); + m_outr = *out; + (*out)->m_vtype = m_vtype; + codegen_output_type(this, *out); return true; } if (idx->m_vtype == TYPE_FLOAT) { unsigned int arridx = idx->m_constval.vfloat; - if (arridx >= self->m_array->m_count) + if (arridx >= m_array->m_count) { - compile_error(self->m_context, "array index out of bounds: %i", arridx); + compile_error(m_context, "array index out of bounds: %i", arridx); return false; } *out = arr->m_ir_values[arridx]; } else if (idx->m_vtype == TYPE_INTEGER) { unsigned int arridx = idx->m_constval.vint; - if (arridx >= self->m_array->m_count) + if (arridx >= m_array->m_count) { - compile_error(self->m_context, "array index out of bounds: %i", arridx); + compile_error(m_context, "array index out of bounds: %i", arridx); return false; } *out = arr->m_ir_values[arridx]; } else { - compile_error(self->m_context, "array indexing here needs an integer constant"); + compile_error(m_context, "array indexing here needs an integer constant"); return false; } - (*out)->m_vtype = self->m_vtype; - codegen_output_type(self, *out); + (*out)->m_vtype = m_vtype; + codegen_output_type(this, *out); return true; } -bool ast_argpipe_codegen(ast_argpipe *self, ast_function *func, bool lvalue, ir_value **out) +bool ast_argpipe::codegen(ast_function *func, bool lvalue, ir_value **out) { *out = nullptr; if (lvalue) { - compile_error(self->m_context, "argpipe node: not an lvalue"); + compile_error(m_context, "argpipe node: not an lvalue"); return false; } (void)func; (void)out; - compile_error(self->m_context, "TODO: argpipe codegen not implemented"); + compile_error(m_context, "TODO: argpipe codegen not implemented"); return false; } -bool ast_ifthen_codegen(ast_ifthen *self, ast_function *func, bool lvalue, ir_value **out) +bool ast_ifthen::codegen(ast_function *func, bool lvalue, ir_value **out) { - ast_expression_codegen *cgen; - ir_value *condval; ir_value *dummy; @@ -2387,26 +2299,25 @@ bool ast_ifthen_codegen(ast_ifthen *self, ast_function *func, bool lvalue, ir_va (void)out; (void)lvalue; - if (self->m_outr) { - compile_error(self->m_context, "internal error: ast_ifthen cannot be reused, it bears no result!"); + if (m_outr) { + compile_error(m_context, "internal error: ast_ifthen cannot be reused, it bears no result!"); return false; } - self->m_outr = (ir_value*)1; + m_outr = (ir_value*)1; /* generate the condition */ - cgen = self->m_cond->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_cond), func, false, &condval)) + if (!m_cond->codegen(func, false, &condval)) return false; /* update the block which will get the jump - because short-logic or ternaries may have changed this */ cond = func->m_curblock; /* try constant folding away the condition */ - if ((folded = fold::cond_ifthen(condval, func, self)) != -1) + if ((folded = fold::cond_ifthen(condval, func, this)) != -1) return folded; - if (self->m_on_true) { + if (m_on_true) { /* create on-true block */ - ontrue = ir_function_create_block(self->m_context, func->m_ir_func, ast_function_label(func, "ontrue")); + ontrue = ir_function_create_block(m_context, func->m_ir_func, func->makeLabel("ontrue")); if (!ontrue) return false; @@ -2414,8 +2325,7 @@ bool ast_ifthen_codegen(ast_ifthen *self, ast_function *func, bool lvalue, ir_va func->m_curblock = ontrue; /* generate */ - cgen = self->m_on_true->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_on_true), func, false, &dummy)) + if (!m_on_true->codegen(func, false, &dummy)) return false; /* we now need to work from the current endpoint */ @@ -2424,9 +2334,9 @@ bool ast_ifthen_codegen(ast_ifthen *self, ast_function *func, bool lvalue, ir_va ontrue = nullptr; /* on-false path */ - if (self->m_on_false) { + if (m_on_false) { /* create on-false block */ - onfalse = ir_function_create_block(self->m_context, func->m_ir_func, ast_function_label(func, "onfalse")); + onfalse = ir_function_create_block(m_context, func->m_ir_func, func->makeLabel("onfalse")); if (!onfalse) return false; @@ -2434,8 +2344,7 @@ bool ast_ifthen_codegen(ast_ifthen *self, ast_function *func, bool lvalue, ir_va func->m_curblock = onfalse; /* generate */ - cgen = self->m_on_false->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_on_false), func, false, &dummy)) + if (!m_on_false->codegen(func, false, &dummy)) return false; /* we now need to work from the current endpoint */ @@ -2446,13 +2355,13 @@ bool ast_ifthen_codegen(ast_ifthen *self, ast_function *func, bool lvalue, ir_va /* Merge block were they all merge in to */ if (!ontrue || !onfalse || !ontrue_endblock->m_final || !onfalse_endblock->m_final) { - merge = ir_function_create_block(self->m_context, func->m_ir_func, ast_function_label(func, "endif")); + merge = ir_function_create_block(m_context, func->m_ir_func, func->makeLabel("endif")); if (!merge) return false; /* add jumps ot the merge block */ - if (ontrue && !ontrue_endblock->m_final && !ir_block_create_jump(ontrue_endblock, self->m_context, merge)) + if (ontrue && !ontrue_endblock->m_final && !ir_block_create_jump(ontrue_endblock, m_context, merge)) return false; - if (onfalse && !onfalse_endblock->m_final && !ir_block_create_jump(onfalse_endblock, self->m_context, merge)) + if (onfalse && !onfalse_endblock->m_final && !ir_block_create_jump(onfalse_endblock, m_context, merge)) return false; /* Now enter the merge block */ @@ -2461,7 +2370,7 @@ bool ast_ifthen_codegen(ast_ifthen *self, ast_function *func, bool lvalue, ir_va /* we create the if here, that way all blocks are ordered :) */ - if (!ir_block_create_if(cond, self->m_context, condval, + if (!ir_block_create_if(cond, m_context, condval, (ontrue ? ontrue : merge), (onfalse ? onfalse : merge))) { @@ -2471,10 +2380,8 @@ bool ast_ifthen_codegen(ast_ifthen *self, ast_function *func, bool lvalue, ir_va return true; } -bool ast_ternary_codegen(ast_ternary *self, ast_function *func, bool lvalue, ir_value **out) +bool ast_ternary::codegen(ast_function *func, bool lvalue, ir_value **out) { - ast_expression_codegen *cgen; - ir_value *condval; ir_value *trueval, *falseval; ir_instr *phi; @@ -2495,8 +2402,8 @@ bool ast_ternary_codegen(ast_ternary *self, ast_function *func, bool lvalue, ir_ * may still happen, thus we remember a created ir_value and simply return one * if it already exists. */ - if (self->m_outr) { - *out = self->m_outr; + if (m_outr) { + *out = m_outr; return true; } @@ -2504,17 +2411,16 @@ bool ast_ternary_codegen(ast_ternary *self, ast_function *func, bool lvalue, ir_ /* generate the condition */ func->m_curblock = cond; - cgen = self->m_cond->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_cond), func, false, &condval)) + if (!m_cond->codegen(func, false, &condval)) return false; cond_out = func->m_curblock; /* try constant folding away the condition */ - if ((folded = fold::cond_ternary(condval, func, self)) != -1) + if ((folded = fold::cond_ternary(condval, func, this)) != -1) return folded; /* create on-true block */ - ontrue = ir_function_create_block(self->m_context, func->m_ir_func, ast_function_label(func, "tern_T")); + ontrue = ir_function_create_block(m_context, func->m_ir_func, func->makeLabel("tern_T")); if (!ontrue) return false; else @@ -2523,15 +2429,14 @@ bool ast_ternary_codegen(ast_ternary *self, ast_function *func, bool lvalue, ir_ func->m_curblock = ontrue; /* generate */ - cgen = self->m_on_true->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_on_true), func, false, &trueval)) + if (!m_on_true->codegen(func, false, &trueval)) return false; ontrue_out = func->m_curblock; } /* create on-false block */ - onfalse = ir_function_create_block(self->m_context, func->m_ir_func, ast_function_label(func, "tern_F")); + onfalse = ir_function_create_block(m_context, func->m_ir_func, func->makeLabel("tern_F")); if (!onfalse) return false; else @@ -2540,25 +2445,24 @@ bool ast_ternary_codegen(ast_ternary *self, ast_function *func, bool lvalue, ir_ func->m_curblock = onfalse; /* generate */ - cgen = self->m_on_false->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_on_false), func, false, &falseval)) + if (!m_on_false->codegen(func, false, &falseval)) return false; onfalse_out = func->m_curblock; } /* create merge block */ - merge = ir_function_create_block(self->m_context, func->m_ir_func, ast_function_label(func, "tern_out")); + merge = ir_function_create_block(m_context, func->m_ir_func, func->makeLabel("tern_out")); if (!merge) return false; /* jump to merge block */ - if (!ir_block_create_jump(ontrue_out, self->m_context, merge)) + if (!ir_block_create_jump(ontrue_out, m_context, merge)) return false; - if (!ir_block_create_jump(onfalse_out, self->m_context, merge)) + if (!ir_block_create_jump(onfalse_out, m_context, merge)) return false; /* create if instruction */ - if (!ir_block_create_if(cond_out, self->m_context, condval, ontrue, onfalse)) + if (!ir_block_create_if(cond_out, m_context, condval, ontrue, onfalse)) return false; /* Now enter the merge block */ @@ -2569,31 +2473,29 @@ bool ast_ternary_codegen(ast_ternary *self, ast_function *func, bool lvalue, ir_ */ if (trueval->m_vtype != falseval->m_vtype && trueval->m_vtype != TYPE_NIL && falseval->m_vtype != TYPE_NIL) { /* error("ternary with different types on the two sides"); */ - compile_error(self->m_context, "internal error: ternary operand types invalid"); + compile_error(m_context, "internal error: ternary operand types invalid"); return false; } /* create PHI */ - phi = ir_block_create_phi(merge, self->m_context, ast_function_label(func, "phi"), self->m_vtype); + phi = ir_block_create_phi(merge, m_context, func->makeLabel("phi"), m_vtype); if (!phi) { - compile_error(self->m_context, "internal error: failed to generate phi node"); + compile_error(m_context, "internal error: failed to generate phi node"); return false; } ir_phi_add(phi, ontrue_out, trueval); ir_phi_add(phi, onfalse_out, falseval); - self->m_outr = ir_phi_value(phi); - *out = self->m_outr; + m_outr = ir_phi_value(phi); + *out = m_outr; - codegen_output_type(self, *out); + codegen_output_type(this, *out); return true; } -bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value **out) +bool ast_loop::codegen(ast_function *func, bool lvalue, ir_value **out) { - ast_expression_codegen *cgen; - ir_value *dummy = nullptr; ir_value *precond = nullptr; ir_value *postcond = nullptr; @@ -2620,11 +2522,11 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value (void)lvalue; (void)out; - if (self->m_outr) { - compile_error(self->m_context, "internal error: ast_loop cannot be reused, it bears no result!"); + if (m_outr) { + compile_error(m_context, "internal error: ast_loop cannot be reused, it bears no result!"); return false; } - self->m_outr = (ir_value*)1; + m_outr = (ir_value*)1; /* NOTE: * Should we ever need some kind of block ordering, better make this function @@ -2635,10 +2537,9 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value /* initexpr doesn't get its own block, it's pointless, it could create more blocks * anyway if for example it contains a ternary. */ - if (self->m_initexpr) + if (m_initexpr) { - cgen = self->m_initexpr->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_initexpr), func, false, &dummy)) + if (!m_initexpr->codegen(func, false, &dummy)) return false; } @@ -2648,9 +2549,9 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value /* The pre-loop condition needs its own block since we * need to be able to jump to the start of that expression. */ - if (self->m_precond) + if (m_precond) { - bprecond = ir_function_create_block(self->m_context, func->m_ir_func, ast_function_label(func, "pre_loop_cond")); + bprecond = ir_function_create_block(m_context, func->m_ir_func, func->makeLabel("pre_loop_cond")); if (!bprecond) return false; @@ -2661,8 +2562,7 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value func->m_curblock = bprecond; /* generate */ - cgen = self->m_precond->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_precond), func, false, &precond)) + if (!m_precond->codegen(func, false, &precond)) return false; end_bprecond = func->m_curblock; @@ -2673,8 +2573,8 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value /* Now the next blocks won't be ordered nicely, but we need to * generate them this early for 'break' and 'continue'. */ - if (self->m_increment) { - bincrement = ir_function_create_block(self->m_context, func->m_ir_func, ast_function_label(func, "loop_increment")); + if (m_increment) { + bincrement = ir_function_create_block(m_context, func->m_ir_func, func->makeLabel("loop_increment")); if (!bincrement) return false; bcontinue = bincrement; /* increment comes before the pre-loop-condition */ @@ -2682,8 +2582,8 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value bincrement = end_bincrement = nullptr; } - if (self->m_postcond) { - bpostcond = ir_function_create_block(self->m_context, func->m_ir_func, ast_function_label(func, "post_loop_cond")); + if (m_postcond) { + bpostcond = ir_function_create_block(m_context, func->m_ir_func, func->makeLabel("post_loop_cond")); if (!bpostcond) return false; bcontinue = bpostcond; /* postcond comes before the increment */ @@ -2692,15 +2592,15 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value } bout_id = func->m_ir_func->m_blocks.size(); - bout = ir_function_create_block(self->m_context, func->m_ir_func, ast_function_label(func, "after_loop")); + bout = ir_function_create_block(m_context, func->m_ir_func, func->makeLabel("after_loop")); if (!bout) return false; bbreak = bout; /* The loop body... */ - /* if (self->m_body) */ + /* if (m_body) */ { - bbody = ir_function_create_block(self->m_context, func->m_ir_func, ast_function_label(func, "loop_body")); + bbody = ir_function_create_block(m_context, func->m_ir_func, func->makeLabel("loop_body")); if (!bbody) return false; @@ -2714,9 +2614,8 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value func->m_continueblocks.push_back(bbody); /* generate */ - if (self->m_body) { - cgen = self->m_body->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_body), func, false, &dummy)) + if (m_body) { + if (!m_body->codegen(func, false, &dummy)) return false; } @@ -2726,28 +2625,26 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value } /* post-loop-condition */ - if (self->m_postcond) + if (m_postcond) { /* enter */ func->m_curblock = bpostcond; /* generate */ - cgen = self->m_postcond->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_postcond), func, false, &postcond)) + if (!m_postcond->codegen(func, false, &postcond)) return false; end_bpostcond = func->m_curblock; } /* The incrementor */ - if (self->m_increment) + if (m_increment) { /* enter */ func->m_curblock = bincrement; /* generate */ - cgen = self->m_increment->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_increment), func, false, &dummy)) + if (!m_increment->codegen(func, false, &dummy)) return false; end_bincrement = func->m_curblock; @@ -2766,7 +2663,7 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value else tmpblock = bout; */ - if (!ir_block_create_jump(bin, self->m_context, tmpblock)) + if (!ir_block_create_jump(bin, m_context, tmpblock)) return false; /* From precond */ @@ -2781,12 +2678,12 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value */ onfalse = bout; - if (self->m_pre_not) { + if (m_pre_not) { tmpblock = ontrue; ontrue = onfalse; onfalse = tmpblock; } - if (!ir_block_create_if(end_bprecond, self->m_context, precond, ontrue, onfalse)) + if (!ir_block_create_if(end_bprecond, m_context, precond, ontrue, onfalse)) return false; } @@ -2797,7 +2694,7 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value else if (bpostcond) tmpblock = bpostcond; else if (bprecond) tmpblock = bprecond; else tmpblock = bbody; - if (!end_bbody->m_final && !ir_block_create_jump(end_bbody, self->m_context, tmpblock)) + if (!end_bbody->m_final && !ir_block_create_jump(end_bbody, m_context, tmpblock)) return false; } @@ -2808,7 +2705,7 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value else if (bprecond) tmpblock = bprecond; else if (bbody) tmpblock = bbody; else tmpblock = bout; - if (!ir_block_create_jump(end_bincrement, self->m_context, tmpblock)) + if (!ir_block_create_jump(end_bincrement, m_context, tmpblock)) return false; } @@ -2825,12 +2722,12 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value */ onfalse = bout; - if (self->m_post_not) { + if (m_post_not) { tmpblock = ontrue; ontrue = onfalse; onfalse = tmpblock; } - if (!ir_block_create_if(end_bpostcond, self->m_context, postcond, ontrue, onfalse)) + if (!ir_block_create_if(end_bpostcond, m_context, postcond, ontrue, onfalse)) return false; } @@ -2838,49 +2735,47 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value algo::shiftback(func->m_ir_func->m_blocks.begin() + bout_id, func->m_ir_func->m_blocks.end()); // FIXME::DELME:: - //func->m_ir_func->m_blocks[bout_id].release(); // it's a vector> + //func->m_ir_func->m_blocks[bout_id].release(); // it's a vector> //func->m_ir_func->m_blocks.erase(func->m_ir_func->m_blocks.begin() + bout_id); //func->m_ir_func->m_blocks.emplace_back(bout); return true; } -bool ast_breakcont_codegen(ast_breakcont *self, ast_function *func, bool lvalue, ir_value **out) +bool ast_breakcont::codegen(ast_function *func, bool lvalue, ir_value **out) { ir_block *target; *out = nullptr; if (lvalue) { - compile_error(self->m_context, "break/continue expression is not an l-value"); + compile_error(m_context, "break/continue expression is not an l-value"); return false; } - if (self->m_outr) { - compile_error(self->m_context, "internal error: ast_breakcont cannot be reused!"); + if (m_outr) { + compile_error(m_context, "internal error: ast_breakcont cannot be reused!"); return false; } - self->m_outr = (ir_value*)1; + m_outr = (ir_value*)1; - if (self->m_is_continue) - target = func->m_continueblocks[func->m_continueblocks.size()-1-self->m_levels]; + if (m_is_continue) + target = func->m_continueblocks[func->m_continueblocks.size()-1-m_levels]; else - target = func->m_breakblocks[func->m_breakblocks.size()-1-self->m_levels]; + target = func->m_breakblocks[func->m_breakblocks.size()-1-m_levels]; if (!target) { - compile_error(self->m_context, "%s is lacking a target block", (self->m_is_continue ? "continue" : "break")); + compile_error(m_context, "%s is lacking a target block", (m_is_continue ? "continue" : "break")); return false; } - if (!ir_block_create_jump(func->m_curblock, self->m_context, target)) + if (!ir_block_create_jump(func->m_curblock, m_context, target)) return false; return true; } -bool ast_switch_codegen(ast_switch *self, ast_function *func, bool lvalue, ir_value **out) +bool ast_switch::codegen(ast_function *func, bool lvalue, ir_value **out) { - ast_expression_codegen *cgen; - ast_switch_case *def_case = nullptr; ir_block *def_bfall = nullptr; ir_block *def_bfall_to = nullptr; @@ -2896,35 +2791,34 @@ bool ast_switch_codegen(ast_switch *self, ast_function *func, bool lvalue, ir_va uint16_t cmpinstr; if (lvalue) { - compile_error(self->m_context, "switch expression is not an l-value"); + compile_error(m_context, "switch expression is not an l-value"); return false; } - if (self->m_outr) { - compile_error(self->m_context, "internal error: ast_switch cannot be reused!"); + if (m_outr) { + compile_error(m_context, "internal error: ast_switch cannot be reused!"); return false; } - self->m_outr = (ir_value*)1; + m_outr = (ir_value*)1; (void)lvalue; (void)out; - cgen = self->m_operand->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_operand), func, false, &irop)) + if (!m_operand->codegen(func, false, &irop)) return false; - if (self->m_cases.empty()) + if (m_cases.empty()) return true; cmpinstr = type_eq_instr[irop->m_vtype]; if (cmpinstr >= VINSTR_END) { - ast_type_to_string(self->m_operand, typestr, sizeof(typestr)); - compile_error(self->m_context, "invalid type to perform a switch on: %s", typestr); + ast_type_to_string(m_operand, typestr, sizeof(typestr)); + compile_error(m_context, "invalid type to perform a switch on: %s", typestr); return false; } bout_id = func->m_ir_func->m_blocks.size(); - bout = ir_function_create_block(self->m_context, func->m_ir_func, ast_function_label(func, "after_switch")); + bout = ir_function_create_block(m_context, func->m_ir_func, func->makeLabel("after_switch")); if (!bout) return false; @@ -2932,7 +2826,7 @@ bool ast_switch_codegen(ast_switch *self, ast_function *func, bool lvalue, ir_va func->m_breakblocks.push_back(bout); /* Now create all cases */ - for (auto &it : self->m_cases) { + for (auto &it : m_cases) { ir_value *cond, *val; ir_block *bcase, *bnot; size_t bnot_id; @@ -2942,36 +2836,34 @@ bool ast_switch_codegen(ast_switch *self, ast_function *func, bool lvalue, ir_va if (swcase->m_value) { /* A regular case */ /* generate the condition operand */ - cgen = swcase->m_value->m_codegen; - if (!(*cgen)((ast_expression*)(swcase->m_value), func, false, &val)) + if (!swcase->m_value->codegen(func, false, &val)) return false; /* generate the condition */ - cond = ir_block_create_binop(func->m_curblock, self->m_context, ast_function_label(func, "switch_eq"), cmpinstr, irop, val); + cond = ir_block_create_binop(func->m_curblock, m_context, func->makeLabel("switch_eq"), cmpinstr, irop, val); if (!cond) return false; - bcase = ir_function_create_block(self->m_context, func->m_ir_func, ast_function_label(func, "case")); + bcase = ir_function_create_block(m_context, func->m_ir_func, func->makeLabel("case")); bnot_id = func->m_ir_func->m_blocks.size(); - bnot = ir_function_create_block(self->m_context, func->m_ir_func, ast_function_label(func, "not_case")); + bnot = ir_function_create_block(m_context, func->m_ir_func, func->makeLabel("not_case")); if (!bcase || !bnot) return false; if (set_def_bfall_to) { set_def_bfall_to = false; def_bfall_to = bcase; } - if (!ir_block_create_if(func->m_curblock, self->m_context, cond, bcase, bnot)) + if (!ir_block_create_if(func->m_curblock, m_context, cond, bcase, bnot)) return false; /* Make the previous case-end fall through */ if (bfall && !bfall->m_final) { - if (!ir_block_create_jump(bfall, self->m_context, bcase)) + if (!ir_block_create_jump(bfall, m_context, bcase)) return false; } /* enter the case */ func->m_curblock = bcase; - cgen = swcase->m_code->m_codegen; - if (!(*cgen)((ast_expression*)swcase->m_code, func, false, &dummy)) + if (!swcase->m_code->codegen(func, false, &dummy)) return false; /* remember this block to fall through from */ @@ -2998,7 +2890,7 @@ bool ast_switch_codegen(ast_switch *self, ast_function *func, bool lvalue, ir_va } /* Jump from the last bnot to bout */ - if (bfall && !bfall->m_final && !ir_block_create_jump(bfall, self->m_context, bout)) { + if (bfall && !bfall->m_final && !ir_block_create_jump(bfall, m_context, bout)) { /* astwarning(bfall->m_context, WARN_???, "missing break after last case"); */ @@ -3014,25 +2906,24 @@ bool ast_switch_codegen(ast_switch *self, ast_function *func, bool lvalue, ir_va /* Insert the fallthrough jump */ if (def_bfall && !def_bfall->m_final) { - if (!ir_block_create_jump(def_bfall, self->m_context, bcase)) + if (!ir_block_create_jump(def_bfall, m_context, bcase)) return false; } /* Now generate the default code */ - cgen = def_case->m_code->m_codegen; - if (!(*cgen)((ast_expression*)def_case->m_code, func, false, &dummy)) + if (!def_case->m_code->codegen(func, false, &dummy)) return false; /* see if we need to fall through */ if (def_bfall_to && !func->m_curblock->m_final) { - if (!ir_block_create_jump(func->m_curblock, self->m_context, def_bfall_to)) + if (!ir_block_create_jump(func->m_curblock, m_context, def_bfall_to)) return false; } } /* Jump from the last bnot to bout */ - if (!func->m_curblock->m_final && !ir_block_create_jump(func->m_curblock, self->m_context, bout)) + if (!func->m_curblock->m_final && !ir_block_create_jump(func->m_curblock, m_context, bout)) return false; /* enter the outgoing block */ func->m_curblock = bout; @@ -3051,65 +2942,65 @@ bool ast_switch_codegen(ast_switch *self, ast_function *func, bool lvalue, ir_va return true; } -bool ast_label_codegen(ast_label *self, ast_function *func, bool lvalue, ir_value **out) +bool ast_label::codegen(ast_function *func, bool lvalue, ir_value **out) { ir_value *dummy; - if (self->m_undefined) { - compile_error(self->m_context, "internal error: ast_label never defined"); + if (m_undefined) { + compile_error(m_context, "internal error: ast_label never defined"); return false; } *out = nullptr; if (lvalue) { - compile_error(self->m_context, "internal error: ast_label cannot be an lvalue"); + compile_error(m_context, "internal error: ast_label cannot be an lvalue"); return false; } /* simply create a new block and jump to it */ - self->m_irblock = ir_function_create_block(self->m_context, func->m_ir_func, self->m_name); - if (!self->m_irblock) { - compile_error(self->m_context, "failed to allocate label block `%s`", self->m_name); + m_irblock = ir_function_create_block(m_context, func->m_ir_func, m_name.c_str()); + if (!m_irblock) { + compile_error(m_context, "failed to allocate label block `%s`", m_name); return false; } if (!func->m_curblock->m_final) { - if (!ir_block_create_jump(func->m_curblock, self->m_context, self->m_irblock)) + if (!ir_block_create_jump(func->m_curblock, m_context, m_irblock)) return false; } /* enter the new block */ - func->m_curblock = self->m_irblock; + func->m_curblock = m_irblock; /* Generate all the leftover gotos */ - for (auto &it : self->m_gotos) { - if (!ast_goto_codegen(it, func, false, &dummy)) + for (auto &it : m_gotos) { + if (!it->codegen(func, false, &dummy)) return false; } return true; } -bool ast_goto_codegen(ast_goto *self, ast_function *func, bool lvalue, ir_value **out) +bool ast_goto::codegen(ast_function *func, bool lvalue, ir_value **out) { *out = nullptr; if (lvalue) { - compile_error(self->m_context, "internal error: ast_goto cannot be an lvalue"); + compile_error(m_context, "internal error: ast_goto cannot be an lvalue"); return false; } - if (self->m_target->m_irblock) { - if (self->m_irblock_from) { + if (m_target->m_irblock) { + if (m_irblock_from) { /* we already tried once, this is the callback */ - self->m_irblock_from->m_final = false; - if (!ir_block_create_goto(self->m_irblock_from, self->m_context, self->m_target->m_irblock)) { - compile_error(self->m_context, "failed to generate goto to `%s`", self->m_name); + m_irblock_from->m_final = false; + if (!ir_block_create_goto(m_irblock_from, m_context, m_target->m_irblock)) { + compile_error(m_context, "failed to generate goto to `%s`", m_name); return false; } } else { - if (!ir_block_create_goto(func->m_curblock, self->m_context, self->m_target->m_irblock)) { - compile_error(self->m_context, "failed to generate goto to `%s`", self->m_name); + if (!ir_block_create_goto(func->m_curblock, m_context, m_target->m_irblock)) { + compile_error(m_context, "failed to generate goto to `%s`", m_name); return false; } } @@ -3120,54 +3011,48 @@ bool ast_goto_codegen(ast_goto *self, ast_function *func, bool lvalue, ir_value * close this block in a sneaky way: */ func->m_curblock->m_final = true; - self->m_irblock_from = func->m_curblock; - ast_label_register_goto(self->m_target, self); + m_irblock_from = func->m_curblock; + m_target->registerGoto(this); } return true; } -#include -bool ast_state_codegen(ast_state *self, ast_function *func, bool lvalue, ir_value **out) +bool ast_state::codegen(ast_function *func, bool lvalue, ir_value **out) { - ast_expression_codegen *cgen; - ir_value *frameval, *thinkval; if (lvalue) { - compile_error(self->m_context, "not an l-value (state operation)"); + compile_error(m_context, "not an l-value (state operation)"); return false; } - if (self->m_outr) { - compile_error(self->m_context, "internal error: ast_state cannot be reused!"); + if (m_outr) { + compile_error(m_context, "internal error: ast_state cannot be reused!"); return false; } *out = nullptr; - cgen = self->m_framenum->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_framenum), func, false, &frameval)) + if (!m_framenum->codegen(func, false, &frameval)) return false; if (!frameval) return false; - cgen = self->m_nextthink->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_nextthink), func, false, &thinkval)) + if (!m_nextthink->codegen(func, false, &thinkval)) return false; if (!frameval) return false; - if (!ir_block_create_state_op(func->m_curblock, self->m_context, frameval, thinkval)) { - compile_error(self->m_context, "failed to create STATE instruction"); + if (!ir_block_create_state_op(func->m_curblock, m_context, frameval, thinkval)) { + compile_error(m_context, "failed to create STATE instruction"); return false; } - self->m_outr = (ir_value*)1; + m_outr = (ir_value*)1; return true; } -bool ast_call_codegen(ast_call *self, ast_function *func, bool lvalue, ir_value **out) +bool ast_call::codegen(ast_function *func, bool lvalue, ir_value **out) { - ast_expression_codegen *cgen; std::vector params; ir_instr *callinstr; @@ -3175,26 +3060,24 @@ bool ast_call_codegen(ast_call *self, ast_function *func, bool lvalue, ir_value /* return values are never lvalues */ if (lvalue) { - compile_error(self->m_context, "not an l-value (function call)"); + compile_error(m_context, "not an l-value (function call)"); return false; } - if (self->m_outr) { - *out = self->m_outr; + if (m_outr) { + *out = m_outr; return true; } - cgen = self->m_func->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_func), func, false, &funval)) + if (!m_func->codegen(func, false, &funval)) return false; if (!funval) return false; /* parameters */ - for (auto &it : self->m_params) { + for (auto &it : m_params) { ir_value *param; - cgen = it->m_codegen; - if (!(*cgen)(it, func, false, ¶m)) + if (!it->codegen(func, false, ¶m)) return false; if (!param) return false; @@ -3202,22 +3085,21 @@ bool ast_call_codegen(ast_call *self, ast_function *func, bool lvalue, ir_value } /* varargs counter */ - if (self->m_va_count) { + if (m_va_count) { ir_value *va_count; ir_builder *builder = func->m_curblock->m_owner->m_owner; - cgen = self->m_va_count->m_codegen; - if (!(*cgen)((ast_expression*)(self->m_va_count), func, false, &va_count)) + if (!m_va_count->codegen(func, false, &va_count)) return false; - if (!ir_block_create_store_op(func->m_curblock, self->m_context, INSTR_STORE_F, - ir_builder_get_va_count(builder), va_count)) + if (!ir_block_create_store_op(func->m_curblock, m_context, INSTR_STORE_F, + builder->get_va_count(), va_count)) { return false; } } - callinstr = ir_block_create_call(func->m_curblock, self->m_context, - ast_function_label(func, "call"), - funval, !!(self->m_func->m_flags & AST_FLAG_NORETURN)); + callinstr = ir_block_create_call(func->m_curblock, m_context, + func->makeLabel("call"), + funval, !!(m_func->m_flags & AST_FLAG_NORETURN)); if (!callinstr) return false; @@ -3225,9 +3107,9 @@ bool ast_call_codegen(ast_call *self, ast_function *func, bool lvalue, ir_value ir_call_param(callinstr, it); *out = ir_call_value(callinstr); - self->m_outr = *out; + m_outr = *out; - codegen_output_type(self, *out); + codegen_output_type(this, *out); return true; }