X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=ast.c;h=3bb5bf8b8367be6f8ed6ca981f017c13da20f71d;hp=188dcec1b27e0e8440e9dc1b01a581976a94a00a;hb=a60d0182db75e7b32e4efe5384a3b5dd4b7cc0ff;hpb=8e1ce2ab5e3d87aebd1adf72e339db259d690043 diff --git a/ast.c b/ast.c index 188dcec..3bb5bf8 100644 --- a/ast.c +++ b/ast.c @@ -71,8 +71,9 @@ static void ast_expression_init(ast_expression *self, self->expression.next = NULL; self->expression.outl = NULL; self->expression.outr = NULL; - self->expression.variadic = false; self->expression.params = NULL; + self->expression.count = 0; + self->expression.flags = 0; } static void ast_expression_delete(ast_expression *self) @@ -107,7 +108,8 @@ ast_value* ast_value_copy(const ast_value *self) } fromex = &self->expression; selfex = &cp->expression; - selfex->variadic = fromex->variadic; + selfex->count = fromex->count; + selfex->flags = fromex->flags; for (i = 0; i < vec_size(fromex->params); ++i) { ast_value *v = ast_value_copy(fromex->params[i]); if (!v) { @@ -132,7 +134,8 @@ bool ast_type_adopt_impl(ast_expression *self, const ast_expression *other) } fromex = &other->expression; selfex = &self->expression; - selfex->variadic = fromex->variadic; + selfex->count = fromex->count; + selfex->flags = fromex->flags; for (i = 0; i < vec_size(fromex->params); ++i) { ast_value *v = ast_value_copy(fromex->params[i]); if (!v) @@ -183,7 +186,8 @@ ast_expression* ast_type_copy(lex_ctx ctx, const ast_expression *ex) else selfex->next = NULL; - selfex->variadic = fromex->variadic; + selfex->count = fromex->count; + selfex->flags = fromex->flags; for (i = 0; i < vec_size(fromex->params); ++i) { ast_value *v = ast_value_copy(fromex->params[i]); if (!v) { @@ -205,7 +209,7 @@ bool ast_compare_type(ast_expression *a, ast_expression *b) return false; if (vec_size(a->expression.params) != vec_size(b->expression.params)) return false; - if (a->expression.variadic != b->expression.variadic) + if (a->expression.flags != b->expression.flags) return false; if (vec_size(a->expression.params)) { size_t i; @@ -322,7 +326,8 @@ ast_value* ast_value_new(lex_ctx ctx, const char *name, int t) self->name = name ? util_strdup(name) : NULL; self->expression.vtype = t; self->expression.next = NULL; - self->constant = false; + self->isfield = false; + self->cvq = CV_NONE; self->hasvalue = false; self->uses = 0; memset(&self->constval, 0, sizeof(self->constval)); @@ -392,8 +397,13 @@ ast_binary* ast_binary_new(lex_ctx ctx, int op, if (op >= INSTR_EQ_F && op <= INSTR_GT) self->expression.vtype = TYPE_FLOAT; - else if (op == INSTR_AND || op == INSTR_OR || - op == INSTR_BITAND || op == INSTR_BITOR) + else if (op == INSTR_AND || op == INSTR_OR) { + if (OPTS_FLAG(PERL_LOGIC)) + ast_type_adopt(self, right); + else + self->expression.vtype = TYPE_FLOAT; + } + else if (op == INSTR_BITAND || op == INSTR_BITOR) self->expression.vtype = TYPE_FLOAT; else if (op == INSTR_MUL_VF || op == INSTR_MUL_FV) self->expression.vtype = TYPE_VECTOR; @@ -428,16 +438,10 @@ ast_binstore* ast_binstore_new(lex_ctx ctx, int storop, int op, self->keep_dest = false; - self->expression.vtype = left->expression.vtype; - if (left->expression.next) { - self->expression.next = ast_type_copy(ctx, left); - if (!self->expression.next) { - ast_delete(self); - return NULL; - } + if (!ast_type_adopt(self, left)) { + ast_delete(self); + return NULL; } - else - self->expression.next = NULL; return self; } @@ -472,7 +476,7 @@ ast_unary* ast_unary_new(lex_ctx ctx, int op, void ast_unary_delete(ast_unary *self) { - ast_unref(self->operand); + if (self->operand) ast_unref(self->operand); ast_expression_delete((ast_expression*)self); mem_d(self); } @@ -592,6 +596,14 @@ void ast_member_delete(ast_member *self) mem_d(self); } +bool ast_member_set_name(ast_member *self, const char *name) +{ + if (self->name) + mem_d((void*)self->name); + self->name = util_strdup(name); + return !!self->name; +} + ast_array_index* ast_array_index_new(lex_ctx ctx, ast_expression *array, ast_expression *index) { ast_expression *outtype; @@ -705,8 +717,8 @@ void ast_ternary_delete(ast_ternary *self) ast_loop* ast_loop_new(lex_ctx ctx, ast_expression *initexpr, - ast_expression *precond, - ast_expression *postcond, + ast_expression *precond, bool pre_not, + ast_expression *postcond, bool post_not, ast_expression *increment, ast_expression *body) { @@ -719,6 +731,9 @@ ast_loop* ast_loop_new(lex_ctx ctx, self->increment = increment; self->body = body; + self->pre_not = pre_not; + self->post_not = post_not; + if (initexpr) ast_propagate_effects(self, initexpr); if (precond) @@ -749,12 +764,13 @@ void ast_loop_delete(ast_loop *self) mem_d(self); } -ast_breakcont* ast_breakcont_new(lex_ctx ctx, bool iscont) +ast_breakcont* ast_breakcont_new(lex_ctx ctx, bool iscont, unsigned int levels) { ast_instantiate(ast_breakcont, ctx, ast_breakcont_delete); ast_expression_init((ast_expression*)self, (ast_expression_codegen*)&ast_breakcont_codegen); self->is_continue = iscont; + self->levels = levels; return self; } @@ -854,9 +870,7 @@ ast_call* ast_call_new(lex_ctx ctx, self->params = NULL; self->func = funcexpr; - self->expression.vtype = funcexpr->expression.next->expression.vtype; - if (funcexpr->expression.next->expression.next) - self->expression.next = ast_type_copy(ctx, funcexpr->expression.next->expression.next); + ast_type_adopt(self, funcexpr->expression.next); return self; } @@ -911,16 +925,10 @@ ast_store* ast_store_new(lex_ctx ctx, int op, self->dest = dest; self->source = source; - self->expression.vtype = dest->expression.vtype; - if (dest->expression.next) { - self->expression.next = ast_type_copy(ctx, dest); - if (!self->expression.next) { - ast_delete(self); - return NULL; - } + if (!ast_type_adopt(self, dest)) { + ast_delete(self); + return NULL; } - else - self->expression.next = NULL; return self; } @@ -946,10 +954,19 @@ ast_block* ast_block_new(lex_ctx ctx) return self; } -void ast_block_add_expr(ast_block *self, ast_expression *e) +bool ast_block_add_expr(ast_block *self, ast_expression *e) { ast_propagate_effects(self, e); vec_push(self->exprs, e); + if (self->expression.next) { + ast_delete(self->expression.next); + self->expression.next = NULL; + } + if (!ast_type_adopt(self, e)) { + compile_error(ast_ctx(self), "internal error: failed to adopt type"); + return false; + } + return true; } void ast_block_collect(ast_block *self, ast_expression *expr) @@ -978,14 +995,8 @@ bool ast_block_set_type(ast_block *self, ast_expression *from) { if (self->expression.next) ast_delete(self->expression.next); - self->expression.vtype = from->expression.vtype; - if (from->expression.next) { - self->expression.next = ast_type_copy(self->expression.node.context, from->expression.next); - if (!self->expression.next) - return false; - } - else - self->expression.next = NULL; + if (!ast_type_adopt(self, from)) + return false; return true; } @@ -997,7 +1008,7 @@ ast_function* ast_function_new(lex_ctx ctx, const char *name, ast_value *vtype) vtype->hasvalue || vtype->expression.vtype != TYPE_FUNCTION) { - compile_error(ast_ctx(self), "internal error: ast_function_new condition %i %i type=%i", + compile_error(ast_ctx(self), "internal error: ast_function_new condition %i %i type=%i (probably 2 bodies?)", (int)!vtype, (int)vtype->hasvalue, vtype->expression.vtype); @@ -1015,8 +1026,8 @@ ast_function* ast_function_new(lex_ctx ctx, const char *name, ast_value *vtype) self->ir_func = NULL; self->curblock = NULL; - self->breakblock = NULL; - self->continueblock = NULL; + self->breakblocks = NULL; + self->continueblocks = NULL; vtype->hasvalue = true; vtype->constval.vfunc = self; @@ -1041,6 +1052,8 @@ void ast_function_delete(ast_function *self) for (i = 0; i < vec_size(self->blocks); ++i) ast_delete(self->blocks[i]); vec_free(self->blocks); + vec_free(self->breakblocks); + vec_free(self->continueblocks); mem_d(self); } @@ -1050,7 +1063,7 @@ const char* ast_function_label(ast_function *self, const char *prefix) size_t len; char *from; - if (!opts_dump && !opts_dumpfin) + if (!opts.dump && !opts.dumpfin && !opts.debug) return NULL; id = (self->labelcount++); @@ -1059,10 +1072,10 @@ const char* ast_function_label(ast_function *self, const char *prefix) from = self->labelbuf + sizeof(self->labelbuf)-1; *from-- = 0; do { - unsigned int digit = id % 10; - *from = digit + '0'; + *from-- = (id%10) + '0'; id /= 10; } while (id); + ++from; memcpy(from - len, prefix, len); return from - len; } @@ -1074,6 +1087,16 @@ const char* ast_function_label(ast_function *self, const char *prefix) * But I can't imagine a pituation where the output is truly unnecessary. */ +void _ast_codegen_output_type(ast_expression_common *self, ir_value *out) +{ + if (out->vtype == TYPE_FIELD) + out->fieldtype = self->next->expression.vtype; + if (out->vtype == TYPE_FUNCTION) + out->outtype = self->next->expression.vtype; +} + +#define codegen_output_type(a,o) (_ast_codegen_output_type(&((a)->expression),(o))) + bool ast_value_codegen(ast_value *self, ast_function *func, bool lvalue, ir_value **out) { (void)func; @@ -1086,9 +1109,9 @@ bool ast_value_codegen(ast_value *self, ast_function *func, bool lvalue, ir_valu * on all the globals. */ if (!self->ir_v) { - char typename[1024]; - ast_type_to_string((ast_expression*)self, typename, sizeof(typename)); - compile_error(ast_ctx(self), "ast_value used before generated %s %s", typename, self->name); + char tname[1024]; /* typename is reserved in C++ */ + ast_type_to_string((ast_expression*)self, tname, sizeof(tname)); + compile_error(ast_ctx(self), "ast_value used before generated %s %s", tname, self->name); return false; } *out = self->ir_v; @@ -1136,7 +1159,7 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield) } /* we are lame now - considering the way QC works we won't tolerate arrays > 1024 elements */ - if (!array->expression.count || array->expression.count > opts_max_array_size) + if (!array->expression.count || array->expression.count > opts.max_array_size) compile_error(ast_ctx(self), "Invalid array of size %lu", (unsigned long)array->expression.count); elemtype = &array->expression.next->expression; @@ -1147,9 +1170,9 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield) compile_error(ast_ctx(self), "ir_builder_create_global failed on `%s`", self->name); return false; } - if (vtype == TYPE_FIELD) - v->fieldtype = elemtype->next->expression.vtype; v->context = ast_ctx(self); + v->unique_life = true; + v->locked = true; array->ir_v = self->ir_v = v; namelen = strlen(self->name); @@ -1166,9 +1189,9 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield) compile_error(ast_ctx(self), "ir_builder_create_global failed on `%s`", name); return false; } - if (vtype == TYPE_FIELD) - array->ir_values[ai]->fieldtype = elemtype->next->expression.vtype; array->ir_values[ai]->context = ast_ctx(self); + array->ir_values[ai]->unique_life = true; + array->ir_values[ai]->locked = true; } mem_d(name); } @@ -1192,7 +1215,7 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield) int vtype = elemtype->vtype; /* same as with field arrays */ - if (!self->expression.count || self->expression.count > opts_max_array_size) + if (!self->expression.count || self->expression.count > opts.max_array_size) compile_error(ast_ctx(self), "Invalid array of size %lu", (unsigned long)self->expression.count); v = ir_builder_create_global(ir, self->name, vtype); @@ -1200,9 +1223,9 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield) compile_error(ast_ctx(self), "ir_builder_create_global failed `%s`", self->name); return false; } - if (vtype == TYPE_FIELD) - v->fieldtype = elemtype->next->expression.vtype; v->context = ast_ctx(self); + v->unique_life = true; + v->locked = true; namelen = strlen(self->name); name = (char*)mem_a(namelen + 16); @@ -1218,9 +1241,9 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield) compile_error(ast_ctx(self), "ir_builder_create_global failed `%s`", name); return false; } - if (vtype == TYPE_FIELD) - self->ir_values[ai]->fieldtype = elemtype->next->expression.vtype; self->ir_values[ai]->context = ast_ctx(self); + self->ir_values[ai]->unique_life = true; + self->ir_values[ai]->locked = true; } mem_d(name); } @@ -1234,8 +1257,7 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield) compile_error(ast_ctx(self), "ir_builder_create_global failed on `%s`", self->name); return false; } - if (self->expression.vtype == TYPE_FIELD) - v->fieldtype = self->expression.next->expression.vtype; + codegen_output_type(self, v); v->context = ast_ctx(self); } @@ -1263,6 +1285,18 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield) /* Cannot generate an IR value for a function, * need a pointer pointing to a function rather. */ + case TYPE_FIELD: + if (!self->constval.vfield) { + compile_error(ast_ctx(self), "field constant without vfield set"); + goto error; + } + if (!self->constval.vfield->ir_v) { + compile_error(ast_ctx(self), "field constant generated before its field"); + goto error; + } + if (!ir_value_set_field(v, self->constval.vfield->ir_v)) + goto error; + break; default: compile_error(ast_ctx(self), "TODO: global constant type %i", self->expression.vtype); break; @@ -1270,6 +1304,7 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield) } /* link us to the ir_value */ + v->cvq = self->cvq; self->ir_v = v; return true; @@ -1297,13 +1332,15 @@ bool ast_local_codegen(ast_value *self, ir_function *func, bool param) ast_expression_common *elemtype = &self->expression.next->expression; int vtype = elemtype->vtype; + func->flags |= IR_FLAG_HAS_ARRAYS; + if (param) { compile_error(ast_ctx(self), "array-parameters are not supported"); return false; } /* we are lame now - considering the way QC works we won't tolerate arrays > 1024 elements */ - if (!self->expression.count || self->expression.count > opts_max_array_size) { + if (!self->expression.count || self->expression.count > opts.max_array_size) { compile_error(ast_ctx(self), "Invalid array of size %lu", (unsigned long)self->expression.count); } @@ -1318,9 +1355,9 @@ bool ast_local_codegen(ast_value *self, ir_function *func, bool param) compile_error(ast_ctx(self), "ir_function_create_local failed"); return false; } - if (vtype == TYPE_FIELD) - v->fieldtype = elemtype->next->expression.vtype; v->context = ast_ctx(self); + v->unique_life = true; + v->locked = true; namelen = strlen(self->name); name = (char*)mem_a(namelen + 16); @@ -1334,9 +1371,9 @@ bool ast_local_codegen(ast_value *self, ir_function *func, bool param) compile_error(ast_ctx(self), "ir_builder_create_global failed on `%s`", name); return false; } - if (vtype == TYPE_FIELD) - self->ir_values[ai]->fieldtype = elemtype->next->expression.vtype; self->ir_values[ai]->context = ast_ctx(self); + self->ir_values[ai]->unique_life = true; + self->ir_values[ai]->locked = true; } } else @@ -1344,8 +1381,7 @@ bool ast_local_codegen(ast_value *self, ir_function *func, bool param) v = ir_function_create_local(func, self->name, self->expression.vtype, param); if (!v) return false; - if (self->expression.vtype == TYPE_FIELD) - v->fieldtype = self->expression.next->expression.vtype; + codegen_output_type(self, v); v->context = ast_ctx(self); } @@ -1374,25 +1410,65 @@ bool ast_local_codegen(ast_value *self, ir_function *func, bool param) } /* link us to the ir_value */ + v->cvq = self->cvq; self->ir_v = v; + if (!ast_generate_accessors(self, func->owner)) + return false; + return true; + +error: /* clean up */ + ir_value_delete(v); + return false; +} + +bool ast_generate_accessors(ast_value *self, ir_builder *ir) +{ + size_t i; + bool warn = OPTS_WARN(WARN_USED_UNINITIALIZED); + if (!self->setter || !self->getter) + return true; + for (i = 0; i < self->expression.count; ++i) { + if (!self->ir_values) { + compile_error(ast_ctx(self), "internal error: no array values generated for `%s`", self->name); + return false; + } + if (!self->ir_values[i]) { + compile_error(ast_ctx(self), "internal error: not all array values have been generated for `%s`", self->name); + return false; + } + if (self->ir_values[i]->life) { + compile_error(ast_ctx(self), "internal error: function containing `%s` already generated", self->name); + return false; + } + } + + opts_set(opts.warn, WARN_USED_UNINITIALIZED, false); if (self->setter) { - if (!ast_global_codegen(self->setter, func->owner, false) || - !ast_function_codegen(self->setter->constval.vfunc, func->owner) || + if (!ast_global_codegen (self->setter, ir, false) || + !ast_function_codegen(self->setter->constval.vfunc, ir) || !ir_function_finalize(self->setter->constval.vfunc->ir_func)) + { + compile_error(ast_ctx(self), "internal error: failed to generate setter for `%s`", self->name); + opts_set(opts.warn, WARN_USED_UNINITIALIZED, warn); return false; + } } if (self->getter) { - if (!ast_global_codegen(self->getter, func->owner, false) || - !ast_function_codegen(self->getter->constval.vfunc, func->owner) || + if (!ast_global_codegen (self->getter, ir, false) || + !ast_function_codegen(self->getter->constval.vfunc, ir) || !ir_function_finalize(self->getter->constval.vfunc->ir_func)) + { + compile_error(ast_ctx(self), "internal error: failed to generate getter for `%s`", self->name); + opts_set(opts.warn, WARN_USED_UNINITIALIZED, warn); return false; + } + } + for (i = 0; i < self->expression.count; ++i) { + vec_free(self->ir_values[i]->life); } + opts_set(opts.warn, WARN_USED_UNINITIALIZED, warn); return true; - -error: /* clean up */ - ir_value_delete(v); - return false; } bool ast_function_codegen(ast_function *self, ir_builder *ir) @@ -1414,7 +1490,10 @@ bool ast_function_codegen(ast_function *self, ir_builder *ir) ec = &self->vtype->expression; for (i = 0; i < vec_size(ec->params); ++i) { - vec_push(irf->params, ec->params[i]->expression.vtype); + if (ec->params[i]->expression.vtype == TYPE_FIELD) + vec_push(irf->params, ec->params[i]->expression.next->expression.vtype); + else + vec_push(irf->params, ec->params[i]->expression.vtype); if (!self->builtin) { if (!ast_local_codegen(ec->params[i], self->ir_func, true)) return false; @@ -1444,24 +1523,23 @@ bool ast_function_codegen(ast_function *self, ir_builder *ir) } /* TODO: check return types */ - if (!self->curblock->is_return) + if (!self->curblock->final) { - return ir_block_create_return(self->curblock, NULL); - /* From now on the parser has to handle this situation */ if (!self->vtype->expression.next || self->vtype->expression.next->expression.vtype == TYPE_VOID) { - return ir_block_create_return(self->curblock, NULL); + return ir_block_create_return(self->curblock, ast_ctx(self), NULL); } - else + else if (vec_size(self->curblock->entries)) { /* error("missing return"); */ if (compile_warning(ast_ctx(self), WARN_MISSING_RETURN_VALUES, - "control reaches end of non-void function (`%s`)", - self->name)) + "control reaches end of non-void function (`%s`) via %s", + self->name, self->curblock->label)) { return false; } + return ir_block_create_return(self->curblock, ast_ctx(self), NULL); } } return true; @@ -1503,7 +1581,7 @@ bool ast_block_codegen(ast_block *self, ast_function *func, bool lvalue, ir_valu for (i = 0; i < vec_size(self->locals); ++i) { if (!ast_local_codegen(self->locals[i], func->ir_func, false)) { - if (opts_debug) + if (opts.debug) compile_error(ast_ctx(self), "failed to generate local `%s`", self->locals[i]->name); return false; } @@ -1511,11 +1589,13 @@ bool ast_block_codegen(ast_block *self, ast_function *func, bool lvalue, ir_valu for (i = 0; i < vec_size(self->exprs); ++i) { - ast_expression_codegen *gen = self->exprs[i]->expression.codegen; + ast_expression_codegen *gen; if (func->curblock->final && !ast_istype(self->exprs[i], ast_label)) { - compile_error(ast_ctx(self->exprs[i]), "unreachable statement"); - return false; + if (compile_warning(ast_ctx(self->exprs[i]), WARN_UNREACHABLE_CODE, "unreachable statement")) + return false; + continue; } + gen = self->exprs[i]->expression.codegen; if (!(*gen)(self->exprs[i], func, false, out)) return false; } @@ -1551,7 +1631,7 @@ bool ast_store_codegen(ast_store *self, ast_function *func, bool lvalue, ir_valu ai = (ast_array_index*)self->dest; idx = (ast_value*)ai->index; - if (ast_istype(ai->index, ast_value) && idx->hasvalue) + if (ast_istype(ai->index, ast_value) && idx->hasvalue && idx->cvq == CV_CONST) ai = NULL; } @@ -1583,7 +1663,7 @@ bool ast_store_codegen(ast_store *self, ast_function *func, bool lvalue, ir_valu if (!(*cgen)((ast_expression*)(self->source), func, false, &right)) return false; - call = ir_block_create_call(func->curblock, ast_function_label(func, "store"), funval); + call = ir_block_create_call(func->curblock, ast_ctx(self), ast_function_label(func, "store"), funval, false); if (!call) return false; ir_call_param(call, iridx); @@ -1605,7 +1685,7 @@ bool ast_store_codegen(ast_store *self, ast_function *func, bool lvalue, ir_valu if (!(*cgen)((ast_expression*)(self->source), func, false, &right)) return false; - if (!ir_block_create_store_op(func->curblock, self->op, left, right)) + if (!ir_block_create_store_op(func->curblock, ast_ctx(self), self->op, left, right)) return false; self->expression.outr = right; } @@ -1638,7 +1718,7 @@ bool ast_binary_codegen(ast_binary *self, ast_function *func, bool lvalue, ir_va return true; } - if (OPTS_FLAG(SHORT_LOGIC) && + if ((OPTS_FLAG(SHORT_LOGIC) || OPTS_FLAG(PERL_LOGIC)) && (self->op == INSTR_AND || self->op == INSTR_OR)) { /* short circuit evaluation */ @@ -1646,88 +1726,93 @@ bool ast_binary_codegen(ast_binary *self, ast_function *func, bool lvalue, ir_va ir_block *from_left, *from_right; ir_instr *phi; size_t merge_id; - uint16_t notop; - - /* Note about casting to true boolean values: - * We use a single NOT for sub expressions, and an - * overall NOT at the end, and for that purpose swap - * all the jump conditions in order for the NOT to get - * doubled. - * ie: (a && b) usually becomes (!!a ? !!b : !!a) - * but we translate this to (!(!a ? !a : !b)) - */ + /* prepare end-block */ merge_id = vec_size(func->ir_func->blocks); - merge = ir_function_create_block(ast_ctx(self), func->ir_func, ast_function_label(func, "sce_merge")); + merge = ir_function_create_block(ast_ctx(self), func->ir_func, ast_function_label(func, "sce_merge")); + /* generate the left expression */ cgen = self->left->expression.codegen; if (!(*cgen)((ast_expression*)(self->left), func, false, &left)) return false; - if (!OPTS_FLAG(PERL_LOGIC)) { - notop = type_not_instr[left->vtype]; - if (notop == AINSTR_END) { - compile_error(ast_ctx(self), "don't know how to cast to bool..."); - return false; - } - left = ir_block_create_unary(func->curblock, - ast_function_label(func, "sce_not"), - notop, - left); - } + /* remember the block */ from_left = func->curblock; + /* create a new block for the right expression */ other = ir_function_create_block(ast_ctx(self), func->ir_func, ast_function_label(func, "sce_other")); - if ( !(self->op == INSTR_OR) != !OPTS_FLAG(PERL_LOGIC) ) { - if (!ir_block_create_if(func->curblock, left, other, merge)) + if (self->op == INSTR_AND) { + /* on AND: left==true -> other */ + if (!ir_block_create_if(func->curblock, ast_ctx(self), left, other, merge)) return false; } else { - if (!ir_block_create_if(func->curblock, left, merge, other)) + /* on OR: left==false -> other */ + if (!ir_block_create_if(func->curblock, ast_ctx(self), left, merge, other)) return false; } /* use the likely flag */ vec_last(func->curblock->instr)->likely = true; + /* enter the right-expression's block */ func->curblock = other; + /* generate */ cgen = self->right->expression.codegen; if (!(*cgen)((ast_expression*)(self->right), func, false, &right)) return false; - if (!OPTS_FLAG(PERL_LOGIC)) { - notop = type_not_instr[right->vtype]; - if (notop == AINSTR_END) { - compile_error(ast_ctx(self), "don't know how to cast to bool..."); - return false; - } - right = ir_block_create_unary(func->curblock, - ast_function_label(func, "sce_not"), - notop, - right); - } + /* remember block */ from_right = func->curblock; - if (!ir_block_create_jump(func->curblock, merge)) + /* jump to the merge block */ + if (!ir_block_create_jump(func->curblock, ast_ctx(self), merge)) return false; vec_remove(func->ir_func->blocks, merge_id, 1); vec_push(func->ir_func->blocks, merge); func->curblock = merge; - phi = ir_block_create_phi(func->curblock, ast_function_label(func, "sce_value"), TYPE_FLOAT); + phi = ir_block_create_phi(func->curblock, ast_ctx(self), + ast_function_label(func, "sce_value"), + self->expression.vtype); ir_phi_add(phi, from_left, left); ir_phi_add(phi, from_right, right); *out = ir_phi_value(phi); + if (!*out) + return false; + if (!OPTS_FLAG(PERL_LOGIC)) { - notop = type_not_instr[(*out)->vtype]; - if (notop == AINSTR_END) { - compile_error(ast_ctx(self), "don't know how to cast to bool..."); - return false; + /* cast-to-bool */ + if (OPTS_FLAG(CORRECT_LOGIC) && (*out)->vtype == TYPE_VECTOR) { + *out = ir_block_create_unary(func->curblock, ast_ctx(self), + ast_function_label(func, "sce_bool_v"), + INSTR_NOT_V, *out); + if (!*out) + return false; + *out = ir_block_create_unary(func->curblock, ast_ctx(self), + ast_function_label(func, "sce_bool"), + INSTR_NOT_F, *out); + if (!*out) + return false; + } + else if (OPTS_FLAG(FALSE_EMPTY_STRINGS) && (*out)->vtype == TYPE_STRING) { + *out = ir_block_create_unary(func->curblock, ast_ctx(self), + ast_function_label(func, "sce_bool_s"), + INSTR_NOT_S, *out); + if (!*out) + return false; + *out = ir_block_create_unary(func->curblock, ast_ctx(self), + ast_function_label(func, "sce_bool"), + INSTR_NOT_F, *out); + if (!*out) + return false; + } + else { + *out = ir_block_create_binop(func->curblock, ast_ctx(self), + ast_function_label(func, "sce_bool"), + INSTR_AND, *out, *out); + if (!*out) + return false; } - *out = ir_block_create_unary(func->curblock, - ast_function_label(func, "sce_final_not"), - notop, - *out); } - if (!*out) - return false; + self->expression.outr = *out; return true; } @@ -1740,7 +1825,7 @@ bool ast_binary_codegen(ast_binary *self, ast_function *func, bool lvalue, ir_va if (!(*cgen)((ast_expression*)(self->right), func, false, &right)) return false; - *out = ir_block_create_binop(func->curblock, ast_function_label(func, "bin"), + *out = ir_block_create_binop(func->curblock, ast_ctx(self), ast_function_label(func, "bin"), self->op, left, right); if (!*out) return false; @@ -1775,7 +1860,7 @@ bool ast_binstore_codegen(ast_binstore *self, ast_function *func, bool lvalue, i ai = (ast_array_index*)self->dest; idx = (ast_value*)ai->index; - if (ast_istype(ai->index, ast_value) && idx->hasvalue) + if (ast_istype(ai->index, ast_value) && idx->hasvalue && idx->cvq == CV_CONST) ai = NULL; } @@ -1796,7 +1881,7 @@ bool ast_binstore_codegen(ast_binstore *self, ast_function *func, bool lvalue, i return false; /* now the binary */ - bin = ir_block_create_binop(func->curblock, ast_function_label(func, "binst"), + bin = ir_block_create_binop(func->curblock, ast_ctx(self), ast_function_label(func, "binst"), self->opbin, leftr, right); self->expression.outr = bin; @@ -1821,7 +1906,7 @@ bool ast_binstore_codegen(ast_binstore *self, ast_function *func, bool lvalue, i if (!(*cgen)((ast_expression*)(arr->setter), func, true, &funval)) return false; - call = ir_block_create_call(func->curblock, ast_function_label(func, "store"), funval); + call = ir_block_create_call(func->curblock, ast_ctx(self), ast_function_label(func, "store"), funval, false); if (!call) return false; ir_call_param(call, iridx); @@ -1835,7 +1920,7 @@ bool ast_binstore_codegen(ast_binstore *self, ast_function *func, bool lvalue, i return false; self->expression.outl = leftl; - if (!ir_block_create_store_op(func->curblock, self->opstore, leftl, bin)) + if (!ir_block_create_store_op(func->curblock, ast_ctx(self), self->opstore, leftl, bin)) return false; self->expression.outr = bin; } @@ -1873,7 +1958,7 @@ bool ast_unary_codegen(ast_unary *self, ast_function *func, bool lvalue, ir_valu if (!(*cgen)((ast_expression*)(self->operand), func, false, &operand)) return false; - *out = ir_block_create_unary(func->curblock, ast_function_label(func, "unary"), + *out = ir_block_create_unary(func->curblock, ast_ctx(self), ast_function_label(func, "unary"), self->op, operand); if (!*out) return false; @@ -1909,10 +1994,10 @@ bool ast_return_codegen(ast_return *self, ast_function *func, bool lvalue, ir_va if (!(*cgen)((ast_expression*)(self->operand), func, false, &operand)) return false; - if (!ir_block_create_return(func->curblock, operand)) + if (!ir_block_create_return(func->curblock, ast_ctx(self), operand)) return false; } else { - if (!ir_block_create_return(func->curblock, NULL)) + if (!ir_block_create_return(func->curblock, ast_ctx(self), NULL)) return false; } @@ -1949,11 +2034,14 @@ bool ast_entfield_codegen(ast_entfield *self, ast_function *func, bool lvalue, i if (lvalue) { /* address! */ - *out = ir_block_create_fieldaddress(func->curblock, ast_function_label(func, "efa"), + *out = ir_block_create_fieldaddress(func->curblock, ast_ctx(self), ast_function_label(func, "efa"), ent, field); } else { - *out = ir_block_create_load_from_ent(func->curblock, ast_function_label(func, "efv"), + *out = ir_block_create_load_from_ent(func->curblock, ast_ctx(self), ast_function_label(func, "efv"), ent, field, self->expression.vtype); + /* Done AFTER error checking: + codegen_output_type(self, *out); + */ } if (!*out) { compile_error(ast_ctx(self), "failed to create %s instruction (output type %s)", @@ -1961,6 +2049,8 @@ bool ast_entfield_codegen(ast_entfield *self, ast_function *func, bool lvalue, i type_name[self->expression.vtype]); return false; } + if (!lvalue) + codegen_output_type(self, *out); if (lvalue) self->expression.outl = *out; @@ -2024,7 +2114,7 @@ bool ast_array_index_codegen(ast_array_index *self, ast_function *func, bool lva arr = (ast_value*)self->array; idx = (ast_value*)self->index; - if (!ast_istype(self->index, ast_value) || !idx->hasvalue) { + if (!ast_istype(self->index, ast_value) || !idx->hasvalue || idx->cvq != CV_CONST) { /* Time to use accessor functions */ ast_expression_codegen *cgen; ir_value *iridx, *funval; @@ -2048,7 +2138,7 @@ bool ast_array_index_codegen(ast_array_index *self, ast_function *func, bool lva if (!(*cgen)((ast_expression*)(arr->getter), func, true, &funval)) return false; - call = ir_block_create_call(func->curblock, ast_function_label(func, "fetch"), funval); + call = ir_block_create_call(func->curblock, ast_ctx(self), ast_function_label(func, "fetch"), funval, false); if (!call) return false; ir_call_param(call, iridx); @@ -2058,10 +2148,24 @@ bool ast_array_index_codegen(ast_array_index *self, ast_function *func, bool lva return true; } - if (idx->expression.vtype == TYPE_FLOAT) - *out = arr->ir_values[(int)idx->constval.vfloat]; - else if (idx->expression.vtype == TYPE_INTEGER) - *out = arr->ir_values[idx->constval.vint]; + if (idx->expression.vtype == TYPE_FLOAT) { + unsigned int arridx = idx->constval.vfloat; + if (arridx >= self->array->expression.count) + { + compile_error(ast_ctx(self), "array index out of bounds: %i", arridx); + return false; + } + *out = arr->ir_values[arridx]; + } + else if (idx->expression.vtype == TYPE_INTEGER) { + unsigned int arridx = idx->constval.vint; + if (arridx >= self->array->expression.count) + { + compile_error(ast_ctx(self), "array index out of bounds: %i", arridx); + return false; + } + *out = arr->ir_values[arridx]; + } else { compile_error(ast_ctx(self), "array indexing here needs an integer constant"); return false; @@ -2076,12 +2180,12 @@ bool ast_ifthen_codegen(ast_ifthen *self, ast_function *func, bool lvalue, ir_va ir_value *condval; ir_value *dummy; - ir_block *cond = func->curblock; + ir_block *cond; ir_block *ontrue; ir_block *onfalse; ir_block *ontrue_endblock = NULL; ir_block *onfalse_endblock = NULL; - ir_block *merge; + ir_block *merge = NULL; /* We don't output any value, thus also don't care about r/lvalue */ (void)out; @@ -2142,27 +2246,30 @@ bool ast_ifthen_codegen(ast_ifthen *self, ast_function *func, bool lvalue, ir_va onfalse = NULL; /* Merge block were they all merge in to */ - merge = ir_function_create_block(ast_ctx(self), func->ir_func, ast_function_label(func, "endif")); - if (!merge) - return false; - /* add jumps ot the merge block */ - if (ontrue && !ontrue_endblock->final && !ir_block_create_jump(ontrue_endblock, merge)) - return false; - if (onfalse && !onfalse_endblock->final && !ir_block_create_jump(onfalse_endblock, merge)) - return false; + if (!ontrue || !onfalse || !ontrue_endblock->final || !onfalse_endblock->final) + { + merge = ir_function_create_block(ast_ctx(self), func->ir_func, ast_function_label(func, "endif")); + if (!merge) + return false; + /* add jumps ot the merge block */ + if (ontrue && !ontrue_endblock->final && !ir_block_create_jump(ontrue_endblock, ast_ctx(self), merge)) + return false; + if (onfalse && !onfalse_endblock->final && !ir_block_create_jump(onfalse_endblock, ast_ctx(self), merge)) + return false; + + /* Now enter the merge block */ + func->curblock = merge; + } /* we create the if here, that way all blocks are ordered :) */ - if (!ir_block_create_if(cond, condval, + if (!ir_block_create_if(cond, ast_ctx(self), condval, (ontrue ? ontrue : merge), (onfalse ? onfalse : merge))) { return false; } - /* Now enter the merge block */ - func->curblock = merge; - return true; } @@ -2242,13 +2349,13 @@ bool ast_ternary_codegen(ast_ternary *self, ast_function *func, bool lvalue, ir_ if (!merge) return false; /* jump to merge block */ - if (!ir_block_create_jump(ontrue_out, merge)) + if (!ir_block_create_jump(ontrue_out, ast_ctx(self), merge)) return false; - if (!ir_block_create_jump(onfalse_out, merge)) + if (!ir_block_create_jump(onfalse_out, ast_ctx(self), merge)) return false; /* create if instruction */ - if (!ir_block_create_if(cond_out, condval, ontrue, onfalse)) + if (!ir_block_create_if(cond_out, ast_ctx(self), condval, ontrue, onfalse)) return false; /* Now enter the merge block */ @@ -2263,7 +2370,7 @@ bool ast_ternary_codegen(ast_ternary *self, ast_function *func, bool lvalue, ir_ } /* create PHI */ - phi = ir_block_create_phi(merge, ast_function_label(func, "phi"), trueval->vtype); + phi = ir_block_create_phi(merge, ast_ctx(self), ast_function_label(func, "phi"), trueval->vtype); if (!phi) return false; ir_phi_add(phi, ontrue_out, trueval); @@ -2272,6 +2379,8 @@ bool ast_ternary_codegen(ast_ternary *self, ast_function *func, bool lvalue, ir_ self->expression.outr = ir_phi_value(phi); *out = self->expression.outr; + codegen_output_type(self, *out); + return true; } @@ -2300,9 +2409,6 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value ir_block *bcontinue = NULL; ir_block *bbreak = NULL; - ir_block *old_bcontinue = NULL; - ir_block *old_bbreak = NULL; - ir_block *tmpblock = NULL; (void)lvalue; @@ -2386,7 +2492,7 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value bbreak = bout; /* The loop body... */ - if (self->body) + /* if (self->body) */ { bbody = ir_function_create_block(ast_ctx(self), func->ir_func, ast_function_label(func, "loop_body")); if (!bbody) @@ -2395,21 +2501,22 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value /* enter */ func->curblock = bbody; - old_bbreak = func->breakblock; - old_bcontinue = func->continueblock; - func->breakblock = bbreak; - func->continueblock = bcontinue; - if (!func->continueblock) - func->continueblock = bbody; + vec_push(func->breakblocks, bbreak); + if (bcontinue) + vec_push(func->continueblocks, bcontinue); + else + vec_push(func->continueblocks, bbody); /* generate */ - cgen = self->body->expression.codegen; - if (!(*cgen)((ast_expression*)(self->body), func, false, &dummy)) - return false; + if (self->body) { + cgen = self->body->expression.codegen; + if (!(*cgen)((ast_expression*)(self->body), func, false, &dummy)) + return false; + } end_bbody = func->curblock; - func->breakblock = old_bbreak; - func->continueblock = old_bcontinue; + vec_pop(func->breakblocks); + vec_pop(func->continueblocks); } /* post-loop-condition */ @@ -2449,7 +2556,7 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value else if (bbody) tmpblock = bbody; else if (bpostcond) tmpblock = bpostcond; else tmpblock = bout; - if (!ir_block_create_jump(bin, tmpblock)) + if (!ir_block_create_jump(bin, ast_ctx(self), tmpblock)) return false; /* From precond */ @@ -2461,7 +2568,12 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value else if (bpostcond) ontrue = bpostcond; else ontrue = bprecond; onfalse = bout; - if (!ir_block_create_if(end_bprecond, precond, ontrue, onfalse)) + if (self->pre_not) { + tmpblock = ontrue; + ontrue = onfalse; + onfalse = tmpblock; + } + if (!ir_block_create_if(end_bprecond, ast_ctx(self), precond, ontrue, onfalse)) return false; } @@ -2471,8 +2583,8 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value if (bincrement) tmpblock = bincrement; else if (bpostcond) tmpblock = bpostcond; else if (bprecond) tmpblock = bprecond; - else tmpblock = bout; - if (!end_bbody->final && !ir_block_create_jump(end_bbody, tmpblock)) + else tmpblock = bbody; + if (!end_bbody->final && !ir_block_create_jump(end_bbody, ast_ctx(self), tmpblock)) return false; } @@ -2483,7 +2595,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, tmpblock)) + if (!ir_block_create_jump(end_bincrement, ast_ctx(self), tmpblock)) return false; } @@ -2496,7 +2608,12 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value else if (bincrement) ontrue = bincrement; else ontrue = bpostcond; onfalse = bout; - if (!ir_block_create_if(end_bpostcond, postcond, ontrue, onfalse)) + if (self->post_not) { + tmpblock = ontrue; + ontrue = onfalse; + onfalse = tmpblock; + } + if (!ir_block_create_if(end_bpostcond, ast_ctx(self), postcond, ontrue, onfalse)) return false; } @@ -2525,16 +2642,16 @@ bool ast_breakcont_codegen(ast_breakcont *self, ast_function *func, bool lvalue, self->expression.outr = (ir_value*)1; if (self->is_continue) - target = func->continueblock; + target = func->continueblocks[vec_size(func->continueblocks)-1-self->levels]; else - target = func->breakblock; + target = func->breakblocks[vec_size(func->breakblocks)-1-self->levels]; if (!target) { compile_error(ast_ctx(self), "%s is lacking a target block", (self->is_continue ? "continue" : "break")); return false; } - if (!ir_block_create_jump(func->curblock, target)) + if (!ir_block_create_jump(func->curblock, ast_ctx(self), target)) return false; return true; } @@ -2543,12 +2660,13 @@ bool ast_switch_codegen(ast_switch *self, ast_function *func, bool lvalue, ir_va { ast_expression_codegen *cgen; - ast_switch_case *def_case = NULL; - ir_block *def_bfall = NULL; + ast_switch_case *def_case = NULL; + ir_block *def_bfall = NULL; + ir_block *def_bfall_to = NULL; + bool set_def_bfall_to = false; ir_value *dummy = NULL; ir_value *irop = NULL; - ir_block *old_break = NULL; ir_block *bout = NULL; ir_block *bfall = NULL; size_t bout_id; @@ -2591,8 +2709,7 @@ bool ast_switch_codegen(ast_switch *self, ast_function *func, bool lvalue, ir_va return false; /* setup the break block */ - old_break = func->breakblock; - func->breakblock = bout; + vec_push(func->breakblocks, bout); /* Now create all cases */ for (c = 0; c < vec_size(self->cases); ++c) { @@ -2609,7 +2726,7 @@ bool ast_switch_codegen(ast_switch *self, ast_function *func, bool lvalue, ir_va if (!(*cgen)((ast_expression*)(swcase->value), func, false, &val)) return false; /* generate the condition */ - cond = ir_block_create_binop(func->curblock, ast_function_label(func, "switch_eq"), cmpinstr, irop, val); + cond = ir_block_create_binop(func->curblock, ast_ctx(self), ast_function_label(func, "switch_eq"), cmpinstr, irop, val); if (!cond) return false; @@ -2618,12 +2735,16 @@ bool ast_switch_codegen(ast_switch *self, ast_function *func, bool lvalue, ir_va bnot = ir_function_create_block(ast_ctx(self), func->ir_func, ast_function_label(func, "not_case")); if (!bcase || !bnot) return false; - if (!ir_block_create_if(func->curblock, cond, bcase, bnot)) + if (set_def_bfall_to) { + set_def_bfall_to = false; + def_bfall_to = bcase; + } + if (!ir_block_create_if(func->curblock, ast_ctx(self), cond, bcase, bnot)) return false; /* Make the previous case-end fall through */ if (bfall && !bfall->final) { - if (!ir_block_create_jump(bfall, bcase)) + if (!ir_block_create_jump(bfall, ast_ctx(self), bcase)) return false; } @@ -2647,11 +2768,13 @@ bool ast_switch_codegen(ast_switch *self, ast_function *func, bool lvalue, ir_va bfall = NULL; /* remember which case it was */ def_case = swcase; + /* And the next case will be remembered */ + set_def_bfall_to = true; } } /* Jump from the last bnot to bout */ - if (bfall && !bfall->final && !ir_block_create_jump(bfall, bout)) { + if (bfall && !bfall->final && !ir_block_create_jump(bfall, ast_ctx(self), bout)) { /* astwarning(ast_ctx(bfall), WARN_???, "missing break after last case"); */ @@ -2667,7 +2790,7 @@ bool ast_switch_codegen(ast_switch *self, ast_function *func, bool lvalue, ir_va /* Insert the fallthrough jump */ if (def_bfall && !def_bfall->final) { - if (!ir_block_create_jump(def_bfall, bcase)) + if (!ir_block_create_jump(def_bfall, ast_ctx(self), bcase)) return false; } @@ -2675,16 +2798,23 @@ bool ast_switch_codegen(ast_switch *self, ast_function *func, bool lvalue, ir_va cgen = def_case->code->expression.codegen; if (!(*cgen)((ast_expression*)def_case->code, func, false, &dummy)) return false; + + /* see if we need to fall through */ + if (def_bfall_to && !func->curblock->final) + { + if (!ir_block_create_jump(func->curblock, ast_ctx(self), def_bfall_to)) + return false; + } } /* Jump from the last bnot to bout */ - if (!func->curblock->final && !ir_block_create_jump(func->curblock, bout)) + if (!func->curblock->final && !ir_block_create_jump(func->curblock, ast_ctx(self), bout)) return false; /* enter the outgoing block */ func->curblock = bout; /* restore the break block */ - func->breakblock = old_break; + vec_pop(func->breakblocks); /* Move 'bout' to the end, it's nicer */ vec_remove(func->ir_func->blocks, bout_id, 1); @@ -2711,7 +2841,7 @@ bool ast_label_codegen(ast_label *self, ast_function *func, bool lvalue, ir_valu return false; } if (!func->curblock->final) { - if (!ir_block_create_jump(func->curblock, self->irblock)) + if (!ir_block_create_jump(func->curblock, ast_ctx(self), self->irblock)) return false; } @@ -2739,14 +2869,14 @@ bool ast_goto_codegen(ast_goto *self, ast_function *func, bool lvalue, ir_value if (self->irblock_from) { /* we already tried once, this is the callback */ self->irblock_from->final = false; - if (!ir_block_create_jump(self->irblock_from, self->target->irblock)) { + if (!ir_block_create_goto(self->irblock_from, ast_ctx(self), self->target->irblock)) { compile_error(ast_ctx(self), "failed to generate goto to `%s`", self->name); return false; } } else { - if (!ir_block_create_jump(func->curblock, self->target->irblock)) { + if (!ir_block_create_goto(func->curblock, ast_ctx(self), self->target->irblock)) { compile_error(ast_ctx(self), "failed to generate goto to `%s`", self->name); return false; } @@ -2807,7 +2937,9 @@ bool ast_call_codegen(ast_call *self, ast_function *func, bool lvalue, ir_value vec_push(params, param); } - callinstr = ir_block_create_call(func->curblock, ast_function_label(func, "call"), funval); + callinstr = ir_block_create_call(func->curblock, ast_ctx(self), + ast_function_label(func, "call"), + funval, !!(self->func->expression.flags & AST_FLAG_NORETURN)); if (!callinstr) goto error; @@ -2818,6 +2950,8 @@ bool ast_call_codegen(ast_call *self, ast_function *func, bool lvalue, ir_value *out = ir_call_value(callinstr); self->expression.outr = *out; + codegen_output_type(self, *out); + vec_free(params); return true; error: