From 9bf85f6e379701ee65e53762b8ef5fa32c831f1c Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Sun, 22 Jun 2025 11:21:17 +0200
Subject: [PATCH] Use CP_OUT for adders

---
 himbaechel/uarch/gatemate/constids.inc | 9 +++++++--
 himbaechel/uarch/gatemate/pack_cpe.cc  | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/himbaechel/uarch/gatemate/constids.inc b/himbaechel/uarch/gatemate/constids.inc
index ad679457..3e0cd9e8 100644
--- a/himbaechel/uarch/gatemate/constids.inc
+++ b/himbaechel/uarch/gatemate/constids.inc
@@ -911,6 +911,7 @@ X(IN2)
 X(IN3)
 X(IN4)
 X(OUT)
+X(CP_OUT)
 
 // hardware primitive CPE_FF_U
 X(CPE_FF_U)
@@ -937,6 +938,10 @@ X(CPE_LT_L)
 //X(IN3)
 //X(IN4)
 //X(OUT)
+//X(CP_OUT)
+X(MUX_OUT)
+X(CINY1)
+X(COUTY1)
 
 // hardware primitive CPE_FF_L
 X(CPE_FF_L)
@@ -974,13 +979,13 @@ X(CPE_LINES)
 // CPE_LINES pins
 X(CINX)
 X(PINX)
-X(CINY1)
+//X(CINY1)
 X(PINY1)
 X(CINY2)
 X(PINY2)
 X(COUTX)
 X(POUTX)
-X(COUTY1)
+//X(COUTY1)
 X(POUTY1)
 X(COUTY2)
 X(POUTY2)
diff --git a/himbaechel/uarch/gatemate/pack_cpe.cc b/himbaechel/uarch/gatemate/pack_cpe.cc
index c29a988a..d49a972b 100644
--- a/himbaechel/uarch/gatemate/pack_cpe.cc
+++ b/himbaechel/uarch/gatemate/pack_cpe.cc
@@ -556,7 +556,7 @@ void GateMatePacker::pack_addf()
                             break;
                         }
                     }
-                    cy->movePortTo(id_CO, upper, id_OUT);
+                    cy->movePortTo(id_CO, upper, id_CP_OUT);
                 }
             }
         }