ia32: Use the normal Xor node for 8/16 bit zeroing.

ir/be/ia32/ia32_optimize.c

@@ -135,6 +135,19 @@ check_shift_amount:
 	return pn == pn_ia32_res ? produces_zero_sign : produces_no_flag;
 }
 
+static void make_xor(ir_node *const and, ir_node *(*const cons)(dbg_info*, ir_node*, ir_node*, ir_node*, ir_node*, ir_node*, ir_node*), ir_mode *const mode, arch_register_t const *const reg)
+{
+	dbg_info *const dbgi  = get_irn_dbg_info(and);
+	ir_node  *const block = get_nodes_block(and);
+	ir_node  *const noreg = get_irn_n(and, n_ia32_And_base);
+	ir_node  *const nomem = get_irn_n(and, n_ia32_And_mem);
+	ir_node  *const left  = get_irn_n(and, n_ia32_And_left);
+	ir_node  *const xor   = cons(dbgi, block, noreg, noreg, nomem, left, left);
+	set_ia32_ls_mode(xor, mode);
+	arch_set_irn_register_out(xor, pn_ia32_Xor_res, reg);
+	replace(and, xor);
+}
+
 /**
  * Use shorter instructions:
  * x & 0xFFFFFF00 -> xorb x, x (6 bytes -> 2 bytes)
@@ -155,21 +168,12 @@ static void peephole_ia32_And(ir_node *const node)
 	if (get_irn_mode(node) == mode_T && get_Proj_for_pn(node, pn_ia32_And_flags))
 		return;
 
-	ir_node                   *(*cons)(dbg_info*, ir_node*, ir_node*);
 	arch_register_t const *const reg = arch_get_irn_register_out(node, pn_ia32_And_res);
 	uint32_t               const val = imm->imm.offset;
 	if (val == 0xFFFF0000) {
-		cons = &new_bd_ia32_Xor0Low_w;
-		goto make_xor0;
+		make_xor(node, &new_bd_ia32_Xor, mode_Hu, reg);
 	} else if (val == 0xFFFFFF00 && is_hl_register(reg)) {
-		cons = &new_bd_ia32_Xor0Low_b;
-make_xor0:;
-		dbg_info *const dbgi  = get_irn_dbg_info(node);
-		ir_node  *const block = get_nodes_block(node);
-		ir_node  *const left  = get_irn_n(node, n_ia32_And_left);
-		ir_node  *const xor0  = cons(dbgi, block, left);
-		arch_set_irn_register_out(xor0, pn_ia32_Xor0Low_res, reg);
-		replace(node, xor0);
+		make_xor(node, &new_bd_ia32_Xor_8bit, mode_Bu, reg);
 	}
 }
 

ir/be/ia32/ia32_spec.pl

@@ -123,7 +123,10 @@ my $x87sim = "ia32_request_x87_sim(irg);";
 my $binop_commutative = {
 	irn_flags => [ "modify_flags", "rematerializable" ],
 	state     => "exc_pinned",
-	in_reqs   => [ "gp", "gp", "mem", "gp", "gp" ],
+	constructors => {
+		""     => { in_reqs => [ "gp", "gp", "mem", "gp", "gp" ] },
+		"8bit" => { in_reqs => [ "gp", "gp", "mem", "eax ebx ecx edx", "eax ebx ecx edx" ] }
+	},
 	out_reqs  => [ "in_r3 in_r4", "flags", "mem" ],
 	ins       => [ "base", "index", "mem", "left", "right" ],
 	outs      => [ "res", "flags", "M" ],
@@ -485,7 +488,7 @@ OrMem => {
 
 Xor => {
 	template => $binop_commutative,
-	emit     => "xor%M %B",
+	emit     => "xor%M %#B",
 	latency  => 1,
 },
 
@@ -1177,26 +1180,6 @@ CmpXChgMem => {
 	latency   => 2,
 },
 
-Xor0Low => {
-	irn_flags    => [ "rematerializable" ],
-	state        => "exc_pinned",
-	constructors => {
-		"b" => {
-			in_reqs => [ "eax ebx ecx edx" ],
-			init    => "attr->ls_mode = mode_Bu;",
-		},
-		"w" => {
-			in_reqs => [ "gp" ],
-			init    => "attr->ls_mode = mode_Hu;",
-		},
-	},
-	out_reqs  => [ "in_r0" ],
-	ins       => [ "src" ],
-	outs      => [ "res" ],
-	emit      => "xor%M %D0, %D0",
-	latency   => 1,
-},
-
 Breakpoint => {
 	template => $memop,
 	latency  => 0,