luke
/
sv2v
mirror of https://github.com/zachjs/sv2v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more range-bit edge cases in Struct conversion

This commit is contained in:
Zachary Snow 2019-03-31 17:35:00 -04:00
parent 650c602be9
commit 0a3e9f4f49
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Convert/Struct.hs
View File

@ -147,14 +147,20 @@ convertAsgn structs types (lhs, expr) =
where where
(t, l') = convertLHS l (t, l') = convertLHS l
(tf, rs) = typeRanges t (tf, rs) = typeRanges t
convertLHS (LHSRange l r ) = convertLHS (LHSRange l (rOuter @ (hiO, loO))) =
if null rs case l' of
then (Implicit Unspecified [], LHSRange l' r) LHSRange lInner (hiI, loI) ->
else (tf rs', LHSRange l' r) (t, LHSRange lInner (simplify hi, simplify lo))
where
hi = BinOp Add (BinOp Sub hiI loI) hiO
lo = BinOp Add loI loO
_ -> if null rs
then (Implicit Unspecified [], LHSRange l' rOuter)
else (tf rs', LHSRange l' rOuter)
where where
(t, l') = convertLHS l (t, l') = convertLHS l
(tf, rs) = typeRanges t (tf, rs) = typeRanges t
rs' = r : tail rs rs' = rOuter : tail rs
convertLHS (LHSDot l x ) = convertLHS (LHSDot l x ) =
case t of case t of
InterfaceT _ _ _ -> (Implicit Unspecified [], LHSDot l' x) InterfaceT _ _ _ -> (Implicit Unspecified [], LHSDot l' x)
@ -229,7 +235,7 @@ convertAsgn structs types (lhs, expr) =
convertSubExpr (Range eOuter (rOuter @ (hiO, loO))) = convertSubExpr (Range eOuter (rOuter @ (hiO, loO))) =
-- VCS doesn't allow ranges to be cascaded, so we need to combine -- VCS doesn't allow ranges to be cascaded, so we need to combine
-- nested Ranges into a single range. My understanding of the -- nested Ranges into a single range. My understanding of the
-- semantics are that a range return a new, zero-indexed sub-range. -- semantics are that a range returns a new, zero-indexed sub-range.
case eOuter' of case eOuter' of
Range eInner (hiI, loI) -> Range eInner (hiI, loI) ->
(t, Range eInner (simplify hi, simplify lo)) (t, Range eInner (simplify hi, simplify lo))
@ -246,7 +252,10 @@ convertAsgn structs types (lhs, expr) =
(_, e1') = convertSubExpr e1 (_, e1') = convertSubExpr e1
(_, e2') = convertSubExpr e2 (_, e2') = convertSubExpr e2
convertSubExpr (Bit e i) = convertSubExpr (Bit e i) =
(t', Bit e' i') case e' of
Range eInner (_, loI) ->
(t', Bit eInner (simplify $ BinOp Add loI i'))
_ -> (t', Bit e' i')
where where
(t, e') = convertSubExpr e (t, e') = convertSubExpr e
t' = case typeRanges t of t' = case typeRanges t of