X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_finish.c;h=a8b3b6e7458ac515b30ade5a413cd915087f782b;hb=04aa762a930950594df01a6246c08f9d02e76dba;hp=a7d8089f0b74337228a526d2a1f87bb59783e408;hpb=af82344c3d1ede9a28e652302a8c2bac7bb1c743;p=libfirm

diff --git a/ir/be/ia32/ia32_finish.c b/ir/be/ia32/ia32_finish.c
index a7d8089f0..a8b3b6e74 100644
--- a/ir/be/ia32/ia32_finish.c
+++ b/ir/be/ia32/ia32_finish.c
@@ -21,7 +21,6 @@
  * @file
  * @brief   This file implements functions to finalize the irg for emit.
  * @author  Christian Wuerdig
- * @version $Id$
  */
 #include "config.h"
 
@@ -34,9 +33,9 @@
 #include "pdeq.h"
 #include "error.h"
 
-#include "../bearch.h"
-#include "../besched.h"
-#include "../benode.h"
+#include "bearch.h"
+#include "besched.h"
+#include "benode.h"
 
 #include "bearch_ia32_t.h"
 #include "ia32_finish.h"
@@ -73,7 +72,7 @@ static void ia32_transform_sub_to_neg_add(ir_node *irn)
 	in2      = get_irn_n(irn, n_ia32_binary_right);
 	in1_reg  = arch_get_irn_register(in1);
 	in2_reg  = arch_get_irn_register(in2);
-	out_reg  = arch_irn_get_register(irn, 0);
+	out_reg  = arch_get_irn_register_out(irn, 0);
 
 	if (out_reg == in1_reg)
 		return;
@@ -109,9 +108,8 @@ static void ia32_transform_sub_to_neg_add(ir_node *irn)
 		res = new_bd_ia32_xAdd(dbgi, block, noreg, noreg, nomem, res, in1);
 		set_ia32_ls_mode(res, get_ia32_ls_mode(irn));
 	} else {
-		ir_node         *flags_proj = NULL;
-		ir_node         *carry;
-		const ir_edge_t *edge;
+		ir_node *flags_proj = NULL;
+		ir_node *carry;
 
 		if (get_irn_mode(irn) == mode_T) {
 			/* collect the Proj uses */
@@ -249,7 +247,7 @@ static void assure_should_be_same_requirements(ir_node *node)
 	int                         n_res, i;
 	ir_node                    *in_node, *block;
 
-	n_res = arch_irn_get_n_outs(node);
+	n_res = arch_get_irn_n_outs(node);
 	block = get_nodes_block(node);
 
 	/* check all OUT requirements, if there is a should_be_same */
@@ -257,7 +255,7 @@ static void assure_should_be_same_requirements(ir_node *node)
 		int                          i2, arity;
 		int                          same_pos;
 		ir_node                     *uses_out_reg;
-		const arch_register_req_t   *req = arch_get_out_register_req(node, i);
+		const arch_register_req_t   *req = arch_get_irn_register_req_out(node, i);
 		const arch_register_class_t *cls;
 		int                         uses_out_reg_pos;
 
@@ -267,7 +265,7 @@ static void assure_should_be_same_requirements(ir_node *node)
 		same_pos = get_first_same(req);
 
 		/* get in and out register */
-		out_reg = arch_irn_get_register(node, i);
+		out_reg = arch_get_irn_register_out(node, i);
 		in_node = get_irn_n(node, same_pos);
 		in_reg  = arch_get_irn_register(in_node);
 
@@ -307,7 +305,7 @@ static void assure_should_be_same_requirements(ir_node *node)
 		 * (the register can't be live since the operation will override it
 		 *  anyway) */
 		if (uses_out_reg == NULL) {
-			ir_node *copy = be_new_Copy(cls, block, in_node);
+			ir_node *copy = be_new_Copy(block, in_node);
 			DBG_OPT_2ADDRCPY(copy);
 
 			/* destination is the out register */
@@ -357,10 +355,10 @@ static void fix_am_source(ir_node *irn)
 	if (get_ia32_am_support(irn) != ia32_am_binary)
 		return;
 
-	n_res = arch_irn_get_n_outs(irn);
+	n_res = arch_get_irn_n_outs(irn);
 
 	for (i = 0; i < n_res; i++) {
-		const arch_register_req_t *req = arch_get_out_register_req(irn, i);
+		const arch_register_req_t *req = arch_get_irn_register_req_out(irn, i);
 		const arch_register_t     *out_reg;
 		int                        same_pos;
 		ir_node                   *same_node;
@@ -371,7 +369,7 @@ static void fix_am_source(ir_node *irn)
 			continue;
 
 		/* get in and out register */
-		out_reg   = arch_irn_get_register(irn, i);
+		out_reg   = arch_get_irn_register_out(irn, i);
 		same_pos  = get_first_same(req);
 		same_node = get_irn_n(irn, same_pos);
 		same_reg  = arch_get_irn_register(same_node);