removing all direct 'printfs' from ast and ir, replaced by the error interface

diff --git a/ast.c b/ast.c
index 71c4ae62b01423a45306dfa2c95f87beff6e114b..cbeb274de3d138c9484edc1d7ac9bfb87594a8d6 100644 (file)
--- a/ast.c
+++ b/ast.c
@@ -35,6 +35,15 @@
     ast_node_init((ast_node*)self, ctx, TYPE_##T);                  \
     ( (ast_node*)self )->node.destroy = (ast_node_delete*)destroyfn
 
+/* error handling */
+static void asterror(lex_ctx ctx, const char *msg, ...)
+{
+    va_list ap;
+    va_start(ap, msg);
+    cvprintmsg(ctx, LVL_ERROR, "error", msg, ap);
+    va_end(ap);
+}
+
 /* It must not be possible to get here. */
 static GMQCC_NORETURN void _ast_node_destroy(ast_node *self)
 {
@@ -352,7 +361,7 @@ ast_member* ast_member_new(lex_ctx ctx, ast_expression *owner, unsigned int fiel
 
     if (owner->expression.vtype != TYPE_VECTOR &&
         owner->expression.vtype != TYPE_FIELD) {
-        printf("ast_member on an invalid owner of type %i\n", (int)owner->expression.vtype);
+        asterror(ctx, "member-access on an invalid owner of type %s\n", type_name[owner->expression.vtype]);
         mem_d(self);
         return NULL;
     }
@@ -662,7 +671,7 @@ bool ast_value_codegen(ast_value *self, ast_function *func, bool lvalue, ir_valu
      * on all the globals.
      */
     if (!self->ir_v) {
-        printf("ast_value used before generated (%s)\n", self->name);
+        asterror(ast_ctx(self), "ast_value used before generated (%s)\n", self->name);
         return false;
     }
     *out = self->ir_v;
@@ -689,7 +698,7 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir)
         if (!v)
             return false;
         if (self->isconst) {
-            printf("TODO: constant field pointers with value\n");
+            asterror(ast_ctx(self), "TODO: constant field pointers with value\n");
             goto error;
         }
         self->ir_v = v;
@@ -698,7 +707,7 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir)
 
     v = ir_builder_create_global(ir, self->name, self->expression.vtype);
     if (!v) {
-        printf("ir_builder_create_global failed\n");
+        asterror(ast_ctx(self), "ir_builder_create_global failed\n");
         return false;
     }
 
@@ -718,13 +727,13 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir)
                     goto error;
                 break;
             case TYPE_FUNCTION:
-                printf("global of type function not properly generated\n");
+                asterror(ast_ctx(self), "global of type function not properly generated\n");
                 goto error;
                 /* Cannot generate an IR value for a function,
                  * need a pointer pointing to a function rather.
                  */
             default:
-                printf("TODO: global constant type %i\n", self->expression.vtype);
+                asterror(ast_ctx(self), "TODO: global constant type %i\n", self->expression.vtype);
                 break;
         }
     }
@@ -772,7 +781,7 @@ bool ast_local_codegen(ast_value *self, ir_function *func, bool param)
                     goto error;
                 break;
             default:
-                printf("TODO: global constant type %i\n", self->expression.vtype);
+                asterror(ast_ctx(self), "TODO: global constant type %i\n", self->expression.vtype);
                 break;
         }
     }
@@ -795,7 +804,7 @@ bool ast_function_codegen(ast_function *self, ir_builder *ir)
 
     irf = self->ir_func;
     if (!irf) {
-        printf("ast_function's related ast_value was not generated yet\n");
+        asterror(ast_ctx(self), "ast_function's related ast_value was not generated yet\n");
         return false;
     }
 
