projects
/
matthijs
/
master-project
/
cλash.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1c8a4c9
)
Numbers are now encoded using a descending index
author
christiaanb
<christiaan.baaij@gmail.com>
Mon, 21 Jun 2010 09:29:05 +0000
(11:29 +0200)
committer
christiaanb
<christiaan.baaij@gmail.com>
Mon, 21 Jun 2010 09:29:05 +0000
(11:29 +0200)
clash/CLasH/VHDL/VHDLTools.hs
patch
|
blob
|
history
diff --git
a/clash/CLasH/VHDL/VHDLTools.hs
b/clash/CLasH/VHDL/VHDLTools.hs
index fde81d06dae32e7fbc0b381f16f24e0cb685c602..521aa0850b0243d08c3623581a696e351b02f2fc 100644
(file)
--- a/
clash/CLasH/VHDL/VHDLTools.hs
+++ b/
clash/CLasH/VHDL/VHDLTools.hs
@@
-543,7
+543,7
@@
mkNaturalTy ::
mkNaturalTy min_bound max_bound = do
let bitsize = floor (logBase 2 (fromInteger (toInteger max_bound)))
let ty_id = mkVHDLExtId $ "natural_" ++ (show min_bound) ++ "_to_" ++ (show max_bound)
mkNaturalTy min_bound max_bound = do
let bitsize = floor (logBase 2 (fromInteger (toInteger max_bound)))
let ty_id = mkVHDLExtId $ "natural_" ++ (show min_bound) ++ "_to_" ++ (show max_bound)
- let range = AST.ConstraintIndex $ AST.IndexConstraint [AST.
ToRange (AST.PrimLit $ show min_bound) (AST.PrimLit $ show bitsize
)]
+ let range = AST.ConstraintIndex $ AST.IndexConstraint [AST.
DownRange (AST.PrimLit $ show bitsize) (AST.PrimLit $ show min_bound
)]
let ty_def = AST.SubtypeIn unsignedTM (Just range)
return (Just (ty_id, Just $ Right ty_def))
let ty_def = AST.SubtypeIn unsignedTM (Just range)
return (Just (ty_id, Just $ Right ty_def))
@@
-551,8
+551,8
@@
mkUnsignedTy ::
Int -- ^ Haskell type of the unsigned integer
-> TypeSession TypeMapRec
mkUnsignedTy size = do
Int -- ^ Haskell type of the unsigned integer
-> TypeSession TypeMapRec
mkUnsignedTy size = do
- let ty_id = mkVHDLExtId $ "unsigned_" ++ show
(size - 1)
- let range = AST.ConstraintIndex $ AST.IndexConstraint [AST.
ToRange (AST.PrimLit "0") (AST.PrimLit $ show (size - 1)
)]
+ let ty_id = mkVHDLExtId $ "unsigned_" ++ show
size
+ let range = AST.ConstraintIndex $ AST.IndexConstraint [AST.
DownRange (AST.PrimLit $ show (size - 1)) (AST.PrimLit "0"
)]
let ty_def = AST.SubtypeIn unsignedTM (Just range)
return (Just (ty_id, Just $ Right ty_def))
let ty_def = AST.SubtypeIn unsignedTM (Just range)
return (Just (ty_id, Just $ Right ty_def))
@@
-560,8
+560,8
@@
mkSignedTy ::
Int -- ^ Haskell type of the signed integer
-> TypeSession TypeMapRec
mkSignedTy size = do
Int -- ^ Haskell type of the signed integer
-> TypeSession TypeMapRec
mkSignedTy size = do
- let ty_id = mkVHDLExtId $ "signed_" ++ show
(size - 1)
- let range = AST.ConstraintIndex $ AST.IndexConstraint [AST.
ToRange (AST.PrimLit "0") (AST.PrimLit $ show (size - 1)
)]
+ let ty_id = mkVHDLExtId $ "signed_" ++ show
size
+ let range = AST.ConstraintIndex $ AST.IndexConstraint [AST.
DownRange (AST.PrimLit $ show (size - 1)) (AST.PrimLit "0"
)]
let ty_def = AST.SubtypeIn signedTM (Just range)
return (Just (ty_id, Just $ Right ty_def))
let ty_def = AST.SubtypeIn signedTM (Just range)
return (Just (ty_id, Just $ Right ty_def))