X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=clash%2FCLasH%2FVHDL%2FConstants.hs;h=980dcd10cd7ccc8ca3d8671c25bdad6fe90a7ac5;hb=3f39038911a675d91b5147761e16296d3ab25743;hp=c70ca71a04258b589b76798815a9a509ec4c9bb3;hpb=04f836932ad17dd557af0ba388a12d2b74c1e7d7;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git

diff --git a/clash/CLasH/VHDL/Constants.hs b/clash/CLasH/VHDL/Constants.hs
index c70ca71..980dcd1 100644
--- a/clash/CLasH/VHDL/Constants.hs
+++ b/clash/CLasH/VHDL/Constants.hs
@@ -8,14 +8,14 @@ import qualified Language.VHDL.AST as AST
 -- circular dependencie.
 builtinIds = [ exId, replaceId, headId, lastId, tailId, initId, takeId, dropId
              , selId, plusgtId, ltplusId, plusplusId, mapId, zipWithId, foldlId
-             , foldrId, zipId, unzipId, shiftlId, shiftrId, rotlId, rotrId
+             , foldrId, zipId, unzipId, shiftIntoLId, shiftIntoRId, rotlId, rotrId
              , concatId, reverseId, iteratenId, iterateId, generatenId, generateId
              , emptyId, singletonId, copynId, copyId, lengthTId, nullId
              , hwxorId, hwandId, hworId, hwnotId, equalityId, inEqualityId, ltId
              , lteqId, gtId, gteqId, boolOrId, boolAndId, plusId, timesId
              , negateId, minusId, fromSizedWordId, fromIntegerId, resizeWordId
              , resizeIntId, sizedIntId, smallIntegerId, fstId, sndId, blockRAMId
-             , splitId, minimumId, fromRangedWordId 
+             , splitId, minimumId, fromRangedWordId, xorId, shiftLId , shiftRId
              ]
 --------------
 -- Identifiers
@@ -154,12 +154,12 @@ dropId :: String
 dropId = "drop"
 
 -- | shiftl function identifier
-shiftlId :: String
-shiftlId = "shiftl"
+shiftIntoLId :: String
+shiftIntoLId = "shiftIntoL"
 
 -- | shiftr function identifier
-shiftrId :: String
-shiftrId = "shiftr"
+shiftIntoRId :: String
+shiftIntoRId = "shiftIntoR"
 
 -- | rotl function identifier
 rotlId :: String
@@ -241,6 +241,15 @@ hwnotId = "hwnot"
 hwandId :: String
 hwandId = "hwand"
 
+xorId :: String
+xorId = "xor"
+
+shiftLId :: String
+shiftLId = "shiftL"
+
+shiftRId :: String
+shiftRId = "shiftR"
+
 lengthTId :: String
 lengthTId = "lengthT"
 
@@ -344,7 +353,7 @@ showIdString :: String
 showIdString = "show"
 
 showId :: AST.VHDLId
-showId = AST.unsafeVHDLExtId showIdString
+showId = AST.unsafeVHDLBasicId showIdString
 
 -- | write function identifier (from std.textio)
 writeId :: AST.VHDLId