@@ -1057,7 +1066,7 @@ bool ast_return_codegen(ast_return *self, ast_function *func, bool lvalue, ir_va
      */
     (void)lvalue;
     if (self->expression.outr) {
-        printf("internal error: ast_return cannot be reused, it bears no result!\n");
+        asterror(ast_ctx(self), "internal error: ast_return cannot be reused, it bears no result!\n");
         return false;
     }
     self->expression.outr = (ir_value*)1;
@@ -1166,7 +1175,7 @@ bool ast_ifthen_codegen(ast_ifthen *self, ast_function *func, bool lvalue, ir_va
     (void)lvalue;
 
     if (self->expression.outr) {
-        printf("internal error: ast_ifthen cannot be reused, it bears no result!\n");
+        asterror(ast_ctx(self), "internal error: ast_ifthen cannot be reused, it bears no result!\n");
         return false;
     }
     self->expression.outr = (ir_value*)1;
@@ -1377,7 +1386,7 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value
     (void)out;
 
     if (self->expression.outr) {
-        printf("internal error: ast_loop cannot be reused, it bears no result!\n");
+        asterror(ast_ctx(self), "internal error: ast_loop cannot be reused, it bears no result!\n");
         return false;
     }
     self->expression.outr = (ir_value*)1;

diff --git a/ast.h b/ast.h
index 55f4427950a18caac8cfb804c6ecb4e86981ca1b..42a4b9ace87c4f4ba99c846e5f96614899e2497a 100644 (file)
--- a/ast.h
+++ b/ast.h
@@ -66,6 +66,7 @@ enum {
 };
 
 #define ast_istype(x, t) ( ((ast_node_common*)x)->nodetype == (TYPE_##t) )
+#define ast_ctx(node) (((ast_node_common*)(node))->context)
 
 /* Node interface with common components
  */

diff --git a/ir.c b/ir.c
index 3a5cac7de0ade3a5cb7bd8281b69bf5a6357a847..266651d03557e4a6a54ed3c054583d5e2787116a 100644 (file)
--- a/ir.c
+++ b/ir.c
@@ -125,6 +125,14 @@ uint16_t type_ne_instr[TYPE_COUNT] = {
 
 MEM_VEC_FUNCTIONS(ir_value_vector, ir_value*, v)
 
+static void irerror(lex_ctx ctx, const char *msg, ...)
+{
+    va_list ap;
+    va_start(ap, msg);
+    cvprintmsg(ctx, LVL_ERROR, "internal error", msg, ap);
+    va_end(ap);
+}
+
 /***********************************************************************
  *IR Builder
  */
@@ -408,7 +416,7 @@ ir_value* ir_function_create_local(ir_function *self, const char *name, int vtyp
     if (param &&
         self->locals_count &&
         self->locals[self->locals_count-1]->store != store_param) {
-        printf("cannot add parameters after adding locals\n");
+        irerror(self->context, "cannot add parameters after adding locals\n");
         return NULL;
     }
 
@@ -649,7 +657,7 @@ ir_value* ir_value_vector_member(ir_value *self, unsigned int member)
     }
     else
     {
-        printf("invalid member access on %s\n", self->name);
+        irerror(self->context, "invalid member access on %s\n", self->name);
         return NULL;
     }
 
@@ -994,9 +1002,9 @@ bool ir_block_create_store_op(ir_block *self, int op, ir_value *target, ir_value
     if (target->store == store_value &&
         (op < INSTR_STOREP_F || op > INSTR_STOREP_FNC))
     {
-        fprintf(stderr, "cannot store to an SSA value\n");
-        fprintf(stderr, "trying to store: %s <- %s\n", target->name, what->name);
-        fprintf(stderr, "instruction: %s\n", asm_instr[op].m);
+        irerror(self->context, "cannot store to an SSA value\n");
+        irerror(self->context, "trying to store: %s <- %s\n", target->name, what->name);
+        irerror(self->context, "instruction: %s\n", asm_instr[op].m);
         return false;
     }
 
@@ -1060,7 +1068,7 @@ bool ir_block_create_return(ir_block *self, ir_value *v)
 {
     ir_instr *in;
     if (self->final) {
-        fprintf(stderr, "block already ended (%s)\n", self->label);
+        irerror(self->context, "block already ended (%s)\n", self->label);
         return false;
     }
     self->final = true;
@@ -1082,7 +1090,7 @@ bool ir_block_create_if(ir_block *self, ir_value *v,
 {
     ir_instr *in;
     if (self->final) {
-        fprintf(stderr, "block already ended (%s)\n", self->label);
+        irerror(self->context, "block already ended (%s)\n", self->label);
         return false;
     }
     self->final = true;
@@ -1116,7 +1124,7 @@ bool ir_block_create_jump(ir_block *self, ir_block *to)
 {
     ir_instr *in;
     if (self->final) {
-        fprintf(stderr, "block already ended (%s)\n", self->label);
+        irerror(self->context, "block already ended (%s)\n", self->label);
         return false;
     }
     self->final = true;
@@ -1140,7 +1148,7 @@ bool ir_block_create_goto(ir_block *self, ir_block *to)
 {
     ir_instr *in;
     if (self->final) {
-        fprintf(stderr, "block already ended (%s)\n", self->label);
+        irerror(self->context, "block already ended (%s)\n", self->label);
         return false;
     }
     self->final = true;
@@ -1198,7 +1206,7 @@ bool ir_phi_add(ir_instr* self, ir_block *b, ir_value *v)
         /* Must not be possible to cause this, otherwise the AST
          * is doing something wrong.
          */
-        fprintf(stderr, "Invalid entry block for PHI\n");
+        irerror(self->context, "Invalid entry block for PHI\n");
         abort();
     }
 
@@ -1954,7 +1962,7 @@ static bool ir_block_living_add_instr(ir_block *self, size_t eid)
         tempbool = ir_value_life_merge(self->living[i], eid);
         /* debug
         if (tempbool)
-            fprintf(stderr, "block_living_add_instr() value instruction added %s: %i\n", self->living[i]->_name, (int)eid);
+            irerror(self->context, "block_living_add_instr() value instruction added %s: %i\n", self->living[i]->_name, (int)eid);
         */
         changed = changed || tempbool;
     }
@@ -1989,7 +1997,7 @@ static bool ir_block_life_prop_previous(ir_block* self, ir_block *prev, bool *ch
         if (!ir_block_living_add(self, prev->living[i]))
             return false;
         /*
-        printf("%s got from prev: %s\n", self->label, prev->living[i]->_name);
+        irerror(self->contextt from prev: %s\n", self->label, prev->living[i]->_name);
         */
     }
     return true;
@@ -2107,7 +2115,7 @@ static bool ir_block_life_propagate(ir_block *self, ir_block *prev, bool *change
                      * since this function is run multiple times.
                      */
                     /* For now: debug info: */
-                    fprintf(stderr, "Value only written %s\n", value->name);
+                    /* fprintf(stderr, "Value only written %s\n", value->name); */
                     tempbool = ir_value_life_merge(value, instr->eid);
                     *changed = *changed || tempbool;
                     /*
@@ -2203,7 +2211,7 @@ static bool gen_global_field(ir_value *global)
     {
         ir_value *fld = global->constval.vpointer;
         if (!fld) {
-            printf("Invalid field constant with no field: %s\n", global->name);
+            irerror(global->context, "Invalid field constant with no field: %s\n", global->name);
             return false;
         }
 
@@ -2216,7 +2224,7 @@ static bool gen_global_field(ir_value *global)
          * for functions... might as well support that here.
          */
         if (!fld->code.globaladdr) {
-            printf("FIXME: Relocation support\n");
+            irerror(global->context, "FIXME: Relocation support\n");
             return false;
         }
 
@@ -2246,7 +2254,7 @@ static bool gen_global_pointer(ir_value *global)
     {
         ir_value *target = global->constval.vpointer;
         if (!target) {
-            printf("Invalid pointer constant: %s\n", global->name);
+            irerror(global->context, "Invalid pointer constant: %s\n", global->name);
             /* NULL pointers are pointing to the NULL constant, which also
              * sits at address 0, but still has an ir_value for itself.
              */
@@ -2262,7 +2270,7 @@ static bool gen_global_pointer(ir_value *global)
             /* FIXME: Check for the constant nullptr ir_value!
              * because then code.globaladdr being 0 is valid.
              */
-            printf("FIXME: Relocation support\n");
+            irerror(global->context, "FIXME: Relocation support\n");
             return false;
         }
 
@@ -2295,7 +2303,7 @@ tailcall:
         instr = block->instr[i];
 
         if (instr->opcode == VINSTR_PHI) {
-            printf("cannot generate virtual instruction (phi)\n");
+            irerror(block->context, "cannot generate virtual instruction (phi)\n");
             return false;
         }
 
@@ -2436,7 +2444,7 @@ tailcall:
         }
 
         if (instr->opcode == INSTR_STATE) {
-            printf("TODO: state instruction\n");
+            irerror(block->context, "TODO: state instruction\n");
             return false;
         }
 
@@ -2485,7 +2493,7 @@ static bool gen_function_code(ir_function *self)
      * for now. Dead blocks will not be translated obviously.
      */
     if (!self->blocks_count) {
-        printf("Function '%s' declared without body.\n", self->name);
+        irerror(self->context, "Function '%s' declared without body.\n", self->name);
         return false;
     }
 
@@ -2494,7 +2502,7 @@ static bool gen_function_code(ir_function *self)
         return true;
 
     if (!gen_blocks_recursive(self, block)) {
-        printf("failed to generate blocks for '%s'\n", self->name);
+        irerror(self->context, "failed to generate blocks for '%s'\n", self->name);
         return false;
     }
 
@@ -2518,7 +2526,7 @@ static bool gen_global_function(ir_builder *ir, ir_value *global)
 
     if (!global->isconst || (!global->constval.vfunc))
     {
-        printf("Invalid state of function-global: not constant: %s\n", global->name);
+        irerror(global->context, "Invalid state of function-global: not constant: %s\n", global->name);
         return false;
     }
 
@@ -2542,7 +2550,7 @@ static bool gen_global_function(ir_builder *ir, ir_value *global)
     local_var_end = 0;
     for (i = 0; i < irfun->locals_count; ++i) {
         if (!ir_builder_gen_global(ir, irfun->locals[i])) {
-            printf("Failed to generate global %s\n", irfun->locals[i]->name);
+            irerror(irfun->locals[i]->context, "Failed to generate global %s\n", irfun->locals[i]->name);
             return false;
         }
     }
@@ -2567,7 +2575,7 @@ static bool gen_global_function(ir_builder *ir, ir_value *global)
     else {
         fun.entry = code_statements_elements;
         if (!gen_function_code(irfun)) {
-            printf("Failed to generate code for function %s\n", irfun->name);
+            irerror(irfun->context, "Failed to generate code for function %s\n", irfun->name);
             return false;
         }
     }
@@ -2662,7 +2670,7 @@ static bool ir_builder_gen_global(ir_builder *self, ir_value *global)
             return true;
     default:
         /* refuse to create 'void' type or any other fancy business. */
-        printf("Invalid type for global variable %s\n", global->name);
+        irerror(global->context, "Invalid type for global variable %s\n", global->name);
         return false;
     }
 }
@@ -2685,7 +2693,7 @@ static bool ir_builder_gen_field(ir_builder *self, ir_value *field)
          * bytes is more than enough for a variable/field name
          */
         if (len+2 >= sizeof(name)) {
-            printf("invalid field name size: %u\n", (unsigned int)len);
+            irerror(field->context, "invalid field name size: %u\n", (unsigned int)len);
             return false;
         }
 
@@ -2713,7 +2721,7 @@ static bool ir_builder_gen_field(ir_builder *self, ir_value *field)
     fld.type = field->fieldtype;
 
     if (fld.type == TYPE_VOID) {
-        printf("field is missing a type: %s - don't know its size\n", field->name);
+        irerror(field->context, "field is missing a type: %s - don't know its size\n", field->name);
         return false;
     }