X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=ast.c;h=ebded6a143c40df45716ee29ed10fd10fd3f40a6;hb=e8b5ad66251e2bd0e141a1a233a98570224c6ffb;hp=2f8a2bcfe23d49b790687535b4db00b16164409f;hpb=c69ba2c734edf1861ff457573a4dafd730da094c;p=xonotic%2Fgmqcc.git diff --git a/ast.c b/ast.c index 2f8a2bc..ebded6a 100644 --- a/ast.c +++ b/ast.c @@ -894,8 +894,9 @@ ast_call* ast_call_new(lex_ctx ctx, ast_side_effects(self) = true; - self->params = NULL; - self->func = funcexpr; + self->params = NULL; + self->func = funcexpr; + self->va_count = NULL; ast_type_adopt(self, funcexpr->expression.next); @@ -912,6 +913,9 @@ void ast_call_delete(ast_call *self) if (self->func) ast_unref(self->func); + if (self->va_count) + ast_unref(self->va_count); + ast_expression_delete((ast_expression*)self); mem_d(self); } @@ -1074,6 +1078,8 @@ ast_function* ast_function_new(lex_ctx ctx, const char *name, ast_value *vtype) vtype->hasvalue = true; vtype->constval.vfunc = self; + self->varargs = NULL; + return self; } @@ -1096,6 +1102,8 @@ void ast_function_delete(ast_function *self) vec_free(self->blocks); vec_free(self->breakblocks); vec_free(self->continueblocks); + if (self->varargs) + ast_delete(self->varargs); mem_d(self); } @@ -1405,7 +1413,7 @@ bool ast_local_codegen(ast_value *self, ir_function *func, bool param) func->flags |= IR_FLAG_HAS_ARRAYS; - if (param) { + if (param && !(self->expression.flags & AST_FLAG_IS_VARARG)) { compile_error(ast_ctx(self), "array-parameters are not supported"); return false; } @@ -1571,6 +1579,12 @@ bool ast_function_codegen(ast_function *self, ir_builder *ir) } } + if (self->varargs) { + if (!ast_local_codegen(self->varargs, self->ir_func, true)) + return false; + irf->max_varargs = self->varargs->expression.count; + } + if (self->builtin) { irf->builtin = self->builtin; return true; @@ -3021,6 +3035,20 @@ bool ast_call_codegen(ast_call *self, ast_function *func, bool lvalue, ir_value vec_push(params, param); } + /* varargs counter */ + if (self->va_count) { + ir_value *va_count; + ir_builder *builder = func->curblock->owner->owner; + cgen = self->va_count->expression.codegen; + if (!(*cgen)((ast_expression*)(self->va_count), func, false, &va_count)) + return false; + if (!ir_block_create_store_op(func->curblock, ast_ctx(self), INSTR_STORE_F, + ir_builder_get_va_count(builder), va_count)) + { + return false; + } + } + callinstr = ir_block_create_call(func->curblock, ast_ctx(self), ast_function_label(func, "call"), funval, !!(self->func->expression.flags & AST_FLAG_NORETURN));