Array copy set prep #1515
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -57,6 +57,7 @@ module SAWScript.Crucible.LLVM.Builtins | |
| , llvm_alloc_readonly | ||
| , llvm_alloc_readonly_aligned | ||
| , llvm_alloc_with_size | ||
| , llvm_alloc_sym_init | ||
| , llvm_symbolic_alloc | ||
| , llvm_alloc_global | ||
| , llvm_fresh_expanded_val | ||
|
|
@@ -487,7 +488,7 @@ withMethodSpec :: | |
| LLVMModule arch -> | ||
| String {- ^ Name of the function -} -> | ||
| LLVMCrucibleSetupM () {- ^ Boundary specification -} -> | ||
| ((?lc :: Crucible.TypeContext, ?memOpts::Crucible.MemOptions, ?doW4Eval :: Bool, Crucible.HasPtrWidth (Crucible.ArchWidth arch), Crucible.HasLLVMAnn Sym) => | ||
| LLVMCrucibleContext arch -> MS.CrucibleMethodSpecIR (LLVM arch) -> TopLevel a) -> | ||
| TopLevel a | ||
| withMethodSpec pathSat lm nm setup action = | ||
|
|
@@ -533,6 +534,7 @@ withMethodSpec pathSat lm nm setup action = | |
| verifyMethodSpec :: | ||
| ( ?lc :: Crucible.TypeContext | ||
| , ?memOpts::Crucible.MemOptions | ||
| , ?doW4Eval :: Bool | ||
andreistefanescu marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| , Crucible.HasPtrWidth (Crucible.ArchWidth arch) | ||
| , Crucible.HasLLVMAnn Sym | ||
| ) => | ||
|
|
@@ -739,7 +741,7 @@ checkSpecReturnType cc mspec = | |
| -- Returns a tuple of (arguments, preconditions, pointer values, | ||
| -- memory). | ||
| verifyPrestate :: | ||
| (?doW4Eval :: Bool, Crucible.HasPtrWidth (Crucible.ArchWidth arch), Crucible.HasLLVMAnn Sym) => | ||
| Options -> | ||
| LLVMCrucibleContext arch -> | ||
| MS.CrucibleMethodSpecIR (LLVM arch) -> | ||
|
|
@@ -853,7 +855,7 @@ checkRegisterCompatibility mt mt' = | |
| return (st == st') | ||
|
|
||
| resolveArguments :: | ||
| (?lc :: Crucible.TypeContext, ?doW4Eval :: Bool, Crucible.HasPtrWidth (Crucible.ArchWidth arch)) => | ||
| LLVMCrucibleContext arch -> | ||
| Crucible.MemImpl Sym -> | ||
| MS.CrucibleMethodSpecIR (LLVM arch) -> | ||
|
|
@@ -925,7 +927,7 @@ setupGlobalAllocs cc mspec mem0 = foldM go mem0 $ mspec ^. MS.csGlobalAllocs | |
| -- function spec, write the given value to the address of the given | ||
| -- pointer. | ||
| setupPrePointsTos :: forall arch. | ||
| (?lc :: Crucible.TypeContext, ?doW4Eval :: Bool, Crucible.HasPtrWidth (Crucible.ArchWidth arch), Crucible.HasLLVMAnn Sym) => | ||
| MS.CrucibleMethodSpecIR (LLVM arch) -> | ||
| Options -> | ||
| LLVMCrucibleContext arch -> | ||
|
|
@@ -954,7 +956,7 @@ setupPrePointsTos mspec opts cc env pts mem0 = foldM go mem0 pts | |
| -- | Sets up globals (ghost variable), and collects boolean terms | ||
| -- that should be assumed to be true. | ||
| setupPrestateConditions :: | ||
| (?lc :: Crucible.TypeContext, ?doW4Eval :: Bool, Crucible.HasPtrWidth (Crucible.ArchWidth arch)) => | ||
| MS.CrucibleMethodSpecIR (LLVM arch) -> | ||
| LLVMCrucibleContext arch -> | ||
| Crucible.MemImpl Sym -> | ||
|
|
@@ -1007,20 +1009,19 @@ assertEqualVals cc v1 v2 = | |
|
|
||
| -- TODO(langston): combine with/move to executeAllocation | ||
| doAlloc :: | ||
| (?doW4Eval :: Bool, Crucible.HasPtrWidth (Crucible.ArchWidth arch), Crucible.HasLLVMAnn Sym) => | ||
| LLVMCrucibleContext arch -> | ||
| AllocIndex -> | ||
| LLVMAllocSpec -> | ||
| StateT MemImpl IO (LLVMPtr (Crucible.ArchWidth arch)) | ||
| doAlloc cc i (LLVMAllocSpec mut _memTy alignment sz loc fresh symInit) | ||
| | fresh = liftIO $ executeFreshPointer cc i | ||
| | otherwise = | ||
| StateT $ \mem -> | ||
| do let sym = cc^.ccBackend | ||
| sz' <- liftIO $ resolveSAWSymBV cc Crucible.PtrWidth sz | ||
| let l = show (W4.plSourceLoc loc) | ||
| liftIO $ doAllocSymInit sym mem mut alignment sz' l symInit | ||
|
|
||
| -------------------------------------------------------------------------------- | ||
|
|
||
|
|
@@ -1045,6 +1046,7 @@ ppGlobalPair cc gp = | |
| registerOverride :: | ||
| ( ?lc :: Crucible.TypeContext | ||
| , ?memOpts::Crucible.MemOptions | ||
| , ?doW4Eval :: Bool | ||
| , Crucible.HasPtrWidth wptr | ||
| , wptr ~ Crucible.ArchWidth arch | ||
| , Crucible.HasLLVMAnn Sym | ||
|
|
@@ -1087,6 +1089,7 @@ registerOverride opts cc sim_ctx top_loc cs = | |
| registerInvariantOverride :: | ||
| ( ?lc :: Crucible.TypeContext | ||
| , ?memOpts::Crucible.MemOptions | ||
| , ?doW4Eval :: Bool | ||
| , Crucible.HasPtrWidth (Crucible.ArchWidth arch) | ||
| , Crucible.HasLLVMAnn Sym | ||
| ) => | ||
|
|
@@ -1168,6 +1171,7 @@ withBreakpointCfgAndBlockId context name parent k = | |
| verifySimulate :: | ||
| ( ?lc :: Crucible.TypeContext | ||
| , ?memOpts::Crucible.MemOptions | ||
| , ?doW4Eval :: Bool | ||
| , Crucible.HasPtrWidth wptr | ||
| , wptr ~ Crucible.ArchWidth arch | ||
| , Crucible.HasLLVMAnn Sym | ||
|
|
@@ -1287,6 +1291,7 @@ scAndList sc = conj . filter nontrivial | |
| verifyPoststate :: | ||
| ( ?lc :: Crucible.TypeContext | ||
| , ?memOpts::Crucible.MemOptions | ||
| , ?doW4Eval :: Bool | ||
| , Crucible.HasPtrWidth wptr | ||
| , wptr ~ Crucible.ArchWidth arch | ||
| , Crucible.HasLLVMAnn Sym | ||
|
|
@@ -1355,7 +1360,7 @@ verifyPoststate cc mspec env0 globals ret = | |
| setupLLVMCrucibleContext :: | ||
| Bool {- ^ enable path sat checking -} -> | ||
| LLVMModule arch -> | ||
| ((?lc :: Crucible.TypeContext, ?memOpts::Crucible.MemOptions, ?doW4Eval :: Bool, Crucible.HasPtrWidth (Crucible.ArchWidth arch), Crucible.HasLLVMAnn Sym) => | ||
| LLVMCrucibleContext arch -> TopLevel a) -> | ||
| TopLevel a | ||
| setupLLVMCrucibleContext pathSat lm action = | ||
|
|
@@ -1370,6 +1375,7 @@ setupLLVMCrucibleContext pathSat lm action = | |
| crucible_assert_then_assume_enabled <- gets rwCrucibleAssertThenAssume | ||
| what4HashConsing <- gets rwWhat4HashConsing | ||
| laxPointerOrdering <- gets rwLaxPointerOrdering | ||
| what4Eval <- gets rwWhat4Eval | ||
| Crucible.llvmPtrWidth ctx $ \wptr -> | ||
| Crucible.withPtrWidth wptr $ | ||
| do let ?lc = ctx^.Crucible.llvmTypeCtx | ||
|
|
@@ -1378,6 +1384,7 @@ setupLLVMCrucibleContext pathSat lm action = | |
| } | ||
| let ?intrinsicsOpts = Crucible.defaultIntrinsicsOptions | ||
| let ?recordLLVMAnnotation = \_ _ -> return () | ||
| let ?doW4Eval = what4Eval | ||
| cc <- | ||
| io $ | ||
| do let verbosity = simVerbose opts | ||
|
|
@@ -1866,9 +1873,10 @@ llvm_alloc_with_mutability_and_size :: | |
| Crucible.Mutability -> | ||
| Maybe (Crucible.Bytes) -> | ||
| Maybe Crucible.Alignment -> | ||
| Bool -> | ||
| L.Type -> | ||
| LLVMCrucibleSetupM (AllLLVM SetupValue) | ||
| llvm_alloc_with_mutability_and_size mut sz alignment symInit lty = | ||
| LLVMCrucibleSetupM $ | ||
| do cctx <- getLLVMCrucibleContext | ||
| loc <- getW4Position "llvm_alloc" | ||
|
|
@@ -1913,13 +1921,14 @@ llvm_alloc_with_mutability_and_size mut sz alignment lty = | |
| , _allocSpecBytes = sz'' | ||
| , _allocSpecLoc = loc | ||
| , _allocSpecFresh = False | ||
| , _allocSpecSymInit = symInit | ||
| } | ||
|
|
||
| llvm_alloc :: | ||
| L.Type -> | ||
| LLVMCrucibleSetupM (AllLLVM SetupValue) | ||
| llvm_alloc = | ||
| llvm_alloc_with_mutability_and_size Crucible.Mutable Nothing Nothing False | ||
|
|
||
| llvm_alloc_aligned :: | ||
| Int -> | ||
|
|
@@ -1932,7 +1941,7 @@ llvm_alloc_readonly :: | |
| L.Type -> | ||
| LLVMCrucibleSetupM (AllLLVM SetupValue) | ||
| llvm_alloc_readonly = | ||
| llvm_alloc_with_mutability_and_size Crucible.Immutable Nothing Nothing False | ||
|
|
||
| llvm_alloc_readonly_aligned :: | ||
| Int -> | ||
|
|
@@ -1952,6 +1961,7 @@ llvm_alloc_aligned_with_mutability mut n lty = | |
| mut | ||
| Nothing | ||
| (Just alignment) | ||
| False | ||
| lty | ||
|
|
||
| coerceAlignment :: Int -> CrucibleSetup (LLVM arch) Crucible.Alignment | ||
|
|
@@ -1975,8 +1985,12 @@ llvm_alloc_with_size sz lty = | |
| Crucible.Mutable | ||
| (Just (Crucible.toBytes sz)) | ||
| Nothing | ||
| False | ||
| lty | ||
|
|
||
| llvm_alloc_sym_init :: L.Type -> LLVMCrucibleSetupM (AllLLVM SetupValue) | ||
|
There was a problem hiding this comment. I'm curious: does this work in practice when you apply in an a specification that is assumed with I suppose this is a long-winded way of asking for some more test cases using |
||
| llvm_alloc_sym_init = llvm_alloc_with_mutability_and_size Crucible.Mutable Nothing Nothing True | ||
|
|
||
| llvm_symbolic_alloc :: | ||
| Bool -> | ||
| Int -> | ||
|
|
@@ -2008,6 +2022,7 @@ llvm_symbolic_alloc ro align_bytes sz = | |
| , _allocSpecBytes = sz | ||
| , _allocSpecLoc = loc | ||
| , _allocSpecFresh = False | ||
| , _allocSpecSymInit = False | ||
| } | ||
| n <- Setup.csVarCounter <<%= nextAllocIndex | ||
| Setup.currentState . MS.csAllocs . at n ?= spec | ||
|
|
@@ -2057,6 +2072,7 @@ constructFreshPointer mid loc memTy = | |
| , _allocSpecBytes = sz | ||
| , _allocSpecLoc = loc | ||
| , _allocSpecFresh = True | ||
| , _allocSpecSymInit = False | ||
| } | ||
| -- TODO: refactor | ||
| case mid of | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's open ticket about plumbing this new option through the RPC server.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For what it's worth, it's fairly easy to add support for toggling options like this in
saw-remote-api. You basically just add a new constructor here, and then update the code insetOption,parseOption, andinstance Doc.DescribedMethod SetOptionParams OKaccordingly.