typed block ins done right

alex-s168 · May 28, 2024 · cf60a80 · cf60a80
1 parent ed6ff3a
commit cf60a80
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/ir/builder.c b/ir/builder.c
@@ -59,10 +59,13 @@ void vx_IrBlock_make_root(vx_IrBlock *block,
 }
 
 void vx_IrBlock_add_in(vx_IrBlock *block,
-                       const vx_IrVar var)
+                       const vx_IrVar var,
+                       vx_IrType *ty)
 {
     block->ins = realloc(block->ins, sizeof(vx_IrTypedVar) * (block->ins_len + 1));
-    block->ins[block->ins_len ++].var = var;
+    vx_IrTypedVar* v = &block->ins[block->ins_len ++];
+    v->var = var;
+    v->type = ty;
 }
 
 static void root_block_put_var(vx_IrBlock *root, vx_IrVar var, vx_IrOp *decl) {

diff --git a/ir/dump.c b/ir/dump.c
@@ -211,8 +211,10 @@ void vx_IrBlock_dump(const vx_IrBlock *block, FILE *out, const size_t indent) {
 
     fputs("BLOCK", out);
     for (size_t i = 0; i < block->ins_len; i ++) {
-        const vx_IrVar in = block->ins[i].var;
-        fprintf(out, " %%%zu", in);
+        if (i > 0)
+            fputc(',', out);
+        vx_IrTypedVar in = block->ins[i];
+        fprintf(out, " %s %%%zu", in.type->debugName, in.var);
     }
     fputc('\n', out);
 

diff --git a/ir/ir.h b/ir/ir.h
@@ -183,7 +183,7 @@ vx_IrBlock *vx_IrBlock_init_heap(vx_IrBlock *parent, size_t parent_index);
 void vx_IrBlock_init(vx_IrBlock *block, vx_IrBlock *parent, size_t parent_index);
 /** run AFTER you finished building it! */
 void vx_IrBlock_make_root(vx_IrBlock *block, size_t total_vars);
-void vx_IrBlock_add_in(vx_IrBlock *block, vx_IrVar var);
+void vx_IrBlock_add_in(vx_IrBlock *block, vx_IrVar var, vx_IrType *type);
 void vx_IrBlock_add_op(vx_IrBlock *block, const vx_IrOp *op);
 /** WARNING: DON'T REF VARS IN OP THAT ARE NOT ALREADY INDEXED ROOT */
 vx_IrOp *vx_IrBlock_add_op_building(vx_IrBlock *block);

diff --git a/main.c b/main.c
@@ -125,10 +125,10 @@ void eq(int a, int b, int c, int d) {
     vx_IrBlock *block = vx_IrBlock_init_heap(NULL, 0);
     vx_IrVar a = 0, b = 1, c = 2, d = 3, temp0 = 4, temp1 = 5, temp2 = 6;
 
-    vx_IrBlock_add_in(block, a);
-    vx_IrBlock_add_in(block, b);
-    vx_IrBlock_add_in(block, c);
-    vx_IrBlock_add_in(block, d);
+    vx_IrBlock_add_in(block, a, ty_int);
+    vx_IrBlock_add_in(block, b, ty_int);
+    vx_IrBlock_add_in(block, c, ty_int);
+    vx_IrBlock_add_in(block, d, ty_int);
 
     vx_IrOp iff;
     vx_IrOp_init(&iff, VX_IR_OP_IF, block);