X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_hl.c;h=f1f4e8829f7315b4724e765ad6bf2e00817de660;hb=7142e46b9e442cacddec26387d8735444fb4421b;hp=2cf19a33b435622cb9a24d93a57d443e10c13eda;hpb=9d3c8631459f431c313160dab5778e8a7b88dd92;p=libfirm

diff --git a/ir/lower/lower_hl.c b/ir/lower/lower_hl.c
index 2cf19a33b..f1f4e8829 100644
--- a/ir/lower/lower_hl.c
+++ b/ir/lower/lower_hl.c
@@ -206,13 +206,7 @@ static void lower_sel(ir_node *sel)
 			tv   = new_tarval_from_long(get_entity_offset(ent), mode_Int);
 			cnst = new_rd_Const(dbg, irg, tv);
 			add  = new_rd_Add(dbg, bl, get_Sel_ptr(sel), cnst, mode);
-#ifdef DO_CACHEOPT  /* cacheopt version */
-			newn = new_rd_Load(dbg, bl, get_Sel_mem(sel), sel, ent_mode, 0);
-			cacheopt_map_addrs_register_node(newn);
-			set_Load_ptr(newn, add);
-#else /* normal code */
-			newn = new_rd_Load(dbg, bl, get_Sel_mem(sel), add, ent_mode, 0);
-#endif
+			newn = new_rd_Load(dbg, bl, get_Sel_mem(sel), add, ent_mode, cons_none);
 			newn = new_r_Proj(newn, ent_mode, pn_Load_res);
 
 		} else if (get_entity_owner(ent) != get_glob_type()) {
@@ -482,7 +476,7 @@ static void lower_bitfields_stores(ir_node *store)
 
 	if (neg_mask) {
 		/* there are some bits, normal case */
-		irn  = new_r_Load(block, mem, ptr, mode, 0);
+		irn  = new_r_Load(block, mem, ptr, mode, cons_none);
 		mem  = new_r_Proj(irn, mode_M, pn_Load_M);
 		irn  = new_r_Proj(irn, mode, pn_Load_res);
 
@@ -593,17 +587,17 @@ void lower_highlevel_graph(ir_graph *irg, int lower_bitfields)
 	set_irg_outs_inconsistent(irg);
 }
 
-struct pass_t {
+typedef struct pass_t {
 	ir_graph_pass_t pass;
 	int            lower_bitfields;
-};
+} pass_t;
 
 /**
  * Wrapper for running lower_highlevel_graph() as an ir_graph pass.
  */
 static int lower_highlevel_graph_wrapper(ir_graph *irg, void *context)
 {
-	struct pass_t *pass = context;
+	pass_t *pass = (pass_t*)context;
 
 	lower_highlevel_graph(irg, pass->lower_bitfields);
 	return 0;
@@ -611,7 +605,7 @@ static int lower_highlevel_graph_wrapper(ir_graph *irg, void *context)
 
 ir_graph_pass_t *lower_highlevel_graph_pass(const char *name, int lower_bitfields)
 {
-	struct pass_t *pass = XMALLOCZ(struct pass_t);
+	pass_t *pass = XMALLOCZ(pass_t);
 
 	pass->lower_bitfields = lower_bitfields;
 	return def_graph_pass_constructor(
@@ -638,7 +632,7 @@ ir_prog_pass_t *lower_const_code_pass(const char *name)
  */
 void lower_highlevel(int lower_bitfields)
 {
-	int i, n;
+	size_t i, n;
 
 	n = get_irp_n_irgs();
 	for (i = 0; i < n; ++i) {