Give the index type an exclusive upper-bound, and fix related types accordingly

[matthijs/master-project/cλash.git] / reducer.hs

diff --git a/reducer.hs b/reducer.hs
index ce4025e0007194a5584fb9469b4d28a5b20eaa3b..39e136f5ef9f7b79b472995ad0dc3ed9adb03aaf 100644 (file)
--- a/reducer.hs
+++ b/reducer.hs
@@ -15,7 +15,7 @@ type DiscrSize      = D7
 type AdderDepth     = D12
 
 -- Derived configuration variables
-type DiscrRange     = (Pow2 DiscrSize) :-: D1
+type DiscrRange     = Pow2 DiscrSize
 type AdderDepthPL   = AdderDepth :+: D3
 
 -- =================
@@ -65,8 +65,8 @@ type RippleState =
 
 data BlockRecord = 
   Block { ptrs    ::  (Unsigned D4, Unsigned D4, Unsigned D4)
-        , buf1    ::  MemState AdderDepthPL DataInt
-        , buf2    ::  MemState AdderDepthPL DataInt
+        , buf1    ::  MemState (AdderDepthPL :+: D1) DataInt
+        , buf2    ::  MemState (AdderDepthPL :+: D1) DataInt
         }
 type BlockState = State BlockRecord