Skip to content

Catch "divide by zero" in more places in the primitive evaluator #2817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Catch "divide by zero" in more places in the primitive evaluator #2817

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions clash-ghc/src-ghc/Clash/GHC/Evaluator/Primitive.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1490,7 +1490,7 @@ ghcPrimStep tcm isSubj pInfo tys args mach = case primName pInfo of
_ -> Nothing

"GHC.Classes.divInt#" | Just (i,j) <- intLiterals args
-> reduce (integerToIntLiteral (i `div` j))
-> reduce $ catchDivByZero (integerToIntLiteral (i `div` j))

-- modInt# :: Int# -> Int# -> Int#
"GHC.Classes.modInt#"
Expand Down Expand Up @@ -2012,13 +2012,13 @@ ghcPrimStep tcm isSubj pInfo tys args mach = case primName pInfo of
| Just (i,j) <- naturalLiterals args
->
let nTy = snd (splitFunForallTy ty) in
reduce (checkNaturalRange2 nTy i j quot)
reduce $ catchDivByZero (checkNaturalRange2 nTy i j quot)

"GHC.Num.Natural.naturalRem"
| Just (i,j) <- naturalLiterals args
->
let nTy = snd (splitFunForallTy ty) in
reduce (checkNaturalRange2 nTy i j rem)
reduce $ catchDivByZero (checkNaturalRange2 nTy i j rem)
#endif

#if MIN_VERSION_base(4,15,0)
Expand Down Expand Up @@ -2418,26 +2418,26 @@ ghcPrimStep tcm isSubj pInfo tys args mach = case primName pInfo of
| [ DC intDc [Left (Literal (IntLiteral i))]
, DC _ [Left (Literal (IntLiteral j))]
] <- args
-> reduce (App (Data intDc) (Literal (IntLiteral (i `quot` j))))
-> reduce $ catchDivByZero (App (Data intDc) (Literal (IntLiteral (i `quot` j))))

"GHC.Base.remInt"
| [ DC intDc [Left (Literal (IntLiteral i))]
, DC _ [Left (Literal (IntLiteral j))]
] <- args
-> reduce (App (Data intDc) (Literal (IntLiteral (i `rem` j))))
-> reduce $ catchDivByZero (App (Data intDc) (Literal (IntLiteral (i `rem` j))))

"GHC.Base.divInt"
| [ DC intDc [Left (Literal (IntLiteral i))]
, DC _ [Left (Literal (IntLiteral j))]
] <- args
-> reduce (App (Data intDc) (Literal (IntLiteral (i `div` j))))
-> reduce $ catchDivByZero (App (Data intDc) (Literal (IntLiteral (i `div` j))))


"GHC.Base.modInt"
| [ DC intDc [Left (Literal (IntLiteral i))]
, DC _ [Left (Literal (IntLiteral j))]
] <- args
-> reduce (App (Data intDc) (Literal (IntLiteral (i `mod` j))))
-> reduce $ catchDivByZero (App (Data intDc) (Literal (IntLiteral (i `mod` j))))

"Clash.Class.BitPack.Internal.packDouble#" -- :: Double -> BitVector 64
| [DC _ [Left arg]] <- args
Expand Down