X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_spec.pl;h=0249eddf416d5bf509fb45fe11d24807a7763b17;hb=eb593ca265a302849042866b57a3cf7a6e9495ab;hp=251d64e6ce63c2804ac88ae496709cf6c3b4316b;hpb=3045c832181e10f25ed4009a36fa29911c5a1306;p=libfirm

diff --git a/ir/be/ia32/ia32_spec.pl b/ir/be/ia32/ia32_spec.pl
index 251d64e6c..0249eddf4 100644
--- a/ir/be/ia32/ia32_spec.pl
+++ b/ir/be/ia32/ia32_spec.pl
@@ -256,8 +256,6 @@ sub ia32_custom_init_attr {
 			$res .= "\tset_ia32_am_support(res, ia32_am_Source, ia32_am_unary);";
 		} elsif($am eq "source,binary") {
 			$res .= "\tset_ia32_am_support(res, ia32_am_Source, ia32_am_binary);";
-		} elsif($am eq "source,ternary") {
-			$res .= "\tset_ia32_am_support(res, ia32_am_Source, ia32_am_ternary);";
 		} elsif($am eq "none") {
 			# nothing to do
 		} else {
@@ -307,13 +305,14 @@ $custom_init_attr_func = \&ia32_custom_init_attr;
 %operands = (
 );
 
-$mode_xmm     = "mode_E";
-$mode_gp      = "mode_Iu";
-$mode_flags   = "mode_Iu";
-$mode_fpcw    = "mode_fpcw";
-$status_flags = [ "CF", "PF", "AF", "ZF", "SF", "OF" ];
-$fpcw_flags   = [ "FP_IM", "FP_DM", "FP_ZM", "FP_OM", "FP_UM", "FP_PM",
-                  "FP_PC0", "FP_PC1", "FP_RC0", "FP_RC1", "FP_X" ];
+$mode_xmm           = "mode_E";
+$mode_gp            = "mode_Iu";
+$mode_flags         = "mode_Iu";
+$mode_fpcw          = "mode_fpcw";
+$status_flags       = [ "CF", "PF", "AF", "ZF", "SF", "OF" ];
+$status_flags_wo_cf = [       "PF", "AF", "ZF", "SF", "OF" ];
+$fpcw_flags         = [ "FP_IM", "FP_DM", "FP_ZM", "FP_OM", "FP_UM", "FP_PM",
+                        "FP_PC0", "FP_PC1", "FP_RC0", "FP_RC1", "FP_X" ];
 
 %nodes = (
 
@@ -681,7 +680,7 @@ IDiv => {
 	               out => [ "eax", "flags", "none", "edx", "none" ] },
 	ins       => [ "base", "index", "mem", "divisor", "dividend_low", "dividend_high" ],
 	outs      => [ "div_res", "flags", "M", "mod_res", "X_exc" ],
-	am        => "source,ternary",
+	am        => "source,unary",
 	emit      => ". idiv%M %unop3",
 	latency   => 25,
 	units     => [ "GP" ],
@@ -695,7 +694,7 @@ Div => {
 	               out => [ "eax", "flags", "none", "edx", "none" ] },
 	ins       => [ "base", "index", "mem", "divisor", "dividend_low", "dividend_high" ],
 	outs      => [ "div_res", "flags", "M", "mod_res", "X_exc" ],
-	am        => "source,ternary",
+	am        => "source,unary",
 	emit      => ". div%M %unop3",
 	latency   => 25,
 	units     => [ "GP" ],
@@ -912,7 +911,7 @@ NegMem => {
 
 Minus64Bit => {
 	irn_flags => "R",
-	reg_req   => { in => [ "gp", "gp" ], out => [ "in_r1", "gp" ] },
+	reg_req   => { in => [ "gp", "gp" ], out => [ "in_r1", "in_r2" ] },
 	outs      => [ "low_res", "high_res" ],
 	units     => [ "GP" ],
 	latency   => 3,
@@ -930,7 +929,7 @@ Inc => {
 	units     => [ "GP" ],
 	mode      => $mode_gp,
 	latency   => 1,
-	modified_flags => [ "OF", "SF", "ZF", "AF", "PF" ]
+	modified_flags => $status_flags_wo_cf
 },
 
 IncMem => {
@@ -942,7 +941,7 @@ IncMem => {
 	units     => [ "GP" ],
 	mode      => "mode_M",
 	latency   => 1,
-	modified_flags => [ "OF", "SF", "ZF", "AF", "PF" ]
+	modified_flags => $status_flags_wo_cf
 },
 
 Dec => {
@@ -955,7 +954,7 @@ Dec => {
 	units     => [ "GP" ],
 	mode      => $mode_gp,
 	latency   => 1,
-	modified_flags => [ "OF", "SF", "ZF", "AF", "PF" ]
+	modified_flags => $status_flags_wo_cf
 },
 
 DecMem => {
@@ -967,7 +966,7 @@ DecMem => {
 	units     => [ "GP" ],
 	mode      => "mode_M",
 	latency   => 1,
-	modified_flags => [ "OF", "SF", "ZF", "AF", "PF" ]
+	modified_flags => $status_flags_wo_cf
 },
 
 Not => {
@@ -1400,7 +1399,7 @@ Enter => {
 },
 
 Leave => {
-	reg_req   => { in => [ "esp", "ebp" ], out => [ "ebp", "esp" ] },
+	reg_req   => { in => [ "ebp" ], out => [ "ebp", "esp" ] },
 	emit      => '. leave',
 	outs      => [ "frame:I", "stack:I|S" ],
 	latency   => 3,