Added void casts to shut up warnings

[libfirm] / ir / ir / ircons.c

diff --git a/ir/ir/ircons.c b/ir/ir/ircons.c
index 0d4420d..5ae316b 100644 (file)
--- a/ir/ir/ircons.c
+++ b/ir/ir/ircons.c
@@ -75,6 +75,7 @@ new_rd_Start (dbg_info* db, ir_graph *irg, ir_node *block)
   ir_node *res;
 
   res = new_ir_node (db, irg, block, op_Start, mode_T, 0, NULL);
+  res->attr.start.irg = irg;
 
   irn_vrfy_irg (res, irg);
   return res;
@@ -137,8 +138,9 @@ new_rd_Const (dbg_info* db, ir_graph *irg, ir_node *block, ir_mode *mode, tarval
 INLINE ir_node *
 new_rd_Id (dbg_info* db, ir_graph *irg, ir_node *block, ir_node *val, ir_mode *mode)
 {
-  ir_node *in[1] = {val};
+  ir_node *in[1];
   ir_node *res;
+  in[0]=val;
   res = new_ir_node (db, irg, block, op_Id, mode, 1, in);
   res = optimize_node (res);
   irn_vrfy_irg (res, irg);
@@ -149,8 +151,9 @@ INLINE ir_node *
 new_rd_Proj (dbg_info* db, ir_graph *irg, ir_node *block, ir_node *arg, ir_mode *mode,
            long proj)
 {
-  ir_node *in[1] = {arg};
+  ir_node *in[1];
   ir_node *res;
+  in[0]=arg;
   res = new_ir_node (db, irg, block, op_Proj, mode, 1, in);
   res->attr.proj = proj;
 
@@ -180,13 +183,24 @@ new_rd_defaultProj (dbg_info* db, ir_graph *irg, ir_node *block, ir_node *arg,
 INLINE ir_node *
 new_rd_Conv (dbg_info* db, ir_graph *irg, ir_node *block, ir_node *op, ir_mode *mode)
 {
-  ir_node *in[1] = {op};
+  ir_node *in[1];
   ir_node *res;
+  in[0]=op;
   res = new_ir_node (db, irg, block, op_Conv, mode, 1, in);
   res = optimize_node (res);
   irn_vrfy_irg (res, irg);
   return res;
+}
 
+INLINE ir_node *
+new_rd_Cast (dbg_info* db, ir_graph *irg, ir_node *block, ir_node *op, type *to_tp)
+{
+  ir_node *res;
+  res = new_ir_node (db, irg, block, op_Cast, get_irn_mode(op), 1, &op);
+  res->attr.cast.totype = to_tp;
+  res = optimize_node (res);
+  irn_vrfy_irg (res, irg);
+  return res;
 }
 
 INLINE ir_node *
@@ -204,8 +218,10 @@ INLINE ir_node *
 new_rd_Add (dbg_info* db, ir_graph *irg, ir_node *block,
           ir_node *op1, ir_node *op2, ir_mode *mode)
 {
-  ir_node *in[2] = {op1, op2};
+  ir_node *in[2];
   ir_node *res;
+  in[0] = op1;
+  in[1] = op2;
   res = new_ir_node (db, irg, block, op_Add, mode, 2, in);
   res = optimize_node (res);
   irn_vrfy_irg (res, irg);
@@ -216,8 +232,10 @@ INLINE ir_node *
 new_rd_Sub (dbg_info* db, ir_graph *irg, ir_node *block,
           ir_node *op1, ir_node *op2, ir_mode *mode)
 {
-  ir_node *in[2] = {op1, op2};
+  ir_node *in[2];
   ir_node *res;
+  in[0] = op1;
+  in[1] = op2;
   res = new_ir_node (db, irg, block, op_Sub, mode, 2, in);
   res = optimize_node (res);
   irn_vrfy_irg (res, irg);
@@ -228,8 +246,9 @@ INLINE ir_node *
 new_rd_Minus (dbg_info* db, ir_graph *irg, ir_node *block,
             ir_node *op,  ir_mode *mode)
 {
-  ir_node *in[1] = {op};
+  ir_node *in[1];
   ir_node *res;
+  in[0]=op;
   res = new_ir_node (db, irg, block, op_Minus, mode, 1, in);
   res = optimize_node (res);
   irn_vrfy_irg (res, irg);
@@ -240,8 +259,10 @@ INLINE ir_node *
 new_rd_Mul (dbg_info* db, ir_graph *irg, ir_node *block,
           ir_node *op1, ir_node *op2, ir_mode *mode)
 {
-  ir_node *in[2] = {op1, op2};
+  ir_node *in[2];
   ir_node *res;
+  in[0] = op1;
+  in[1] = op2;
   res = new_ir_node (db, irg, block, op_Mul, mode, 2, in);
   res = optimize_node (res);
   irn_vrfy_irg (res, irg);
@@ -252,8 +273,11 @@ INLINE ir_node *
 new_rd_Quot (dbg_info* db, ir_graph *irg, ir_node *block,
            ir_node *memop, ir_node *op1, ir_node *op2)
 {
-  ir_node *in[3] = {memop, op1, op2};
+  ir_node *in[3] ;
   ir_node *res;
+  in[0] = memop;
+  in[1] = op1;
+  in[2] = op2;
   res = new_ir_node (db, irg, block, op_Quot, mode_T, 3, in);
   res = optimize_node (res);
   irn_vrfy_irg (res, irg);
@@ -264,8 +288,11 @@ INLINE ir_node *
 new_rd_DivMod (dbg_info* db, ir_graph *irg, ir_node *block,
              ir_node *memop, ir_node *op1, ir_node *op2)
 {
-  ir_node *in[3] = {memop, op1, op2};
+  ir_node *in[3];
   ir_node *res;
+  in[0] = memop;
+  in[1] = op1;
+  in[2] = op2;
   res = new_ir_node (db, irg, block, op_DivMod, mode_T, 3, in);
   res = optimize_node (res);
   irn_vrfy_irg (res, irg);
@@ -276,8 +303,11 @@ INLINE ir_node *
 new_rd_Div (dbg_info* db, ir_graph *irg, ir_node *block,
           ir_node *memop, ir_node *op1, ir_node *op2)
 {
-  ir_node *in[3] = {memop, op1, op2};
+  ir_node *in[3];
   ir_node *res;
+  in[0] = memop;
+  in[1] = op1;
+  in[2] = op2;
   res = new_ir_node (db, irg, block, op_Div, mode_T, 3, in);
   res = optimize_node (res);
   irn_vrfy_irg (res, irg);
@@ -288,8 +318,11 @@ INLINE ir_node *
 new_rd_Mod (dbg_info* db, ir_graph *irg, ir_node *block,
           ir_node *memop, ir_node *op1, ir_node *op2)
 {
-  ir_node *in[3] = {memop, op1, op2};
+  ir_node *in[3];
   ir_node *res;
+  in[0] = memop;
+  in[1] = op1;
+  in[2] = op2;
   res = new_ir_node (db, irg, block, op_Mod, mode_T, 3, in);
   res = optimize_node (res);
   irn_vrfy_irg (res, irg);
@@ -300,8 +333,10 @@ INLINE ir_node *
 new_rd_And (dbg_info* db, ir_graph *irg, ir_node *block,
           ir_node *op1, ir_node *op2, ir_mode *mode)
 {
-  ir_node *in[2] = {op1, op2};
+  ir_node *in[2];
   ir_node *res;
+  in[0] = op1;
+  in[1] = op2;
   res = new_ir_node (db, irg, block, op_And, mode, 2, in);
   res = optimize_node (res);
   irn_vrfy_irg (res, irg);
@@ -312,8 +347,10 @@ INLINE ir_node *
 new_rd_Or (dbg_info* db, ir_graph *irg, ir_node *block,
          ir_node *op1, ir_node *op2, ir_mode *mode)
 {
-  ir_node *in[2] = {op1, op2};
+  ir_node *in[2];
   ir_node *res;
+  in[0] = op1;
+  in[1] = op2;
   res = new_ir_node (db, irg, block, op_Or, mode, 2, in);
   res = optimize_node (res);
   irn_vrfy_irg (res, irg);
@@ -324,8 +361,10 @@ INLINE ir_node *
 new_rd_Eor (dbg_info* db, ir_graph *irg, ir_node *block,
          ir_node *op1, ir_node *op2, ir_mode *mode)
 {
-  ir_node *in[2] = {op1, op2};
+  ir_node *in[2];
   ir_node *res;
+  in[0] = op1;
+  in[1] = op2;
   res = new_ir_node (db, irg, block, op_Eor, mode, 2, in);
   res = optimize_node (res);
   irn_vrfy_irg (res, irg);
@@ -336,8 +375,9 @@ INLINE ir_node *
 new_rd_Not    (dbg_info* db, ir_graph *irg, ir_node *block,
              ir_node *op, ir_mode *mode)
 {
-  ir_node *in[1] = {op};
+  ir_node *in[1];
   ir_node *res;
+  in[0] = op;
   res = new_ir_node (db, irg, block, op_Not, mode, 1, in);
   res = optimize_node (res);
   irn_vrfy_irg (res, irg);
@@ -348,8 +388,10 @@ INLINE ir_node *
 new_rd_Shl (dbg_info* db, ir_graph *irg, ir_node *block,
          ir_node *op, ir_node *k, ir_mode *mode)
 {
-  ir_node *in[2] = {op, k};
+  ir_node *in[2];
   ir_node *res;
+  in[0] = op;
+  in[1] = k;
   res = new_ir_node (db, irg, block, op_Shl, mode, 2, in);
   res = optimize_node (res);
   irn_vrfy_irg (res, irg);
@@ -360,8 +402,10 @@ INLINE ir_node *
 new_rd_Shr (dbg_info* db, ir_graph *irg, ir_node *block,
           ir_node *op, ir_node *k, ir_mode *mode)
 {
-  ir_node *in[2] = {op, k};
+  ir_node *in[2];
   ir_node *res;
+  in[0] = op;
+  in[1] = k;
   res = new_ir_node (db, irg, block, op_Shr, mode, 2, in);
   res = optimize_node (res);
   irn_vrfy_irg (res, irg);
@@ -372,8 +416,10 @@ INLINE ir_node *
 new_rd_Shrs (dbg_info* db, ir_graph *irg, ir_node *block,
           ir_node *op, ir_node *k, ir_mode *mode)
 {
-  ir_node *in[2] = {op, k};
+  ir_node *in[2];
   ir_node *res;
+  in[0] = op;
+  in[1] = k;
   res = new_ir_node (db, irg, block, op_Shrs, mode, 2, in);
   res = optimize_node (res);
   irn_vrfy_irg (res, irg);
@@ -384,8 +430,10 @@ INLINE ir_node *
 new_rd_Rot (dbg_info* db, ir_graph *irg, ir_node *block,
           ir_node *op, ir_node *k, ir_mode *mode)
 {
-  ir_node *in[2] = {op, k};
+  ir_node *in[2];
   ir_node *res;
+  in[0] = op;
+  in[1] = k;
   res = new_ir_node (db, irg, block, op_Rot, mode, 2, in);
   res = optimize_node (res);
   irn_vrfy_irg (res, irg);
@@ -396,8 +444,9 @@ INLINE ir_node *
 new_rd_Abs (dbg_info* db, ir_graph *irg, ir_node *block,
           ir_node *op, ir_mode *mode)
 {
-  ir_node *in[1] = {op};
+  ir_node *in[1];
   ir_node *res;
+  in[0] = op;
   res = new_ir_node (db, irg, block, op_Abs, mode, 1, in);
   res = optimize_node (res);
   irn_vrfy_irg (res, irg);
@@ -408,8 +457,10 @@ INLINE ir_node *
 new_rd_Cmp (dbg_info* db, ir_graph *irg, ir_node *block,
           ir_node *op1, ir_node *op2)
 {
-  ir_node *in[2] = {op1, op2};
+  ir_node *in[2];
   ir_node *res;
+  in[0] = op1;
+  in[1] = op2;
   res = new_ir_node (db, irg, block, op_Cmp, mode_T, 2, in);
   res = optimize_node (res);
   irn_vrfy_irg (res, irg);
@@ -429,8 +480,9 @@ new_rd_Jmp (dbg_info* db, ir_graph *irg, ir_node *block)
 INLINE ir_node *
 new_rd_Cond (dbg_info* db, ir_graph *irg, ir_node *block, ir_node *c)
 {
-  ir_node *in[1] = {c};
+  ir_node *in[1];
   ir_node *res;
+  in[0] = c;
   res = new_ir_node (db, irg, block, op_Cond, mode_T, 1, in);
   res->attr.c.kind = dense;
   res->attr.c.default_proj = 0;
@@ -484,8 +536,10 @@ new_rd_Return (dbg_info* db, ir_graph *irg, ir_node *block,
 INLINE ir_node *
 new_rd_Raise (dbg_info* db, ir_graph *irg, ir_node *block, ir_node *store, ir_node *obj)
 {
-  ir_node *in[2] = {store, obj};
+  ir_node *in[2];
   ir_node *res;
+  in[0] = store;
+  in[1] = obj;
   res = new_ir_node (db, irg, block, op_Raise, mode_T, 2, in);
   res = optimize_node (res);
   irn_vrfy_irg (res, irg);
@@ -496,8 +550,10 @@ INLINE ir_node *
 new_rd_Load (dbg_info* db, ir_graph *irg, ir_node *block,
            ir_node *store, ir_node *adr)
 {
-  ir_node *in[2] = {store, adr};
+  ir_node *in[2];
   ir_node *res;
+  in[0] = store;
+  in[1] = adr;
   res = new_ir_node (db, irg, block, op_Load, mode_T, 2, in);
 
   res = optimize_node (res);
@@ -509,8 +565,11 @@ INLINE ir_node *
 new_rd_Store (dbg_info* db, ir_graph *irg, ir_node *block,
             ir_node *store, ir_node *adr, ir_node *val)
 {
-  ir_node *in[3] = {store, adr, val};
+  ir_node *in[3];
   ir_node *res;
+  in[0] = store;
+  in[1] = adr;
+  in[2] = val;
   res = new_ir_node (db, irg, block, op_Store, mode_T, 3, in);
 
   res = optimize_node (res);
@@ -523,8 +582,10 @@ INLINE ir_node *
 new_rd_Alloc (dbg_info* db, ir_graph *irg, ir_node *block, ir_node *store,
            ir_node *size, type *alloc_type, where_alloc where)
 {
-  ir_node *in[2] = {store, size};
+  ir_node *in[2];
   ir_node *res;
+  in[0] = store;
+  in[1] = size;
   res = new_ir_node (db, irg, block, op_Alloc, mode_T, 2, in);
 
   res->attr.a.where = where;
@@ -539,8 +600,11 @@ INLINE ir_node *
 new_rd_Free (dbg_info* db, ir_graph *irg, ir_node *block, ir_node *store,
            ir_node *ptr, ir_node *size, type *free_type)
 {
-  ir_node *in[3] = {store, ptr, size};
+  ir_node *in[3];
   ir_node *res;
+  in[0] = store;
+  in[1] = ptr;
+  in[2] = size;
   res = new_ir_node (db, irg, block, op_Free, mode_T, 3, in);
 
   res->attr.f = free_type;
@@ -563,7 +627,7 @@ new_rd_Sel (dbg_info* db, ir_graph *irg, ir_node *block, ir_node *store, ir_node
   r_in[0] = store;
   r_in[1] = objptr;
   memcpy (&r_in[2], in, sizeof (ir_node *) * arity);
-  res = new_ir_node (db, irg, block, op_Sel, mode_P, r_arity, r_in);
+  res = new_ir_node (db, irg, block, op_Sel, mode_P_mach, r_arity, r_in);
 
   res->attr.s.ent = ent;
 
@@ -601,7 +665,7 @@ new_rd_SymConst (dbg_info* db, ir_graph *irg, ir_node *block, type_or_id_p value
   ir_node *res;
   ir_mode *mode;
   if (symkind == linkage_ptr_info)
-    mode = mode_P;
+    mode = mode_P_mach;
   else
     mode = mode_Iu;
   res = new_ir_node (db, irg, block, op_SymConst, mode, 0, NULL);
@@ -647,8 +711,9 @@ new_rd_Unknown (ir_graph *irg)
 INLINE ir_node *
 new_rd_CallBegin (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *call)
 {
-  ir_node *in[1] = { get_Call_ptr(call) };
+  ir_node *in[1];
   ir_node *res;
+  in[0] = get_Call_ptr(call);
   res = new_ir_node (db, irg, block, op_CallBegin, mode_T, 1, in);
   res->attr.callbegin.irg = irg;
   res->attr.callbegin.call = call;
@@ -695,8 +760,9 @@ INLINE ir_node *
 new_rd_Filter (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *arg, ir_mode *mode,
               long proj)
 {
-  ir_node *in[1] = {arg};
+  ir_node *in[1];
   ir_node *res;
+  in[0] = arg;
   res = new_ir_node (db, irg, block, op_Filter, mode, 1, in);
   res->attr.filter.proj = proj;
   res->attr.filter.in_cg = NULL;
@@ -834,6 +900,9 @@ INLINE ir_node *new_r_Conv   (ir_graph *irg, ir_node *block,
                       ir_node *op, ir_mode *mode) {
   return new_rd_Conv(NULL, irg, block, op, mode);
 }
+INLINE ir_node *new_r_Cast   (ir_graph *irg, ir_node *block, ir_node *op, type *to_tp) {
+  return new_rd_Cast(NULL, irg, block, op, to_tp);
+}
 INLINE ir_node *new_r_Phi    (ir_graph *irg, ir_node *block, int arity,
                       ir_node **in, ir_mode *mode) {
   return new_rd_Phi(NULL, irg, block, arity, in, mode);
@@ -916,6 +985,7 @@ new_d_Start (dbg_info* db)
 
   res = new_ir_node (db, current_ir_graph, current_ir_graph->current_block,
                     op_Start, mode_T, 0, NULL);
+  res->attr.start.irg = current_ir_graph;
 
   res = optimize_node (res);
   irn_vrfy_irg (res, current_ir_graph);
@@ -1201,7 +1271,7 @@ phi_merge (ir_node *block, int pos, ir_mode *mode, ir_node **nin, int ins)
     block->attr.block.graph_arr[pos] = res;
   } else {
     /*  printf(" value already computed by %s\n",
-        id_to_str(block->attr.block.graph_arr[pos]->op->name));  */
+        get_id_str(block->attr.block.graph_arr[pos]->op->name));  */
   }
 
   return res;
@@ -1737,6 +1807,12 @@ new_d_Conv (dbg_info* db, ir_node *op, ir_mode *mode)
                     op, mode);
 }
 
+ir_node *
+new_d_Cast (dbg_info* db, ir_node *op, type *to_tp)
+{
+  return new_rd_Cast (db, current_ir_graph, current_ir_graph->current_block, op, to_tp);
+}
+
 ir_node *
 new_d_Tuple (dbg_info* db, int arity, ir_node **in)
 {
@@ -2024,7 +2100,7 @@ new_d_InstOf (dbg_info *db, ir_node *store, ir_node *objptr, type *ent)
 ir_node *
 new_d_SymConst (dbg_info* db, type_or_id_p value, symconst_kind kind)
 {
-  return new_rd_SymConst (db, current_ir_graph, current_ir_graph->current_block,
+  return new_rd_SymConst (db, current_ir_graph, current_ir_graph->start_block,
                          value, kind);
 }
 
@@ -2325,6 +2401,9 @@ ir_node *new_Cmp    (ir_node *op1, ir_node *op2) {
 ir_node *new_Conv   (ir_node *op, ir_mode *mode) {
   return new_d_Conv(NULL, op, mode);
 }
+ir_node *new_Cast   (ir_node *op, type *to_tp) {
+  return new_d_Cast(NULL, op, to_tp);
+}
 ir_node *new_Phi    (int arity, ir_node **in, ir_mode *mode) {
   return new_d_Phi(NULL, arity, in, mode);
 }