X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fbe%2Fia32%2Fia32_finish.c;h=6ef76ccb2637f8b666a330f89388671aca5b413d;hb=eb593ca265a302849042866b57a3cf7a6e9495ab;hp=ac361ad3aaef825e6520776bebad4280892c1c9b;hpb=b38b52e7426cd2bf243282db922e135422d435b7;p=libfirm

diff --git a/ir/be/ia32/ia32_finish.c b/ir/be/ia32/ia32_finish.c
index ac361ad3a..6ef76ccb2 100644
--- a/ir/be/ia32/ia32_finish.c
+++ b/ir/be/ia32/ia32_finish.c
@@ -387,7 +387,8 @@ static void assure_should_be_same_requirements(ia32_code_gen_t *cg,
  * register -> base or index is broken then.
  * Solution: Turn back this address mode into explicit Load + Operation.
  */
-static void fix_am_source(ir_node *irn, void *env) {
+static void fix_am_source(ir_node *irn, void *env)
+{
 	ia32_code_gen_t            *cg = env;
 	const arch_env_t           *arch_env = cg->arch_env;
 	ir_node                    *base;
@@ -405,8 +406,8 @@ static void fix_am_source(ir_node *irn, void *env) {
 	if (get_ia32_am_arity(irn) != ia32_am_binary)
 		return;
 
-	base  = get_irn_n(irn, 0);
-	index = get_irn_n(irn, 1);
+	base  = get_irn_n(irn, n_ia32_base);
+	index = get_irn_n(irn, n_ia32_index);
 
 	reg_base  = arch_get_irn_register(arch_env, base);
 	reg_index = arch_get_irn_register(arch_env, index);
@@ -466,6 +467,8 @@ static void fix_am_source(ir_node *irn, void *env) {
 			/* copy address mode information to load */
 			set_ia32_op_type(load, ia32_AddrModeS);
 			ia32_copy_am_attrs(load, irn);
+			if (is_ia32_is_reload(irn))
+				set_ia32_is_reload(load);
 
 			/* insert the load into schedule */
 			sched_add_before(irn, load);
@@ -482,11 +485,13 @@ static void fix_am_source(ir_node *irn, void *env) {
 				foreach_out_edge_safe(irn, edge, next) {
 					ir_node *node = get_edge_src_irn(edge);
 					int      pn   = get_Proj_proj(node);
-					if(pn == 0) {
+					if (pn == pn_ia32_res) {
 						exchange(node, irn);
-					} else if(pn == pn_ia32_mem) {
+					} else if (pn == pn_ia32_mem) {
 						set_Proj_pred(node, load);
 						set_Proj_proj(node, pnmem);
+					} else {
+						panic("Unexpected Proj");
 					}
 				}
 				set_irn_mode(irn, mode_Iu);