From 99746956a677e73a022d98a4823d780e45fb1b5e Mon Sep 17 00:00:00 2001
From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Mon, 25 Oct 2021 18:52:48 +0100
Subject: [PATCH] hooray, convert PartitionedCat over to new PartType API,
 using get_num_elements and get_el_range

---
 src/ieee754/part/partsig.py |  4 ++--
 src/ieee754/part_cat/cat.py | 16 ++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/ieee754/part/partsig.py b/src/ieee754/part/partsig.py
index cf1e6678..af2057a2 100644
--- a/src/ieee754/part/partsig.py
+++ b/src/ieee754/part/partsig.py
@@ -108,10 +108,10 @@ class PartType:  # TODO decide name
         runs = get_runlengths(pbit, len(keys))
         keys = [0] + keys + [len(self.psig.sig)]
         y = 0
-        numparts = runs[0]
         for i in range(el_num):
-            y += numparts
             numparts = runs[i]
+            y += numparts
+        numparts = runs[el_num]
         return range(keys[y], keys[y+numparts])
 
     @property
diff --git a/src/ieee754/part_cat/cat.py b/src/ieee754/part_cat/cat.py
index 1f42d3f0..9479a145 100644
--- a/src/ieee754/part_cat/cat.py
+++ b/src/ieee754/part_cat/cat.py
@@ -112,13 +112,14 @@ class PartitionedCat(Elaboratable):
                 # then when called below in the inner nested loop they give
                 # the relevant sequential chunk
                 output = []
-                y = [0] * len(self.catlist)
+                nelts = self.ptype.get_num_elements(pbit)
                 # get a list of the length of each partition run
-                runlengths = get_runlengths(pbit, len(keys))
-                print ("pbit", bin(pbit), "runs", runlengths)
-                for i in runlengths: # for each partition
-                    for yidx in range(len(y)):
-                        thing = self.get_chunk(y, yidx, i) # sequential chunks
+                #runlengths = get_runlengths(pbit, len(keys))
+                print ("pbit", bin(pbit), "nelts", nelts)
+                for i in range(nelts): # for each element
+                    for x in self.catlist:
+                        trange = x.ptype.get_el_range(pbit, i)
+                        thing = x.sig[trange.start:trange.stop:trange.step]
                         output.append(thing)
                 with m.Case(pbit):
                     # direct access to the underlying Signal
@@ -142,8 +143,11 @@ if __name__ == "__main__":
     mask = Signal(3)
     a = SimdSignal(mask, 32)
     b = SimdSignal(mask, 16)
+    a.set_module(m)
+    b.set_module(m)
     catlist = [a, b]
     m.submodules.cat = cat = PartitionedCat(catlist, a.ptype)
+    cat.set_lhs_mode(False)
 
     traces = cat.ports()
     sim = create_simulator(m, traces, "partcat")
-- 
2.30.2