fix some warnings, represent mode size as unsigned value

[libfirm] / ir / lower / lower_hl.c

diff --git a/ir/lower/lower_hl.c b/ir/lower/lower_hl.c
index 29aa1d0..4196068 100644 (file)
--- a/ir/lower/lower_hl.c
+++ b/ir/lower/lower_hl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -79,7 +79,7 @@ static void lower_sel(ir_node *sel) {
                sym.entity_p = ent;
                bl = get_nodes_block(sel);
 
-               cnst = new_rd_SymConst(dbg, irg, bl, sym, symconst_addr_ent);
+               cnst = new_rd_SymConst(dbg, irg, bl, mode, sym, symconst_addr_ent);
                newn = new_rd_Add(dbg, irg, bl, ptr, cnst, mode);
        } else {
                /* not TLS */
@@ -97,7 +97,7 @@ static void lower_sel(ir_node *sel) {
                                basemode = mode_P_data;
 
                        assert(basemode && "no mode for lowering Sel");
-                       assert((get_mode_size_bytes(basemode) != -1) && "can not deal with unorthodox modes");
+                       assert((get_mode_size_bits(basemode) % 8 != 0) && "can not deal with unorthodox modes");
                        index = get_Sel_index(sel, 0);
 
                        if (is_Array_type(owner)) {
@@ -195,9 +195,9 @@ static void lower_sel(ir_node *sel) {
                                        mode);
                        }
                } else if (is_Method_type(get_entity_type(ent)) &&
-                      is_Class_type(owner) &&
-                      (owner != get_glob_type()) &&
-                      (!is_frame_type(owner)))  {
+                          is_Class_type(owner) &&
+                          (owner != get_glob_type()) &&
+                          (!is_frame_type(owner)))  {
                        ir_node *add;
                        ir_mode *ent_mode = get_type_mode(get_entity_type(ent));
 
@@ -223,7 +223,7 @@ static void lower_sel(ir_node *sel) {
                        newn = new_rd_Add(dbg, irg, bl, get_Sel_ptr(sel), cnst, mode);
                } else {
                        /* global_type */
-                       newn = new_rd_SymConst_addr_ent(NULL, current_ir_graph, ent, firm_unknown_type);
+                       newn = new_rd_SymConst_addr_ent(NULL, current_ir_graph, mode, ent, firm_unknown_type);
                }
        }
        /* run the hooks */
@@ -580,20 +580,17 @@ static void lower_bf_access(ir_node *irn, void *env) {
  * Replace Sel nodes by address computation.  Also resolves array access.
  * Handle Bitfields by added And/Or calculations.
  */
-void lower_highlevel_graph(ir_graph *irg) {
-       int i, n;
+void lower_highlevel_graph(ir_graph *irg, int lower_bitfields) {
 
-       n = get_irp_n_irgs();
-       for (i = 0; i < n; ++i) {
-               ir_graph *irg = get_irp_irg(i);
-
-               /* First step: lower bitfield access: must be run as long as Sels still exists. */
+       if(lower_bitfields) {
+               /* First step: lower bitfield access: must be run as long as Sels still
+                * exists. */
                irg_walk_graph(irg, NULL, lower_bf_access, NULL);
-
-               /* Finally: lower SymConst-Size and Sel nodes, Casts, unaligned Load/Stores. */
-               irg_walk_graph(irg, NULL, lower_irnode, NULL);
-               set_irg_phase_low(irg);
        }
+
+       /* Finally: lower SymConst-Size and Sel nodes, Casts, unaligned Load/Stores. */
+       irg_walk_graph(irg, NULL, lower_irnode, NULL);
+       set_irg_phase_low(irg);
 }  /* lower_highlevel */
 
 /*
@@ -601,12 +598,12 @@ void lower_highlevel_graph(ir_graph *irg) {
  * Replace Sel nodes by address computation.  Also resolves array access.
  * Handle Bitfields by added And/Or calculations.
  */
-void lower_highlevel(void) {
+void lower_highlevel(int lower_bitfields) {
        int i, n;
 
        n = get_irp_n_irgs();
        for (i = 0; i < n; ++i) {
                ir_graph *irg = get_irp_irg(i);
-               lower_highlevel_graph(irg);
+               lower_highlevel_graph(irg, lower_bitfields);
        }
 }  /* lower_highlevel */