X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fmaster-project%2Fc%CE%BBash.git;a=blobdiff_plain;f=clash%2FCLasH%2FHardwareTypes.hs;h=d66befeeacca9a89aa5c5b853b7fcad593bd00ee;hp=2912e50fe75bf98ab63bb4f31ba6ab421581656c;hb=63b8956c3d9c50a619e7a9fa674b533f7ef5f3a7;hpb=bebe01ce76e62bea88aba87d5cceecfab7a0c6c4 diff --git a/clash/CLasH/HardwareTypes.hs b/clash/CLasH/HardwareTypes.hs index 2912e50..d66befe 100644 --- a/clash/CLasH/HardwareTypes.hs +++ b/clash/CLasH/HardwareTypes.hs @@ -68,20 +68,17 @@ _ `hwxor` _ = Low hwnot High = Low hwnot Low = High -type RAM s a = Vector (s :+: D1) a - -type MemState s a = State (RAM s a) +type RAM s a = Vector s a +type MemState s a = State (RAM s a) blockRAM :: - (NaturalT s - ,PositiveT (s :+: D1) - ,((s :+: D1) :>: s) ~ True ) => - (MemState s a) -> + PositiveT s => + MemState s a -> a -> Index s -> Index s -> Bool -> - ((MemState s a), a ) + (MemState s a, a ) blockRAM (State mem) data_in rdaddr wraddr wrenable = ((State mem'), data_out) where