Changed the handling of retypes with arrays to handle source items with unknown size
This commit is contained in:
parent
24ddcf6f0d
commit
3f02caba7c
|
@ -135,18 +135,19 @@ declareSizesArray = doGeneric `ext1M` doStructured
|
||||||
0 -> return $ makeStaticSizeSpec m n_sizes
|
0 -> return $ makeStaticSizeSpec m n_sizes
|
||||||
[if d == A.UnknownDimension then A.Dimension (bytes `div` (knownDimsTotal * biElem)) else d | d <- ds]
|
[if d == A.UnknownDimension then A.Dimension (bytes `div` (knownDimsTotal * biElem)) else d | d <- ds]
|
||||||
_ -> dieP m "RETYPES has sizes that do not fit"
|
_ -> dieP m "RETYPES has sizes that do not fit"
|
||||||
-- TODO apply a dynamic check for this part:
|
_ -> do totalSizeExpr <- case birhs of
|
||||||
BIUnknown -> dieP m $ "Cannot handle RETYPES sizes: " ++ show birhs
|
BIUnknown -> return $ A.BytesInType m t
|
||||||
-- Some array dimensions are not known at compile-time:
|
-- An array with a dimension are not known at compile-time:
|
||||||
_ -> do let A.Array srcDs elemSrcT = t
|
_ -> do let A.Array srcDs elemSrcT = t
|
||||||
BIJust biSrcElem <- bytesInType elemSrcT
|
BIJust biSrcElem <- bytesInType elemSrcT
|
||||||
let A.Variable _ srcN = v
|
let A.Variable _ srcN = v
|
||||||
multipliedDimsV = foldl (A.Dyadic m A.Mul) (makeConstant m biSrcElem)
|
multipliedDimsV = foldl (A.Dyadic m A.Mul) (makeConstant m biSrcElem)
|
||||||
[A.ExprVariable m $ A.SubscriptedVariable m (A.Subscript m $ makeConstant m i) (A.Variable m $ append_sizes srcN) | i <- [0 .. length srcDs - 1]]
|
[A.ExprVariable m $ A.SubscriptedVariable m (A.Subscript m $ makeConstant m i) (A.Variable m $ append_sizes srcN) | i <- [0 .. length srcDs - 1]]
|
||||||
return $ makeDynamicSizeSpec m n_sizes
|
return multipliedDimsV
|
||||||
|
return $ makeDynamicSizeSpec m n_sizes
|
||||||
[case d of
|
[case d of
|
||||||
-- TODO add a run-time check here for invalid retypes
|
-- TODO add a run-time check here for invalid retypes
|
||||||
A.UnknownDimension -> A.Dyadic m A.Div multipliedDimsV
|
A.UnknownDimension -> A.Dyadic m A.Div totalSizeExpr
|
||||||
(makeConstant m $ knownDimsTotal * biElem)
|
(makeConstant m $ knownDimsTotal * biElem)
|
||||||
A.Dimension n -> makeConstant m n
|
A.Dimension n -> makeConstant m n
|
||||||
| d <- ds]
|
| d <- ds]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user