From: Sebastian Hack <hack@ipd.info.uni-karlsruhe.de>
Date: Mon, 20 Mar 2006 18:22:06 +0000 (+0000)
Subject: Fixed reload at end of block placement
X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=ba066ba405640f76b6f5cb7f7ab07d26d96c1e93;hp=75a385285d13e1d189a4b7c64bfe87002fcf5ab4;p=libfirm

Fixed reload at end of block placement
---

diff --git a/ir/be/benode.c b/ir/be/benode.c
index 925b658ce..4a595e830 100644
--- a/ir/be/benode.c
+++ b/ir/be/benode.c
@@ -669,6 +669,12 @@ void be_node_set_reg_class(ir_node *irn, int pos, const arch_register_class_t *c
 		r->req.type = arch_register_req_type_normal;
 }
 
+void be_node_set_req_type(ir_node *irn, int pos, arch_register_req_type_t type)
+{
+	be_req_t *r = get_req(irn, pos);
+	r->req.type = type;
+}
+
 void be_set_IncSP_offset(ir_node *irn, unsigned offset)
 {
 	be_stack_attr_t *a = get_irn_attr(irn);
@@ -830,11 +836,11 @@ ir_node *be_spill(const arch_env_t *arch_env, ir_node *irn, ir_node *ctx)
 	return spill;
 }
 
-ir_node *be_reload(const arch_env_t *arch_env, const arch_register_class_t *cls, ir_node *reloader, ir_mode *mode, ir_node *spill)
+ir_node *be_reload(const arch_env_t *arch_env, const arch_register_class_t *cls, ir_node *insert, ir_mode *mode, ir_node *spill)
 {
 	ir_node *reload;
 
-	ir_node *bl    = is_Block(reloader) ? reloader : get_nodes_block(reloader);
+	ir_node *bl    = is_Block(insert) ? insert : get_nodes_block(insert);
 	ir_graph *irg  = get_irn_irg(bl);
 	ir_node *frame = get_irg_frame(irg);
 	const arch_register_class_t *cls_frame = arch_get_irn_reg_class(arch_env, frame, -1);
@@ -843,7 +849,14 @@ ir_node *be_reload(const arch_env_t *arch_env, const arch_register_class_t *cls,
 
 	reload = be_new_Reload(cls, cls_frame, irg, bl, frame, spill, mode);
 
-	sched_add_before(reloader, reload);
+	if(is_Block(insert)) {
+		insert = sched_skip(insert, 0, sched_skip_cf_predicator, (void *) arch_env);
+		sched_add_after(insert, reload);
+	}
+
+	else
+		sched_add_before(insert, reload);
+
 	return reload;
 }