From 4f11ff8ebd23d1f74aae6296ff0a4f792ac97749 Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddie@fpgeh.com>
Date: Tue, 23 Jul 2019 13:58:56 -0700
Subject: [PATCH] Fix typo

---
 passes/pmgen/ice40_dsp.pmg | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/passes/pmgen/ice40_dsp.pmg b/passes/pmgen/ice40_dsp.pmg
index 0684edc1b..73ece6962 100644
--- a/passes/pmgen/ice40_dsp.pmg
+++ b/passes/pmgen/ice40_dsp.pmg
@@ -1,8 +1,8 @@
 pattern ice40_dsp
 
 state <SigBit> clock
-state <bool> clock_pol sigO_signed
-state <SigSpec> sigA sigB sigH sigO
+state <bool> clock_pol sigCD_signed
+state <SigSpec> sigA sigB sigCD sigH sigO
 state <Cell*> addAB muxAB
 
 match mul
@@ -94,14 +94,16 @@ match addB
 	optional
 endmatch
 
-code addAB sigO sigO_signed
+code addAB sigCD sigCD_signed sigO
 	if (addA) {
 		addAB = addA;
-		sigO_signed = param(addAB, \B_SIGNED).as_bool();
+		sigCD = port(addAB, \B);
+		sigCD_signed = param(addAB, \B_SIGNED).as_bool();
 	}
 	if (addB) {
 		addAB = addB;
-		sigO_signed = param(addAB, \A_SIGNED).as_bool();
+		sigCD = port(addAB, \A);
+		sigCD_signed = param(addAB, \A_SIGNED).as_bool();
 	}
 	if (addAB) {
 		int natural_mul_width = GetSize(sigA) + GetSize(sigB);
@@ -118,30 +120,36 @@ code addAB sigO sigO_signed
 endcode
 
 match muxA
-	if addAB
+	if sigCD.empty()
 	select muxA->type.in($mux)
 	select nusers(port(muxA, \A)) == 2
-	index <SigSpec> port(muxA, \A) === port(addAB, \Y)
+	index <SigSpec> port(muxA, \A) === sigO
 	optional
 endmatch
 
 match muxB
-	if addAB
+	if sigCD.empty()
 	if !muxA
 	select muxB->type.in($mux)
 	select nusers(port(muxB, \B)) == 2
-	index <SigSpec> port(muxB, \B) === port(addAB, \Y)
+	index <SigSpec> port(muxB, \B) === sigO
 	optional
 endmatch
 
-code muxAB sigO
+code muxAB sigCD sigCD_signed sigO
 	muxAB = addAB;
-	if (muxA)
+	if (muxA) {
 		muxAB = muxA;
-	if (muxB)
+		sigCD = port(muxAB, \B);
+	}
+	if (muxB) {
 		muxAB = muxB;
-	if (muxA || muxB)
+		sigCD = port(muxAB, \A);
+	}
+	if (muxA || muxB) {
 		sigO = port(muxAB, \Y);
+		sigCD_signed = addAB && param(addAB, \A_SIGNED).as_bool() && param(addAB, \B_SIGNED).as_bool();
+	}
 endcode
 
 match ffO_lo
-- 
2.30.2