Reworked readwriter types

2 files changed, 16 insertions, 18 deletions

diff --git a/test/features/IsInvalid.fir b/test/features/IsInvalid.fir
index fbb69ef7..cf898fe9 100644
--- a/test/features/IsInvalid.fir
+++ b/test/features/IsInvalid.fir
@@ -52,18 +52,17 @@ circuit Top :
 ;CHECK: m.w.addr is invalid
 ;CHECK: m.w.en is invalid
 ;CHECK: m.w.clk is invalid
-;CHECK: m.rw.wdata[0] is invalid
-;CHECK: m.rw.wdata[1] is invalid
-;CHECK: m.rw.wdata[2] is invalid
-;CHECK: m.rw.wdata[3] is invalid
-;CHECK: m.rw.wmask[0] is invalid
-;CHECK: m.rw.wmask[1] is invalid
-;CHECK: m.rw.wmask[2] is invalid
-;CHECK: m.rw.wmask[3] is invalid
-;CHECK: m.rw.waddr is invalid
-;CHECK: m.rw.wen is invalid
-;CHECK: m.rw.raddr is invalid
-;CHECK: m.rw.ren is invalid
+;CHECK: m.rw.rmode is invalid
+;CHECK: m.rw.data[0] is invalid
+;CHECK: m.rw.data[1] is invalid
+;CHECK: m.rw.data[2] is invalid
+;CHECK: m.rw.data[3] is invalid
+;CHECK: m.rw.mask[0] is invalid
+;CHECK: m.rw.mask[1] is invalid
+;CHECK: m.rw.mask[2] is invalid
+;CHECK: m.rw.mask[3] is invalid
+;CHECK: m.rw.addr is invalid
+;CHECK: m.rw.en is invalid
 ;CHECK: m.rw.clk is invalid
 ;CHECK: x.w is invalid
 ;CHECK: x.x is invalid
diff --git a/test/features/Poison.fir b/test/features/Poison.fir
index 2b47411f..a4cb1a25 100644
--- a/test/features/Poison.fir
+++ b/test/features/Poison.fir
@@ -27,12 +27,11 @@ circuit Poison :
     m.w.data <= q
 
     m.rw.clk <= clk
-    m.rw.raddr <= index
-    m.rw.ren <= UInt(1)
-    m.rw.waddr <= index
-    m.rw.wen <= UInt(1)
-    m.rw.wmask <= wmask
-    m.rw.wdata <= q
+    m.rw.addr <= index
+    m.rw.en <= UInt(1)
+    m.rw.rmode <= UInt(1)
+    m.rw.mask <= wmask
+    m.rw.data <= q
     when p : 
       out <= m.r.data
     else :