From 7e8cc6c8c18c25ca28689e5e1f7f82d5abd198d8 Mon Sep 17 00:00:00 2001
From: Robin Redeker <rredeker@ipd.info.uni-karlsruhe.de>
Date: Tue, 29 Jun 2010 14:20:29 +0000
Subject: [PATCH] amd64: Added Mul.

[r27674]
---
 ir/be/amd64/amd64_emitter.c   |  3 ---
 ir/be/amd64/amd64_spec.pl     | 20 +++++++++++---------
 ir/be/amd64/amd64_transform.c | 15 +++++++++++++++
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/ir/be/amd64/amd64_emitter.c b/ir/be/amd64/amd64_emitter.c
index 172665f52..69729977b 100644
--- a/ir/be/amd64/amd64_emitter.c
+++ b/ir/be/amd64/amd64_emitter.c
@@ -442,8 +442,6 @@ static void emit_amd64_binop_op(const ir_node *irn, int second_op)
 {
 	if (irn->op == op_amd64_Add) {
 		be_emit_cstring("\tadd ");
-	} else if (irn->op == op_amd64_Mul) {
-		be_emit_cstring("\tmul ");
 	} else if (irn->op == op_amd64_Sub) {
 		be_emit_cstring("\tsub ");
 	}
@@ -517,7 +515,6 @@ static void amd64_register_emitters(void)
 	set_emitter(op_be_IncSP,         emit_be_IncSP);
 
 	set_emitter(op_amd64_Add,        emit_amd64_binop);
-	set_emitter(op_amd64_Mul,        emit_amd64_binop);
 
 	set_emitter(op_be_Start,         emit_nothing);
 	set_emitter(op_be_Keep,          emit_nothing);
diff --git a/ir/be/amd64/amd64_spec.pl b/ir/be/amd64/amd64_spec.pl
index 3158e98f2..75b491190 100644
--- a/ir/be/amd64/amd64_spec.pl
+++ b/ir/be/amd64/amd64_spec.pl
@@ -214,15 +214,17 @@ Add => {
 	modified_flags => 1,
 },
 Mul => {
-	op_flags   => "C",
-	irn_flags  => "R",
-	state      => "exc_pinned",
-	reg_req    => { in => [ "gp", "gp" ],
-	                out => [ "gp" ] },
-	in         => [ "left", "right" ],
-	outs       => [ "res" ],
-	mode       => $mode_gp,
-	modified_flags => 1,
+	# we should not rematrialize this node. It produces 2 results and has
+	# very strict constraints
+	state     => "exc_pinned",
+	reg_req   => { in  => [ "rax", "gp" ],
+	               out => [ "rax rdx" ] },
+	ins       => [ "left", "right" ],
+	emit      => '. mul %S2',
+	outs      => [ "res" ],
+	mode      => $mode_gp,
+	am        => "source,binary",
+	modified_flags => $status_flags
 },
 Sub => {
 	irn_flags  => "R",
diff --git a/ir/be/amd64/amd64_transform.c b/ir/be/amd64/amd64_transform.c
index 911644659..958f7627f 100644
--- a/ir/be/amd64/amd64_transform.c
+++ b/ir/be/amd64/amd64_transform.c
@@ -139,6 +139,20 @@ static ir_node *gen_Add(ir_node *node) {
 	return res;
 }
 
+static ir_node *gen_Mul(ir_node *node) {
+	ir_node  *block = be_transform_node(get_nodes_block(node));
+	/* ir_mode  *mode  = get_irn_mode(node); */
+	ir_node  *op1   = get_Mul_left(node);
+	ir_node  *op2   = get_Mul_right(node);
+	dbg_info *dbgi  = get_irn_dbg_info(node);
+	ir_node  *new_op1 = be_transform_node(op1);
+	ir_node  *new_op2 = be_transform_node(op2);
+
+	ir_node *res = new_bd_amd64_Mul(dbgi, block, new_op1, new_op2);
+	be_dep_on_frame (res);
+	return res;
+}
+
 static ir_node *gen_Jmp(ir_node *node)
 {
 	ir_node  *block     = get_nodes_block(node);
@@ -551,6 +565,7 @@ static void amd64_register_transformers(void)
 	set_transformer(op_Const,        gen_Const);
 	set_transformer(op_SymConst,     gen_SymConst);
 	set_transformer(op_Add,          gen_Add);
+	set_transformer(op_Mul,          gen_Mul);
 	set_transformer(op_be_Call,      gen_be_Call);
 	set_transformer(op_be_FrameAddr, gen_be_FrameAddr);
 	set_transformer(op_Conv,         gen_Conv);
-- 
2.20.1