X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=ast.c;h=9d10cc6e7f5c46077fe3c2869d3b0a1e8381f011;hb=46374e94ca2f116dc4e094870da943fa734ec04d;hp=2eb9faa72d868cdc52a65cd0e6139150d2c41a06;hpb=0fe71af4ce486cbb2c309850463cb76316c6cd1f;p=xonotic%2Fgmqcc.git diff --git a/ast.c b/ast.c index 2eb9faa..9d10cc6 100644 --- a/ast.c +++ b/ast.c @@ -1,6 +1,7 @@ /* * Copyright (C) 2012 * Wolfgang Bumiller + * Dale Weiler * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -209,8 +210,11 @@ 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.flags != b->expression.flags) + if ((a->expression.flags & AST_FLAG_TYPE_MASK) != + (b->expression.flags & AST_FLAG_TYPE_MASK) ) + { return false; + } if (vec_size(a->expression.params)) { size_t i; for (i = 0; i < vec_size(a->expression.params); ++i) { @@ -338,6 +342,7 @@ ast_value* ast_value_new(lex_ctx ctx, const char *name, int t) self->setter = NULL; self->getter = NULL; + self->desc = NULL; return self; } @@ -365,6 +370,10 @@ void ast_value_delete(ast_value* self) } if (self->ir_values) mem_d(self->ir_values); + + if (self->desc) + mem_d(self->desc); + ast_expression_delete((ast_expression*)self); mem_d(self); } @@ -570,7 +579,8 @@ ast_member* ast_member_new(lex_ctx ctx, ast_expression *owner, unsigned int fiel self->expression.next = ast_shallow_type(ctx, TYPE_FLOAT); } - self->owner = owner; + self->rvalue = false; + self->owner = owner; ast_propagate_effects(self, owner); self->field = field; @@ -596,6 +606,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; @@ -756,12 +774,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; } @@ -1017,8 +1036,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; @@ -1043,6 +1062,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); } @@ -1090,6 +1111,10 @@ bool ast_value_codegen(ast_value *self, ast_function *func, bool lvalue, ir_valu { (void)func; (void)lvalue; + if (self->expression.vtype == TYPE_NIL) { + *out = func->ir_func->owner->nil; + return true; + } /* NOTE: This is the codegen for a variable used in an expression. * 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 @@ -1098,9 +1123,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; @@ -1111,6 +1136,11 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield) { ir_value *v = NULL; + if (self->expression.vtype == TYPE_NIL) { + compile_error(ast_ctx(self), "internal error: trying to generate a variable of TYPE_NIL"); + return false; + } + if (self->hasvalue && self->expression.vtype == TYPE_FUNCTION) { ir_function *func = ir_builder_create_function(ir, self->name, self->expression.next->expression.vtype); @@ -1161,6 +1191,7 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield) } v->context = ast_ctx(self); v->unique_life = true; + v->locked = true; array->ir_v = self->ir_v = v; namelen = strlen(self->name); @@ -1179,6 +1210,7 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield) } array->ir_values[ai]->context = ast_ctx(self); array->ir_values[ai]->unique_life = true; + array->ir_values[ai]->locked = true; } mem_d(name); } @@ -1212,6 +1244,7 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield) } v->context = ast_ctx(self); v->unique_life = true; + v->locked = true; namelen = strlen(self->name); name = (char*)mem_a(namelen + 16); @@ -1229,6 +1262,7 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield) } self->ir_values[ai]->context = ast_ctx(self); self->ir_values[ai]->unique_life = true; + self->ir_values[ai]->locked = true; } mem_d(name); } @@ -1301,6 +1335,12 @@ error: /* clean up */ bool ast_local_codegen(ast_value *self, ir_function *func, bool param) { ir_value *v = NULL; + + if (self->expression.vtype == TYPE_NIL) { + compile_error(ast_ctx(self), "internal error: trying to generate a variable of TYPE_NIL"); + return false; + } + if (self->hasvalue && self->expression.vtype == TYPE_FUNCTION) { /* Do we allow local functions? I think not... @@ -1317,6 +1357,8 @@ 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; @@ -1340,6 +1382,7 @@ bool ast_local_codegen(ast_value *self, ir_function *func, bool param) } v->context = ast_ctx(self); v->unique_life = true; + v->locked = true; namelen = strlen(self->name); name = (char*)mem_a(namelen + 16); @@ -1355,6 +1398,7 @@ bool ast_local_codegen(ast_value *self, ir_function *func, bool param) } self->ir_values[ai]->context = ast_ctx(self); self->ir_values[ai]->unique_life = true; + self->ir_values[ai]->locked = true; } } else @@ -1699,7 +1743,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 */ @@ -1750,12 +1794,50 @@ bool ast_binary_codegen(ast_binary *self, ast_function *func, bool lvalue, ir_va vec_push(func->ir_func->blocks, merge); func->curblock = merge; - phi = ir_block_create_phi(func->curblock, ast_ctx(self), 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)) { + /* 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; + } + } + self->expression.outr = *out; return true; } @@ -2010,14 +2092,17 @@ bool ast_member_codegen(ast_member *self, ast_function *func, bool lvalue, ir_va ir_value *vec; /* in QC this is always an lvalue */ - (void)lvalue; + if (lvalue && self->rvalue) { + compile_error(ast_ctx(self), "not an l-value (member access)"); + return false; + } if (self->expression.outl) { *out = self->expression.outl; return true; } cgen = self->owner->expression.codegen; - if (!(*cgen)((ast_expression*)(self->owner), func, true, &vec)) + if (!(*cgen)((ast_expression*)(self->owner), func, false, &vec)) return false; if (vec->vtype != TYPE_VECTOR && @@ -2352,9 +2437,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; @@ -2447,12 +2529,11 @@ 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 */ if (self->body) { @@ -2462,8 +2543,8 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value } end_bbody = func->curblock; - func->breakblock = old_bbreak; - func->continueblock = old_bcontinue; + vec_pop(func->breakblocks); + vec_pop(func->continueblocks); } /* post-loop-condition */ @@ -2589,9 +2670,9 @@ 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")); @@ -2614,7 +2695,6 @@ bool ast_switch_codegen(ast_switch *self, ast_function *func, bool lvalue, ir_va 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; @@ -2657,8 +2737,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) { @@ -2763,7 +2842,7 @@ bool ast_switch_codegen(ast_switch *self, ast_function *func, bool lvalue, ir_va 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); @@ -2818,14 +2897,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, ast_ctx(self), 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, ast_ctx(self), 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; }