From f853a467030bf29c631b7e9c25bb4ef76bc8693b Mon Sep 17 00:00:00 2001
From: Vojta Mrazek <mrazek@fit.vutbr.cz>
Date: Thu, 13 Apr 2023 12:09:07 +0200
Subject: [PATCH] CGP circuit checks

---
 ariths_gen/core/cgp_circuit.py      | 11 +++++++++--
 ariths_gen/wire_components/wires.py |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ariths_gen/core/cgp_circuit.py b/ariths_gen/core/cgp_circuit.py
index 075155d..ae4e3df 100644
--- a/ariths_gen/core/cgp_circuit.py
+++ b/ariths_gen/core/cgp_circuit.py
@@ -60,8 +60,12 @@ class UnsignedCGPCircuit(GeneralCircuit):
             i, in_a, in_b, fn = map(int, re.match(
                 r"\(?\[(\d+)\](\d+),(\d+),(\d+)\)?", definition).groups())
 
-            assert in_a < i
-            assert in_b < i
+            if in_a > i or in_b > i:
+                raise ValueError(f"Backward connection in CGP gene \"{definition}\", maxid = {i}")
+
+            if in_a == i or in_b == i:
+                raise ValueError(f"Loop connection in CGP gene: \"{definition}\", maxid = {i}")
+
             comp_set = dict(prefix=f"{self.prefix}_core_{i:03d}", parent_component=self)
 
             a, b = self._get_wire(in_a), self._get_wire(in_b)
@@ -91,6 +95,9 @@ class UnsignedCGPCircuit(GeneralCircuit):
 
         # Output connection
         for i, o in enumerate(map(int, cgp_outputs.split(","))):
+            if o >= c_in + c_rows * c_cols + 2:
+                raise ValueError(
+                    f"Output {i} is connected to wire {o} which is not in the range of CGP wires ({c_in + c_rows * c_cols + 2})")
             w = self._get_wire(o)
             self.out.connect(i, w)
 
diff --git a/ariths_gen/wire_components/wires.py b/ariths_gen/wire_components/wires.py
index 8a68d1e..c34240b 100644
--- a/ariths_gen/wire_components/wires.py
+++ b/ariths_gen/wire_components/wires.py
@@ -99,7 +99,7 @@ class Wire():
         if self.is_const():
             return f"({self.c_const}) << {offset};\n"
         else:
-            return f"(({self.name} >> 0) & 0x01ull) << {offset};\n"
+            return f"(({self.prefix} >> {self.index}) & 0x01ull) << {offset};\n"
 
     def return_wire_value_c_hier(self, offset: int = 0):
         """Retrieves desired bit value from wire represented in C code variable and bitwise shifts it to desired position for storing it within a bus for hierarchical generation.