projects
/
matthijs
/
master-project
/
cλash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Give the index type an exclusive upper-bound, and fix related types accordingly
[matthijs/master-project/cλash.git]
/
clash
/
CLasH
/
HardwareTypes.hs
diff --git
a/clash/CLasH/HardwareTypes.hs
b/clash/CLasH/HardwareTypes.hs
index 2912e50fe75bf98ab63bb4f31ba6ab421581656c..d66befeeacca9a89aa5c5b853b7fcad593bd00ee 100644
(file)
--- a/
clash/CLasH/HardwareTypes.hs
+++ b/
clash/CLasH/HardwareTypes.hs
@@
-68,20
+68,17
@@
_ `hwxor` _ = Low
hwnot High = Low
hwnot Low = High
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 ::
blockRAM ::
- (NaturalT s
- ,PositiveT (s :+: D1)
- ,((s :+: D1) :>: s) ~ True ) =>
- (MemState s a) ->
+ PositiveT s =>
+ MemState s a ->
a ->
Index s ->
Index s ->
Bool ->
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
blockRAM (State mem) data_in rdaddr wraddr wrenable =
((State mem'), data_out)
where