X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_spec.pl;h=e85f85bc72af285114a38f9817dc1eb65f2b749c;hb=0a86db8b16bcb48d0fdde8e1180f7a007ea2bf10;hp=1ba0d3b5f1215c7c0c381805f4dbb57fb5ba88dc;hpb=ce6161a7e42a48f7422b7babcc64d8ace18e2687;p=libfirm

diff --git a/ir/be/ia32/ia32_spec.pl b/ir/be/ia32/ia32_spec.pl
index 1ba0d3b5f..e85f85bc7 100644
--- a/ir/be/ia32/ia32_spec.pl
+++ b/ir/be/ia32/ia32_spec.pl
@@ -74,7 +74,7 @@ $state       = 32; # register represents a state
 	],
 	fp_cw => [	# the floating point control word
 		{ name => "fpcw", type => $ignore | $state },
-		{ mode => "mode_fpcw", flags => "manual_ra|state" }
+		{ mode => "ia32_mode_fpcw", flags => "manual_ra|state" }
 	],
 	flags => [
 		{ name => "eflags", type => 0 },
@@ -177,7 +177,10 @@ $custom_init_attr_func = \&ia32_custom_init_attr;
 		"\tinit_ia32_call_attributes(res, pop, call_tp);",
 	ia32_condcode_attr_t =>
 		"\tinit_ia32_attributes(res, flags, in_reqs, exec_units, n_res);\n".
-		"\tinit_ia32_condcode_attributes(res, pnc);",
+		"\tinit_ia32_condcode_attributes(res, condition_code);",
+	ia32_switch_attr_t =>
+		"\tinit_ia32_attributes(res, flags, in_reqs, exec_units, n_res);\n".
+		"\tinit_ia32_switch_attributes(res, default_pn);",
 	ia32_copyb_attr_t =>
 		"\tinit_ia32_attributes(res, flags, in_reqs, exec_units, n_res);\n".
 		"\tinit_ia32_copyb_attributes(res, size);",
@@ -193,10 +196,11 @@ $custom_init_attr_func = \&ia32_custom_init_attr;
 );
 
 %compare_attr = (
-	ia32_asm_attr_t       => "ia32_compare_asm_attr",
+	ia32_asm_attr_t        => "ia32_compare_asm_attr",
 	ia32_attr_t            => "ia32_compare_nodes_attr",
 	ia32_call_attr_t       => "ia32_compare_call_attr",
 	ia32_condcode_attr_t   => "ia32_compare_condcode_attr",
+	ia32_switch_attr_t     => "ia32_compare_switch_attr",
 	ia32_copyb_attr_t      => "ia32_compare_copyb_attr",
 	ia32_immediate_attr_t  => "ia32_compare_immediate_attr",
 	ia32_x87_attr_t        => "ia32_compare_x87_attr",
@@ -209,7 +213,7 @@ $custom_init_attr_func = \&ia32_custom_init_attr;
 $mode_xmm           = "mode_E";
 $mode_gp            = "mode_Iu";
 $mode_flags         = "mode_Iu";
-$mode_fpcw          = "mode_fpcw";
+$mode_fpcw          = "ia32_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",
@@ -932,9 +936,8 @@ Cmp => {
 	outs      => [ "eflags", "unused", "M" ],
 	am        => "source,binary",
 	emit      => '. cmp%M %binop',
-	attr      => "int ins_permuted, int cmp_unsigned",
-	init_attr => "attr->data.ins_permuted   = ins_permuted;\n".
-	             "\tattr->data.cmp_unsigned = cmp_unsigned;\n",
+	attr      => "bool ins_permuted",
+	init_attr => "attr->data.ins_permuted   = ins_permuted;",
 	latency   => 1,
 	units     => [ "GP" ],
 	mode      => $mode_flags,
@@ -950,15 +953,28 @@ Cmp8Bit => {
 	outs      => [ "eflags", "unused", "M" ],
 	am        => "source,binary",
 	emit      => '. cmpb %binop',
-	attr      => "int ins_permuted, int cmp_unsigned",
-	init_attr => "attr->data.ins_permuted   = ins_permuted;\n".
-	             "\tattr->data.cmp_unsigned = cmp_unsigned;\n",
+	attr      => "bool ins_permuted",
+	init_attr => "attr->data.ins_permuted   = ins_permuted;",
 	latency   => 1,
 	units     => [ "GP" ],
 	mode      => $mode_flags,
 	modified_flags => $status_flags
 },
 
+XorHighLow => {
+	irn_flags => [ "rematerializable" ],
+	state     => "exc_pinned",
+	reg_req   => { in => [ "eax ebx ecx edx" ],
+	               out => [ "in_r1", "flags" ] },
+	emit      => '. xorb %SH0, %SB0',
+	ins       => [ "value" ],
+	outs      => [ "res", "flags" ],
+	units     => [ "GP" ],
+	latency   => 1,
+	mode      => $mode_gp,
+	modified_flags => $status_flags,
+},
+
 Test => {
 	irn_flags => [ "rematerializable" ],
 	state     => "exc_pinned",
@@ -968,9 +984,8 @@ Test => {
 	outs      => [ "eflags", "unused", "M" ],
 	am        => "source,binary",
 	emit      => '. test%M %binop',
-	attr      => "int ins_permuted, int cmp_unsigned",
-	init_attr => "attr->data.ins_permuted = ins_permuted;\n".
-	             "\tattr->data.cmp_unsigned = cmp_unsigned;\n",
+	attr      => "bool ins_permuted",
+	init_attr => "attr->data.ins_permuted = ins_permuted;",
 	latency   => 1,
 	units     => [ "GP" ],
 	mode      => $mode_flags,
@@ -986,9 +1001,8 @@ Test8Bit => {
 	outs      => [ "eflags", "unused", "M" ],
 	am        => "source,binary",
 	emit      => '. testb %binop',
-	attr      => "int ins_permuted, int cmp_unsigned",
-	init_attr => "attr->data.ins_permuted = ins_permuted;\n".
-	             "\tattr->data.cmp_unsigned = cmp_unsigned;\n",
+	attr      => "bool ins_permuted",
+	init_attr => "attr->data.ins_permuted = ins_permuted;",
 	latency   => 1,
 	units     => [ "GP" ],
 	mode      => $mode_flags,
@@ -1001,11 +1015,11 @@ Setcc => {
 	ins       => [ "eflags" ],
 	outs      => [ "res" ],
 	attr_type => "ia32_condcode_attr_t",
-	attr      => "int pnc",
+	attr      => "ia32_condition_code_t condition_code",
 	# The way we handle Setcc with float nodes (potentially) destroys the flags
 	# (when we emit the setX; setp; orb and the setX;setnp;andb sequences)
 	init_attr => "set_ia32_ls_mode(res, mode_Bu);\n"
-		. "\tif ((pnc & ia32_pn_Cmp_float) && ((pnc & 0xf) != pn_Cmp_Uo) && ((pnc & 0xf) != pn_Cmp_Leg)) {\n"
+		. "\tif (condition_code & ia32_cc_additional_float_cases) {\n"
 		. "\t\tarch_irn_add_flags(res, arch_irn_flags_modify_flags);\n"
 		. "\t\t/* attr->latency = 3; */\n"
 		. "\t}\n",
@@ -1020,7 +1034,7 @@ SetccMem => {
 	reg_req   => { in => [ "gp", "gp", "none", "eflags" ], out => [ "none" ] },
 	ins       => [ "base", "index", "mem","eflags" ],
 	attr_type => "ia32_condcode_attr_t",
-	attr      => "int pnc",
+	attr      => "ia32_condition_code_t condition_code",
 	init_attr => "set_ia32_ls_mode(res, mode_Bu);\n",
 	emit      => '. set%CMP3 %AM',
 	latency   => 1,
@@ -1039,7 +1053,7 @@ CMovcc => {
 	outs      => [ "res", "flags", "M" ],
 	am        => "source,binary",
 	attr_type => "ia32_condcode_attr_t",
-	attr      => "int pnc",
+	attr      => "ia32_condition_code_t condition_code",
 	latency   => 1,
 	units     => [ "GP" ],
 	mode      => $mode_gp,
@@ -1052,7 +1066,7 @@ Jcc => {
 	ins       => [ "eflags" ],
 	outs      => [ "false", "true" ],
 	attr_type => "ia32_condcode_attr_t",
-	attr      => "int pnc",
+	attr      => "ia32_condition_code_t condition_code",
 	latency   => 2,
 	units     => [ "BRANCH" ],
 },
@@ -1062,8 +1076,8 @@ SwitchJmp => {
 	op_flags  => [ "labeled", "cfopcode", "forking" ],
 	reg_req   => { in => [ "gp" ] },
 	mode      => "mode_T",
-	attr_type => "ia32_condcode_attr_t",
-	attr      => "long pnc",
+	attr_type => "ia32_switch_attr_t",
+	attr      => "long default_pn",
 	latency   => 3,
 	units     => [ "BRANCH" ],
 	modified_flags => $status_flags,
@@ -1849,7 +1863,7 @@ Ucomi => {
 	ins       => [ "base", "index", "mem", "left", "right" ],
 	outs      => [ "flags" ],
 	am        => "source,binary",
-	attr      => "int ins_permuted",
+	attr      => "bool ins_permuted",
 	init_attr => "attr->data.ins_permuted = ins_permuted;",
 	emit      => ' .ucomi%XXM %binop',
 	latency   => 3,
@@ -2258,7 +2272,7 @@ vFucomFnstsw => {
 	reg_req   => { in => [ "vfp", "vfp" ], out => [ "eax" ] },
 	ins       => [ "left", "right" ],
 	outs      => [ "flags" ],
-	attr      => "int ins_permuted",
+	attr      => "bool ins_permuted",
 	init_attr => "attr->attr.data.ins_permuted = ins_permuted;",
 	latency   => 3,
 	units     => [ "VFP" ],
@@ -2271,7 +2285,7 @@ vFucomi => {
 	reg_req   => { in => [ "vfp", "vfp" ], out => [ "eflags" ] },
 	ins       => [ "left", "right" ],
 	outs      => [ "flags" ],
-	attr      => "int ins_permuted",
+	attr      => "bool ins_permuted",
 	init_attr => "attr->attr.data.ins_permuted = ins_permuted;",
 	latency   => 3,
 	units     => [ "VFP" ],
@@ -2284,7 +2298,7 @@ vFtstFnstsw => {
 	reg_req   => { in => [ "vfp" ], out => [ "eax" ] },
 	ins       => [ "left" ],
 	outs      => [ "flags" ],
-	attr      => "int ins_permuted",
+	attr      => "bool ins_permuted",
 	init_attr => "attr->attr.data.ins_permuted = ins_permuted;",
 	latency   => 3,
 	units     => [ "VFP" ],