some comments added and fixed

[libfirm] / ir / lower / lower_hl.c

diff --git a/ir/lower/lower_hl.c b/ir/lower/lower_hl.c
index 517b6aa..e243cee 100644 (file)
--- a/ir/lower/lower_hl.c
+++ b/ir/lower/lower_hl.c
@@ -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)) {
@@ -142,12 +142,12 @@ static void lower_sel(ir_node *sel) {
                                        ub = get_array_upper_bound(arr_ty, dim);
 
                                        assert(irg == current_ir_graph);
-                                       if (get_irn_op(lb) != op_Unknown)
+                                       if (! is_Unknown(lb))
                                                lb = new_rd_Conv(dbg, irg, bl, copy_const_value(get_irn_dbg_info(sel), lb), mode_Int);
                                        else
                                                lb = NULL;
 
-                                       if (get_irn_op(ub) != op_Unknown)
+                                       if (! is_Unknown(ub))
                                                ub = new_rd_Conv(dbg, irg, bl, copy_const_value(get_irn_dbg_info(sel), ub), mode_Int);
                                        else
                                                ub = NULL;
@@ -157,8 +157,8 @@ static void lower_sel(ir_node *sel) {
                                         * bounds have to be set in the non-last dimension.
                                         */
                                        if (i > 0) {
-                                               assert(lb && "lower bound has to be set in multi-dim array");
-                                               assert(lb && "upper bound has to be set in multi-dim array");
+                                               assert(lb != NULL && "lower bound has to be set in multi-dim array");
+                                               assert(ub != NULL && "upper bound has to be set in multi-dim array");
 
                                                /* Elements in one Dimension */
                                                elms = new_rd_Sub(dbg, irg, bl, ub, lb, mode_Int);
@@ -170,7 +170,7 @@ static void lower_sel(ir_node *sel) {
                                         * Normalize index, id lower bound is set, also assume
                                         * lower bound == 0
                                         */
-                                       if (lb)
+                                       if (lb != NULL)
                                                ind = new_rd_Sub(dbg, irg, bl, ind, lb, mode_Int);
 
                                        n = new_rd_Mul(dbg, irg, bl, ind, last_size, mode_Int);
@@ -214,13 +214,21 @@ static void lower_sel(ir_node *sel) {
 #endif
                        newn = new_r_Proj(irg, bl, newn, ent_mode, pn_Load_res);
 
-               } else if (get_entity_owner(ent) != get_glob_type())  {
+               } else if (get_entity_owner(ent) != get_glob_type()) {
+                       int offset;
+
                        /* replace Sel by add(obj, const(ent.offset)) */
                        assert(!(get_entity_allocation(ent) == allocation_static &&
                                (get_entity_n_overwrites(ent) == 0 && get_entity_n_overwrittenby(ent) == 0)));
-                       tv = new_tarval_from_long(get_entity_offset(ent), mode_Int);
-                       cnst = new_r_Const(irg, get_irg_start_block(irg), mode_Int, tv);
-                       newn = new_rd_Add(dbg, irg, bl, get_Sel_ptr(sel), cnst, mode);
+                       newn   = get_Sel_ptr(sel);
+                       offset = get_entity_offset(ent);
+                       if (offset != 0) {
+                               ir_mode *mode_UInt = get_reference_mode_unsigned_eq(mode);
+
+                               tv = new_tarval_from_long(offset, mode_UInt);
+                               cnst = new_r_Const(irg, get_irg_start_block(irg), mode_UInt, tv);
+                               newn = new_rd_Add(dbg, irg, bl, newn, cnst, mode);
+                       }
                } else {
                        /* global_type */
                        newn = new_rd_SymConst_addr_ent(NULL, current_ir_graph, mode, ent, firm_unknown_type);
@@ -582,7 +590,7 @@ static void lower_bf_access(ir_node *irn, void *env) {
  */
 void lower_highlevel_graph(ir_graph *irg, int lower_bitfields) {
 
-       if(lower_bitfields) {
+       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);
@@ -591,7 +599,14 @@ void lower_highlevel_graph(ir_graph *irg, int lower_bitfields) {
        /* 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 */
+}  /* lower_highlevel_graph */
+
+/*
+ * does the same as lower_highlevel() for all nodes on the const code irg
+ */
+void lower_const_code(void) {
+       walk_const_code(NULL, lower_irnode, NULL);
+}  /* lower_const_code */
 
 /*
  * Replaces SymConsts by a real constant if possible.
@@ -606,4 +621,5 @@ void lower_highlevel(int lower_bitfields) {
                ir_graph *irg = get_irp_irg(i);
                lower_highlevel_graph(irg, lower_bitfields);
        }
+       lower_const_code();
 }  /* lower_highlevel */