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
Work around some bugs in the current clash to make reducer compile correctly
[matthijs/master-project/cλash.git]
/
cλash
/
CLasH
/
VHDL
/
Constants.hs
diff --git
a/cλash/CLasH/VHDL/Constants.hs
b/cλash/CLasH/VHDL/Constants.hs
index f465d848642c6e8b47e92716ea652af784992f03..71c1c2135b7b1b1d092505279bf91388577d2b5a 100644
(file)
--- a/
cλash/CLasH/VHDL/Constants.hs
+++ b/
cλash/CLasH/VHDL/Constants.hs
@@
-16,6
+16,8
@@
resetId, clockId :: AST.VHDLId
resetId = AST.unsafeVHDLBasicId resetStr
clockId = AST.unsafeVHDLBasicId clockStr
resetId = AST.unsafeVHDLBasicId resetStr
clockId = AST.unsafeVHDLBasicId clockStr
+integerId :: AST.VHDLId
+integerId = AST.unsafeVHDLBasicId "integer"
-- | \"types\" identifier
typesId :: AST.VHDLId
-- | \"types\" identifier
typesId :: AST.VHDLId
@@
-123,6
+125,9
@@
initId = "init"
tailId :: String
tailId = "tail"
tailId :: String
tailId = "tail"
+-- | minimum ftp function identifier
+minimumId :: String
+minimumId = "minimum"
-- | take function identifier
takeId :: String
-- | take function identifier
takeId :: String
@@
-224,6
+229,25
@@
hwandId = "hwand"
lengthTId :: String
lengthTId = "lengthT"
lengthTId :: String
lengthTId = "lengthT"
+fstId :: String
+fstId = "fst"
+
+sndId :: String
+sndId = "snd"
+
+-- Equality Operations
+equalityId :: String
+equalityId = "=="
+
+inEqualityId :: String
+inEqualityId = "/="
+
+boolOrId :: String
+boolOrId = "||"
+
+boolAndId :: String
+boolAndId = "&&"
+
-- Numeric Operations
-- | plus operation identifier
-- Numeric Operations
-- | plus operation identifier
@@
-261,12
+285,24
@@
toUnsignedId = "to_unsigned"
resizeId :: String
resizeId = "resize"
resizeId :: String
resizeId = "resize"
+smallIntegerId :: String
+smallIntegerId = "smallInteger"
+
+sizedIntId :: String
+sizedIntId = "SizedInt"
+
+tfvecId :: String
+tfvecId = "TFVec"
+
+blockRAMId :: String
+blockRAMId = "blockRAM"
+
-- | output file identifier (from std.textio)
showIdString :: String
showIdString = "show"
showId :: AST.VHDLId
-- | output file identifier (from std.textio)
showIdString :: String
showIdString = "show"
showId :: AST.VHDLId
-showId = AST.unsafeVHDL
Basic
Id showIdString
+showId = AST.unsafeVHDL
Ext
Id showIdString
-- | write function identifier (from std.textio)
writeId :: AST.VHDLId
-- | write function identifier (from std.textio)
writeId :: AST.VHDLId
@@
-311,3
+347,11
@@
signedTM = AST.unsafeVHDLBasicId "signed"
-- | unsigned TypeMark
unsignedTM :: AST.TypeMark
unsignedTM = AST.unsafeVHDLBasicId "unsigned"
-- | unsigned TypeMark
unsignedTM :: AST.TypeMark
unsignedTM = AST.unsafeVHDLBasicId "unsigned"
+
+-- | string TypeMark
+stringTM :: AST.TypeMark
+stringTM = AST.unsafeVHDLBasicId "string"
+
+-- | tup VHDLName suffix
+tupVHDLSuffix :: AST.VHDLId -> AST.Suffix
+tupVHDLSuffix id = AST.SSimple id
\ No newline at end of file