X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=c%CE%BBash%2FCLasH%2FVHDL%2FConstants.hs;h=c70ca71a04258b589b76798815a9a509ec4c9bb3;hb=e1ef152dc63f28dddce2de4950ec739c79c8d18f;hp=b9cbb0b1853b0949ebac5be513f1418151f5ddcb;hpb=0dcd1ce078cbae64bc2b968b4c8233c9b94727dc;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git diff --git "a/c\316\273ash/CLasH/VHDL/Constants.hs" "b/c\316\273ash/CLasH/VHDL/Constants.hs" index b9cbb0b..c70ca71 100644 --- "a/c\316\273ash/CLasH/VHDL/Constants.hs" +++ "b/c\316\273ash/CLasH/VHDL/Constants.hs" @@ -15,7 +15,7 @@ builtinIds = [ exId, replaceId, headId, lastId, tailId, initId, takeId, dropId , lteqId, gtId, gteqId, boolOrId, boolAndId, plusId, timesId , negateId, minusId, fromSizedWordId, fromIntegerId, resizeWordId , resizeIntId, sizedIntId, smallIntegerId, fstId, sndId, blockRAMId - , splitId, minimumId + , splitId, minimumId, fromRangedWordId ] -------------- -- Identifiers @@ -278,6 +278,9 @@ boolOrId = "||" boolAndId :: String boolAndId = "&&" +boolNot :: String +boolNot = "not" + -- Numeric Operations -- | plus operation identifier @@ -298,7 +301,10 @@ minusId = "-" -- | convert sizedword to ranged fromSizedWordId :: String -fromSizedWordId = "fromSizedWord" +fromSizedWordId = "fromUnsigned" + +fromRangedWordId :: String +fromRangedWordId = "fromIndex" toIntegerId :: String toIntegerId = "to_integer" @@ -325,10 +331,10 @@ smallIntegerId :: String smallIntegerId = "smallInteger" sizedIntId :: String -sizedIntId = "SizedInt" +sizedIntId = "Signed" tfvecId :: String -tfvecId = "TFVec" +tfvecId = "Vector" blockRAMId :: String blockRAMId = "blockRAM"