From: Matthias Braun <matze@braunis.de>
Date: Mon, 7 May 2007 10:01:34 +0000 (+0000)
Subject: renumber source/dest registers
X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=f8e012e8be90dfb9f16430154d0effadfd4463e1;p=libfirm

renumber source/dest registers

[r13676]
---

diff --git a/ir/be/arm/arm_spec.pl b/ir/be/arm/arm_spec.pl
index 7f5e225dc..f06f9a7c5 100644
--- a/ir/be/arm/arm_spec.pl
+++ b/ir/be/arm/arm_spec.pl
@@ -7,10 +7,6 @@
 $arch = "arm";
 $new_emit_syntax = 1;
 
-# this strings mark the beginning and the end of a comment in emit
-$comment_string     = "/*";
-$comment_string_end = "*/";
-
 # the number of additional opcodes you want to register
 #$additional_opcodes = 0;
 
diff --git a/ir/be/ia32/bearch_ia32.c b/ir/be/ia32/bearch_ia32.c
index db8f8781f..f6b714373 100644
--- a/ir/be/ia32/bearch_ia32.c
+++ b/ir/be/ia32/bearch_ia32.c
@@ -103,11 +103,6 @@ static INLINE ir_node *create_const(ia32_code_gen_t *cg, ir_node **place,
 	arch_set_irn_register(cg->arch_env, res, reg);
 	*place = res;
 
-#if 0
-	/* keep the node so it isn't accidently removed when unused ... */
-	in[0] = res;
-	keep = be_new_Keep(arch_register_get_class(reg), cg->irg, block, 1, in);
-#endif
 	add_irn_dep(get_irg_end(cg->irg), res);
 	/* add_irn_dep(get_irg_start(cg->irg), res); */
 
diff --git a/ir/be/ia32/ia32_spec.pl b/ir/be/ia32/ia32_spec.pl
index 871b1131a..3448e8f37 100644
--- a/ir/be/ia32/ia32_spec.pl
+++ b/ir/be/ia32/ia32_spec.pl
@@ -235,21 +235,21 @@ $arch = "ia32";
 ); # vliw
 
 %emit_templates = (
-	S1 => "${arch}_emit_source_register(env, node, 0);",
-	S2 => "${arch}_emit_source_register(env, node, 1);",
-	S3 => "${arch}_emit_source_register(env, node, 2);",
-	S4 => "${arch}_emit_source_register(env, node, 3);",
-	S5 => "${arch}_emit_source_register(env, node, 4);",
-	S6 => "${arch}_emit_source_register(env, node, 5);",
-	D1 => "${arch}_emit_dest_register(env, node, 0);",
-	D2 => "${arch}_emit_dest_register(env, node, 1);",
-	D3 => "${arch}_emit_dest_register(env, node, 2);",
-	D4 => "${arch}_emit_dest_register(env, node, 3);",
-	D5 => "${arch}_emit_dest_register(env, node, 4);",
-	D6 => "${arch}_emit_dest_register(env, node, 5);",
-	X1 => "${arch}_emit_x87_name(env, node, 0);",
-	X2 => "${arch}_emit_x87_name(env, node, 1);",
-	X3 => "${arch}_emit_x87_name(env, node, 2);",
+	S0 => "${arch}_emit_source_register(env, node, 0);",
+	S1 => "${arch}_emit_source_register(env, node, 1);",
+	S2 => "${arch}_emit_source_register(env, node, 2);",
+	S3 => "${arch}_emit_source_register(env, node, 3);",
+	S4 => "${arch}_emit_source_register(env, node, 4);",
+	S5 => "${arch}_emit_source_register(env, node, 5);",
+	D0 => "${arch}_emit_dest_register(env, node, 0);",
+	D1 => "${arch}_emit_dest_register(env, node, 1);",
+	D2 => "${arch}_emit_dest_register(env, node, 2);",
+	D3 => "${arch}_emit_dest_register(env, node, 3);",
+	D4 => "${arch}_emit_dest_register(env, node, 4);",
+	D5 => "${arch}_emit_dest_register(env, node, 5);",
+	X0 => "${arch}_emit_x87_name(env, node, 0);",
+	X1 => "${arch}_emit_x87_name(env, node, 1);",
+	X2 => "${arch}_emit_x87_name(env, node, 2);",
 	C  => "${arch}_emit_immediate(env, node);",
 	SE => "${arch}_emit_extend_suffix(env, get_ia32_ls_mode(node));",
 	ME => "if(get_mode_size_bits(get_ia32_ls_mode(node)) != 32)\n
@@ -335,10 +335,10 @@ Add64Bit => {
 	arity     => 4,
 	reg_req   => { in => [ "gp", "gp", "gp", "gp" ], out => [ "!in", "!in" ] },
 	emit      => '
+. movl %S0, %D0
 . movl %S1, %D1
-. movl %S2, %D2
-. addl %S3, %D1
-. adcl %S4, %D2
+. addl %S2, %D0
+. adcl %S3, %D1
 ',
 	outs      => [ "low_res", "high_res" ],
 	units     => [ "GP" ],
@@ -476,10 +476,10 @@ Sub64Bit => {
 	arity     => 4,
 	reg_req   => { in => [ "gp", "gp", "gp", "gp" ], out => [ "!in", "!in" ] },
 	emit      => '
+. movl %S0, %D0
 . movl %S1, %D1
-. movl %S2, %D2
-. subl %S3, %D1
-. sbbl %S4, %D2
+. subl %S2, %D0
+. sbbl %S3, %D1
 ',
 	outs      => [ "low_res", "high_res" ],
 	units     => [ "GP" ],
@@ -557,15 +557,15 @@ ShlD => {
 '
 if (get_ia32_immop_type(node) == ia32_ImmNone) {
 	if (get_ia32_op_type(node) == ia32_AddrModeD) {
-		. shldl %%cl, %S4, %AM
+		. shldl %%cl, %S3, %AM
 	} else {
-		. shldl %%cl, %S4, %S3
+		. shldl %%cl, %S3, %S2
 	}
 } else {
 	if (get_ia32_op_type(node) == ia32_AddrModeD) {
-		. shldl %C, %S4, %AM
+		. shldl %C, %S3, %AM
 	} else {
-		. shldl %C, %S4, %S3
+		. shldl %C, %S3, %S2
 	}
 }
 ',
@@ -612,15 +612,15 @@ ShrD => {
 	emit      => '
 if (get_ia32_immop_type(node) == ia32_ImmNone) {
 	if (get_ia32_op_type(node) == ia32_AddrModeD) {
-		. shrdl %%cl, %S4, %AM
+		. shrdl %%cl, %S3, %AM
 	} else {
-		. shrdl %%cl, %S4, %S3
+		. shrdl %%cl, %S3, %S2
 	}
 } else {
 	if (get_ia32_op_type(node) == ia32_AddrModeD) {
-		. shrdl %C, %S4, %AM
+		. shrdl %C, %S3, %AM
 	} else {
-		. shrdl %C, %S4, %S3
+		. shrdl %C, %S3, %S2
 	}
 }
 ',
@@ -690,10 +690,10 @@ Minus64Bit => {
 	arity     => 4,
 	reg_req   => { in => [ "gp", "gp", "gp" ], out => [ "!in", "!in" ] },
 	emit      => '
-. movl %S1, %D1
-. movl %S1, %D2
-. subl %S2, %D1
-. sbbl %S3, %D2
+. movl %S0, %D0
+. movl %S0, %D1
+. subl %S1, %D0
+. sbbl %S2, %D1
 ',
 	outs      => [ "low_res", "high_res" ],
 	units     => [ "GP" ],
@@ -913,7 +913,7 @@ Load => {
 	comment   => "construct Load: Load(ptr, mem) = LD ptr -> reg",
 	reg_req   => { in => [ "gp", "gp", "none" ], out => [ "gp", "none" ] },
 	latency   => 3,
-	emit      => ". mov%SE%ME%.l %AM, %D1",
+	emit      => ". mov%SE%ME%.l %AM, %D0",
 	outs      => [ "res", "M" ],
 	units     => [ "GP" ],
 },
@@ -961,7 +961,7 @@ Lea => {
 	irn_flags => "R",
 	comment   => "construct Lea: Lea(a,b) = lea [a+b*const+offs] | res = a + b * const + offs with const = 0,1,2,4,8",
 	reg_req   => { in => [ "gp", "gp" ], out => [ "in_r1" ] },
-	emit      => '. leal %AM, %D1',
+	emit      => '. leal %AM, %D0',
 	latency   => 2,
 	units     => [ "GP" ],
 	mode      => $mode_gp,
@@ -1173,7 +1173,7 @@ xConst => {
 	irn_flags => "R",
 	comment   => "represents a SSE constant",
 	reg_req   => { out => [ "xmm" ] },
-	emit      => '. mov%XXM %C, %D1',
+	emit      => '. mov%XXM %C, %D0',
 	latency   => 2,
 	units     => [ "SSE" ],
 	mode      => "mode_E",
@@ -1186,7 +1186,7 @@ xLoad => {
 	state     => "exc_pinned",
 	comment   => "construct SSE Load: Load(ptr, mem) = LD ptr",
 	reg_req   => { in => [ "gp", "gp", "none" ], out => [ "xmm", "none" ] },
-	emit      => '. mov%XXM %AM, %D1',
+	emit      => '. mov%XXM %AM, %D0',
 	outs      => [ "res", "M" ],
 	latency   => 2,
 	units     => [ "SSE" ],
@@ -1208,7 +1208,7 @@ xStoreSimple => {
 	state    => "exc_pinned",
 	comment  => "construct Store without index: Store(ptr, val, mem) = ST ptr,val",
 	reg_req  => { in => [ "gp", "xmm", "none" ] },
-	emit     => '. mov%XXM %S2, %AM',
+	emit     => '. mov%XXM %S1, %AM',
 	latency  => 2,
 	units    => [ "SSE" ],
 	mode     => "mode_M",
@@ -1217,7 +1217,7 @@ xStoreSimple => {
 CvtSI2SS => {
 	op_flags => "L|F",
 	reg_req  => { in => [ "gp", "gp", "gp", "none" ], out => [ "xmm" ] },
-	emit     => '. cvtsi2ss %D1, %AM',
+	emit     => '. cvtsi2ss %D0, %AM',
 	latency  => 2,
 	units    => [ "SSE" ],
 	mode     => $mode_xmm
@@ -1984,7 +1984,7 @@ fxch => {
 	comment   => "x87 stack exchange",
 	reg_req   => { },
 	cmp_attr  => "return 1;",
-	emit      => '. fxch %X1',
+	emit      => '. fxch %X0',
 },
 
 fpush => {
@@ -1992,7 +1992,7 @@ fpush => {
 	comment   => "x87 stack push",
 	reg_req   => {},
 	cmp_attr  => "return 1;",
-	emit      => '. fld %X1',
+	emit      => '. fld %X0',
 },
 
 fpushCopy => {
@@ -2000,7 +2000,7 @@ fpushCopy => {
 	comment   => "x87 stack push",
 	reg_req   => { in => [ "vfp"], out => [ "vfp" ] },
 	cmp_attr  => "return 1;",
-	emit      => '. fld %X1',
+	emit      => '. fld %X0',
 },
 
 fpop => {
@@ -2008,7 +2008,7 @@ fpop => {
 	comment   => "x87 stack pop",
 	reg_req   => { },
 	cmp_attr  => "return 1;",
-	emit      => '. fstp %X1',
+	emit      => '. fstp %X0',
 },
 
 # compare
@@ -2067,7 +2067,7 @@ xxLoad => {
 	state     => "exc_pinned",
 	comment   => "construct SSE Load: Load(ptr, mem) = LD ptr",
 	reg_req   => { in => [ "gp", "gp", "none" ], out => [ "xmm", "none" ] },
-	emit      => '. movdqu %D1, %AM',
+	emit      => '. movdqu %D0, %AM',
 	outs      => [ "res", "M" ],
 	units     => [ "SSE" ],
 },
diff --git a/ir/be/mips/mips_scheduler.c b/ir/be/mips/mips_scheduler.c
index bd8b468fa..c8f3ffb8a 100644
--- a/ir/be/mips/mips_scheduler.c
+++ b/ir/be/mips/mips_scheduler.c
@@ -204,14 +204,12 @@ static ir_node *mips_scheduler_select(void *block_env, nodeset *ready_set, nodes
 static
 int mips_to_appear_in_schedule(void *block_env, const ir_node *node)
 {
-	ir_fprintf(stderr, "check %+F\n", node);
 	if(!is_mips_irn(node))
 		return -1;
 
 	if(is_mips_zero(node))
 		return 0;
 
-	ir_fprintf(stderr, "Sched: %+F\n", node);
 	return 1;
 }
 
diff --git a/ir/be/ppc32/ppc32_spec.pl b/ir/be/ppc32/ppc32_spec.pl
index a60463cae..8383330ee 100644
--- a/ir/be/ppc32/ppc32_spec.pl
+++ b/ir/be/ppc32/ppc32_spec.pl
@@ -7,10 +7,6 @@
 $arch = "ppc32";
 $new_emit_syntax = 1;
 
-# this strings mark the beginning and the end of a comment in emit
-$comment_string     = "/*";
-$comment_string_end = "*/";
-
 # The node description is done as a perl hash initializer with the
 # following structure:
 #