X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=ast.c;h=51104b31685c294b333fd4cc3b7e5b2472b1f6e4;hb=bb356bffa5dcf95d4439ce0ba55bc068c5a72ff1;hp=28179a39cf69334316fa67ae07c2c04c90a9694d;hpb=94560d1873a5d36da8864238443d541f6fc1fd2b;p=xonotic%2Fgmqcc.git diff --git a/ast.c b/ast.c index 28179a3..51104b3 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; @@ -393,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; @@ -1040,7 +1049,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) return NULL; id = (self->labelcount++); @@ -1137,7 +1146,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; @@ -1191,7 +1200,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); @@ -1312,7 +1321,7 @@ bool ast_local_codegen(ast_value *self, ir_function *func, bool param) } /* 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); } @@ -1413,14 +1422,14 @@ bool ast_generate_accessors(ast_value *self, ir_builder *ir) } } - options_set(opts_warn, WARN_USED_UNINITIALIZED, false); + opts_set(opts.warn, WARN_USED_UNINITIALIZED, false); if (self->setter) { 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); - options_set(opts_warn, WARN_USED_UNINITIALIZED, warn); + opts_set(opts.warn, WARN_USED_UNINITIALIZED, warn); return false; } } @@ -1430,14 +1439,14 @@ bool ast_generate_accessors(ast_value *self, ir_builder *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); - options_set(opts_warn, WARN_USED_UNINITIALIZED, warn); + 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); } - options_set(opts_warn, WARN_USED_UNINITIALIZED, warn); + opts_set(opts.warn, WARN_USED_UNINITIALIZED, warn); return true; } @@ -1551,7 +1560,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; } @@ -1559,11 +1568,14 @@ 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)) { + if (OPTS_FLAG(ALLOW_UNREACHABLE_CODE)) + continue; compile_error(ast_ctx(self->exprs[i]), "unreachable statement"); return false; } + gen = self->exprs[i]->expression.codegen; if (!(*gen)(self->exprs[i], func, false, out)) return false; } @@ -1631,7 +1643,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_ctx(self), 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); @@ -1869,7 +1881,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_ctx(self), 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); @@ -2002,7 +2014,9 @@ bool ast_entfield_codegen(ast_entfield *self, ast_function *func, bool lvalue, i } else { *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)", @@ -2010,6 +2024,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; @@ -2097,7 +2113,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_ctx(self), 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); @@ -2139,7 +2155,7 @@ 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; @@ -2613,8 +2629,10 @@ 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; @@ -2688,6 +2706,10 @@ 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 (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; @@ -2717,6 +2739,8 @@ 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; } } @@ -2745,6 +2769,13 @@ 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 */ @@ -2877,7 +2908,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_ctx(self), 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;