Merge branch 'master' into ast-and-ir

[xonotic/gmqcc.git] / ir.h

diff --git a/ir.h b/ir.h
index 6172fd3709cfd4b3acb39a969dbb54f6f52fa36f..592f69c48e83a9b213b8bf646977ed48229c2ce6 100644 (file)
--- a/ir.h
+++ b/ir.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 
+ * Copyright (C) 2012
  *     Wolfgang Bumiller
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -37,7 +37,7 @@ typedef struct ir_value_s {
     char      *name;
     int       vtype;
     int       store;
-    lex_ctx_t context;
+    lex_ctx   context;
 
     MEM_VECTOR_MAKE(struct ir_instr_s*, reads);
     MEM_VECTOR_MAKE(struct ir_instr_s*, writes);
@@ -47,7 +47,7 @@ typedef struct ir_value_s {
     union {
         float    vfloat;
         int      vint;
-        vector_t vvec;
+        vector   vvec;
         char    *vstring;
         struct ir_value_s *vpointer;
     } constval;
@@ -65,19 +65,19 @@ ir_value* ir_value_out(struct ir_function_s *owner, const char *name, int st, in
 void      ir_value_delete(ir_value*);
 void      ir_value_set_name(ir_value*, const char *name);
 
-MEM_VECTOR_PROTO_ALL(ir_value, struct ir_instr_s*, reads)
-MEM_VECTOR_PROTO_ALL(ir_value, struct ir_instr_s*, writes)
+MEM_VECTOR_PROTO_ALL(ir_value, struct ir_instr_s*, reads);
+MEM_VECTOR_PROTO_ALL(ir_value, struct ir_instr_s*, writes);
 
 bool GMQCC_WARN ir_value_set_float(ir_value*, float f);
 #if 0
 bool GMQCC_WARN ir_value_set_int(ir_value*, int i);
 #endif
 bool GMQCC_WARN ir_value_set_string(ir_value*, const char *s);
-bool GMQCC_WARN ir_value_set_vector(ir_value*, vector_t v);
+bool GMQCC_WARN ir_value_set_vector(ir_value*, vector v);
 /*bool   ir_value_set_pointer_v(ir_value*, ir_value* p); */
 /*bool   ir_value_set_pointer_i(ir_value*, int i);       */
 
-MEM_VECTOR_PROTO(ir_value, ir_life_entry_t, life)
+MEM_VECTOR_PROTO(ir_value, ir_life_entry_t, life);
 /* merge an instruction into the life-range */
 /* returns false if the lifepoint was already known */
 bool ir_value_life_merge(ir_value*, size_t);
@@ -97,7 +97,7 @@ typedef struct ir_phi_entry_s
 typedef struct ir_instr_s
 {
     int       opcode;
-    lex_ctx_t context;
+    lex_ctx   context;
     ir_value* (_ops[3]);
     struct ir_block_s* (bops[2]);
 
@@ -112,7 +112,7 @@ typedef struct ir_instr_s
 ir_instr* ir_instr_new(struct ir_block_s *owner, int opcode);
 void      ir_instr_delete(ir_instr*);
 
-MEM_VECTOR_PROTO(ir_value, ir_phi_entry_t, phi)
+MEM_VECTOR_PROTO(ir_value, ir_phi_entry_t, phi);
 bool GMQCC_WARN ir_instr_op(ir_instr*, int op, ir_value *value, bool writing);
 
 void ir_instr_dump(ir_instr* in, char *ind, int (*oprintf)(const char*,...));
@@ -121,7 +121,7 @@ void ir_instr_dump(ir_instr* in, char *ind, int (*oprintf)(const char*,...));
 typedef struct ir_block_s
 {
     char      *label;
-    lex_ctx_t  context;
+    lex_ctx    context;
     bool       final; /* once a jump is added we're done */
 
     MEM_VECTOR_MAKE(ir_instr*, instr);
@@ -142,9 +142,9 @@ void      ir_block_delete(ir_block*);
 
 bool      ir_block_set_label(ir_block*, const char *label);
 
-MEM_VECTOR_PROTO(ir_block, ir_instr*, instr)
-MEM_VECTOR_PROTO_ALL(ir_block, ir_block*, exits)
-MEM_VECTOR_PROTO_ALL(ir_block, ir_block*, entries)
+MEM_VECTOR_PROTO(ir_block, ir_instr*, instr);
+MEM_VECTOR_PROTO_ALL(ir_block, ir_block*, exits);
+MEM_VECTOR_PROTO_ALL(ir_block, ir_block*, entries);
 
 ir_value* ir_block_create_binop(ir_block*, const char *label, int op,
                                 ir_value *left, ir_value *right);
@@ -172,7 +172,7 @@ bool GMQCC_WARN ir_block_create_if(ir_block*, ir_value *cond,
 bool GMQCC_WARN ir_block_create_jump(ir_block*, ir_block *to);
 bool GMQCC_WARN ir_block_create_goto(ir_block*, ir_block *to);
 
-MEM_VECTOR_PROTO_ALL(ir_block, ir_value*, living)
+MEM_VECTOR_PROTO_ALL(ir_block, ir_value*, living);
 
 void ir_block_dump(ir_block*, char *ind, int (*oprintf)(const char*,...));
 
@@ -197,7 +197,7 @@ typedef struct ir_function_s
     ir_block*     first;
     ir_block*     last;
 
-    lex_ctx_t     context;
+    lex_ctx       context;
 
     /* for temp allocation */
     size_t run_id;
@@ -211,8 +211,8 @@ void         ir_function_delete(ir_function*);
 bool GMQCC_WARN ir_function_collect_value(ir_function*, ir_value *value);
 
 bool ir_function_set_name(ir_function*, const char *name);
-MEM_VECTOR_PROTO(ir_function, int, params)
-MEM_VECTOR_PROTO(ir_function, ir_block*, blocks)
+MEM_VECTOR_PROTO(ir_function, int, params);
+MEM_VECTOR_PROTO(ir_function, ir_block*, blocks);
 
 ir_value* ir_function_get_local(ir_function *self, const char *name);
 ir_value* ir_function_create_local(ir_function *self, const char *name, int vtype);
@@ -241,8 +241,8 @@ void        ir_builder_delete(ir_builder*);
 
 bool ir_builder_set_name(ir_builder *self, const char *name);
 
-MEM_VECTOR_PROTO(ir_builder, ir_function*, functions)
-MEM_VECTOR_PROTO(ir_builder, ir_value*, globals)
+MEM_VECTOR_PROTO(ir_builder, ir_function*, functions);
+MEM_VECTOR_PROTO(ir_builder, ir_value*, globals);
 
 ir_function* ir_builder_get_function(ir_builder*, const char *fun);
 ir_function* ir_builder_create_function(ir_builder*, const char *name);