GaloisInc/macaw
1
1
Fork 0
mirror of https://github.com/GaloisInc/macaw.git synced 2024-11-26 09:22:20 +03:00
Code Issues Projects Releases Wiki Activity

Adapt to changes in crucible-llvm package.

Browse Source
This commit is contained in:
Brian Huffman 2018-08-20 16:38:20 -07:00
parent 75e4728464
commit a33202b583
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
symbolic/src/Data/Macaw/Symbolic.hs
View File

@ -71,7 +71,6 @@ import qualified Lang.Crucible.Simulator.GlobalState as C
import System.IO (stdout)
import qualified Lang.Crucible.LLVM.MemModel as MM
import qualified Lang.Crucible.LLVM.MemModel.Pointer as MM
import Lang.Crucible.LLVM.Intrinsics(llvmIntrinsicTypes)
import qualified Data.Macaw.CFG.Block as M

9
symbolic/src/Data/Macaw/Symbolic/MemOps.hs
View File

@ -58,14 +58,11 @@ import Lang.Crucible.LLVM.MemModel
, loadRawWithCondition
, storeRaw
, doPtrAddOffset
)
import Lang.Crucible.LLVM.MemModel.Pointer
( llvmPointerView, muxLLVMPtr, llvmPointer_bv, ptrAdd, ptrSub, ptrEq
, llvmPointerView, muxLLVMPtr, llvmPointer_bv, ptrAdd, ptrSub, ptrEq
, pattern LLVMPointer
, mkNullPointer
)
import Lang.Crucible.LLVM.MemModel.Type(bitvectorType)
import Lang.Crucible.LLVM.MemModel.Generic(ppPtr)
, bitvectorType
, ppPtr )
import Lang.Crucible.LLVM.DataLayout(EndianForm(..))
import Lang.Crucible.LLVM.Bytes(toBytes)

6
x86_symbolic/src/Data/Macaw/X86/Crucible.hs
View File

@ -54,9 +54,9 @@ import Lang.Crucible.Syntax
import Lang.Crucible.Types
import qualified Lang.Crucible.Vector as V
import Lang.Crucible.LLVM.MemModel (LLVMPointerType)
import Lang.Crucible.LLVM.MemModel.Pointer
(projectLLVM_bv, pattern LLVMPointerRepr, llvmPointer_bv)
import Lang.Crucible.LLVM.MemModel
(LLVMPointerType, projectLLVM_bv,
pattern LLVMPointerRepr, llvmPointer_bv)
import qualified Data.Macaw.Types as M
import Data.Macaw.Symbolic.CrucGen(MacawExt)