Skip to content

Bring in support for ceil, floor, and atan2 #8

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

Merged
RyanGlScott merged 1 commit into from
Nov 4, 2021
Merged

Bring in support for ceil, floor, and atan2 #8

Show file tree
Hide file tree
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
17 changes: 7 additions & 10 deletions copilot-verifier/src/Copilot/Verifier.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,6 @@ import What4.Solver.Adapter (SolverAdapter(..))
import What4.Solver.Z3 (z3Adapter)
import What4.Symbol (safeSymbol)

setOutput :: CruxOptions -> CSettings -> CSettings
setOutput cruxOpts cin =
case cSettingsOutputDirectory cin of
Nothing -> cin{ cSettingsOutputDirectory = Just (outDir cruxOpts) }
Just _ -> cin

verify :: CSettings -> [String] -> String -> Spec -> IO ()
verify csettings0 properties prefix spec =
do (cruxOpts, llvmOpts, csettings, csrc) <-
Expand All @@ -137,10 +131,13 @@ verify csettings0 properties prefix spec =
-- TODO, load from and actual configuration file?
fileOpts <- fromFile "copilot-verifier" cfg Nothing
(cruxOpts0, llvmOpts0) <- foldM fromEnv fileOpts (cfgEnv cfg)
let odir = case cSettingsOutputDirectory csettings0 of
Just d -> d
Nothing -> "results" </> prefix
let csettings = csettings0{ cSettingsOutputDirectory = Just odir }
let odir0 = cSettingsOutputDirectory csettings0
let odir = -- A bit grimy, but this corresponds to how crux-llvm sets
-- its output directory.
if odir0 == "."
then "results" </> prefix
else odir0
let csettings = csettings0{ cSettingsOutputDirectory = odir }
let csrc = odir </> prefix ++ ".c"
let cruxOpts1 = cruxOpts0{ outDir = odir, bldDir = odir, inputFiles = [csrc] }
ocfg <- defaultOutputConfig cruxLogMessageToSayWhat
Expand Down
2 changes: 1 addition & 1 deletion deps/copilot
Open in desktop
Submodule copilot updated 25 files
+3 −1 copilot-c99/CHANGELOG
+4 −8 copilot-c99/src/Copilot/Compile/C99/Compile/Internal.hs
+2 −2 copilot-c99/src/Copilot/Compile/C99/Settings/Internal.hs
+3 −0 copilot-c99/src/Copilot/Compile/C99/Translate.hs
+4 −1 copilot-core/CHANGELOG
+37 −0 copilot-core/copilot-core.cabal
+1 −0 copilot-core/src/Copilot/Core/Expr.hs
+31 −22 copilot-core/src/Copilot/Core/Interpret/Eval.hs
+5 −0 copilot-core/src/Copilot/Core/Operators.hs
+24 −21 copilot-core/src/Copilot/Core/PrettyDot.hs
+3 −0 copilot-core/src/Copilot/Core/PrettyPrint.hs
+31 −0 copilot-core/tests/Main.hs
+35 −0 copilot-core/tests/Test/Copilot/Core/Error.hs
+43 −0 copilot-core/tests/Test/Copilot/Core/External.hs
+770 −0 copilot-core/tests/Test/Copilot/Core/Interpret/Eval.hs
+69 −0 copilot-core/tests/Test/Copilot/Core/Type.hs
+132 −0 copilot-core/tests/Test/Copilot/Core/Type/Array.hs
+48 −0 copilot-core/tests/Test/Copilot/Core/Type/Dynamic.hs
+34 −0 copilot-core/tests/Test/Copilot/Core/Type/Show.hs
+44 −0 copilot-core/tests/Test/Extra.hs
+2 −1 copilot-language/CHANGELOG
+50 −0 copilot-language/src/Copilot/Language/Stream.hs
+2 −1 copilot-libraries/CHANGELOG
+22 −2 copilot-libraries/src/Copilot/Library/LTL.hs
+38 −19 copilot-theorem/src/Copilot/Theorem/What4/Translate.hs
2 changes: 1 addition & 1 deletion deps/crucible
Open in desktop
Submodule crucible updated 27 files
+110 −0 .github/workflows/crucible-go-build.yml
+1 −1 crucible-go/src/Lang/Crucible/Go/Builtin.hs
+2 −1 crucible-go/src/Lang/Crucible/Go/Translation.hs
+32 −22 crucible-go/tool/Main.hs
+8 −0 crucible-llvm/src/Lang/Crucible/LLVM/Intrinsics.hs
+2 −2 crucible-llvm/src/Lang/Crucible/LLVM/Intrinsics/Common.hs
+36 −0 crucible-llvm/src/Lang/Crucible/LLVM/Intrinsics/LLVM.hs
+53 −0 crucible-llvm/src/Lang/Crucible/LLVM/Intrinsics/Libc.hs
+53 −1 crux-llvm/test-data/golden/special-functions-fast-math.c
+53 −1 crux-llvm/test-data/golden/special-functions.c
+1 −1 dependencies/golang
+1 −1 uc-crux-llvm/.hlint.yaml
+4 −0 uc-crux-llvm/README.md
+20 −4 uc-crux-llvm/src/UCCrux/LLVM/Context/Module.hs
+6 −0 uc-crux-llvm/src/UCCrux/LLVM/Errors/Unimplemented.hs
+9 −0 uc-crux-llvm/src/UCCrux/LLVM/FullType/Type.hs
+12 −0 uc-crux-llvm/src/UCCrux/LLVM/Module.hs
+427 −0 uc-crux-llvm/src/UCCrux/LLVM/Overrides/Check.hs
+34 −5 uc-crux-llvm/src/UCCrux/LLVM/Overrides/Polymorphic.hs
+2 −2 uc-crux-llvm/src/UCCrux/LLVM/Overrides/Skip.hs
+36 −12 uc-crux-llvm/src/UCCrux/LLVM/Run/Loop.hs
+283 −91 uc-crux-llvm/src/UCCrux/LLVM/Run/Simulate.hs
+1 −1 uc-crux-llvm/src/UCCrux/LLVM/Setup/Monad.hs
+167 −0 uc-crux-llvm/test/Check.hs
+3 −1 uc-crux-llvm/test/Test.hs
+21 −0 uc-crux-llvm/test/programs/check_disjunctive_generalization.c
+8 −2 uc-crux-llvm/uc-crux-llvm.cabal