Skip to content
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

Jump to bottom

[WIP] Revamp LLVM error messages using annotations #441

Closed
wants to merge 12 commits into from
Closed

[WIP] Revamp LLVM error messages using annotations #441

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
335fa53
Add an `Annotation` term former to the `NonceApp` type, and propigate
robdockins Feb 13, 2020
8cb644d
Pipe the new annotation operation through the what4 interface
robdockins Feb 13, 2020
8123d3a
Update various .cabal files to upgrade certain warnings to errors.
robdockins Feb 13, 2020
4354198
Remove the use of the `WithAssertion` expression from crucible-jvm
robdockins Feb 5, 2020
5d044b4
Remove the use of the `WithAssertions` expression former in crucible-…
robdockins Feb 5, 2020
ba8fdd9
Shrink the API for Lang.Crucible.LLVM.MemModel.Partial slightly,
robdockins Feb 6, 2020
7a5097f
Further reorganization of crucible-llvm to shrink the API for
robdockins Feb 10, 2020
5662540
Remove the `WithAssertions` syntax constructor and related
robdockins Feb 13, 2020
608179a
Removes uses of assertion tree in the LLVM memory model and use
robdockins Feb 11, 2020
8ec9cb5
Add space in the `Goals` datatype for detailed explanations
robdockins Feb 12, 2020
de47960
let `asConstantPred` look through annotations
robdockins Feb 13, 2020
01be860
Fix test suites
robdockins Feb 13, 2020
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
Prev Previous commit
Fix test suites
  • Loading branch information
@robdockins
robdockins committed Feb 13, 2020
commit 01be86054e33482fb7cfa8e1580210ce67567e95
11 changes: 10 additions & 1 deletion crucible-llvm/test/Tests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import Data.Foldable
import Data.Sequence (Seq)
import Control.Monad
import Control.Monad.Except
import Data.IORef
import qualified Data.Map.Strict as Map
import qualified Data.Sequence as Seq
import qualified Data.Set as Set
Expand Down Expand Up @@ -361,12 +362,20 @@ userSymbol' s = case What4.userSymbol s of

withMem ::
EndianForm ->
(forall sym scope solver fs wptr . (sym ~ Crucible.OnlineBackend scope solver fs, Crucible.IsSymInterface sym, What4.OnlineSolver scope solver, HasPtrWidth wptr) => sym -> MemImpl sym -> IO a) ->
(forall sym scope solver fs wptr .
( sym ~ Crucible.OnlineBackend scope solver fs
, Crucible.IsSymInterface sym
, HasLLVMAnn sym
, What4.OnlineSolver scope solver
, HasPtrWidth wptr ) =>
sym -> MemImpl sym -> IO a) ->
IO a
withMem endianess action = withIONonceGenerator $ \nonce_gen ->
Crucible.withZ3OnlineBackend What4.FloatIEEERepr nonce_gen Crucible.NoUnsatFeatures $ \sym -> do
let ?ptrWidth = knownNat @64
mem <- emptyMem endianess
bbMapRef <- newIORef mempty
let ?badBehaviorMap = bbMapRef
action sym mem

assume :: Crucible.IsSymInterface sym => sym -> What4.Pred sym -> IO ()
Expand Down
6 changes: 3 additions & 3 deletions crux-llvm/test-data/golden/vector-cmp.good
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ let -- internal
-- internal
v3 = floatFromBinary 0x42280000:[32]
-- internal
v10 = ite (floatLe v3 v2) 0x0:[1] 0x1:[1]
v18 = ite (floatLe v3 v2) 0x0:[1] 0x1:[1]
-- internal
v12 = bvZext 32 (bvAnd (ite (floatLe v2 v3) 0x1:[1] 0x0:[1]) v10)
in bvOr 0x1:[32] (bvShl v12 0x1:[32])
v20 = bvZext 32 (bvAnd (ite (floatLe v2 v3) 0x1:[1] 0x0:[1]) v18)
in bvOr 0x1:[32] (bvShl v20 0x1:[32])
[Crux] Overall status: Valid.