diff --git a/symbolic/src/Data/Macaw/Symbolic.hs b/symbolic/src/Data/Macaw/Symbolic.hs index a9e47e36..1191f636 100644 --- a/symbolic/src/Data/Macaw/Symbolic.hs +++ b/symbolic/src/Data/Macaw/Symbolic.hs @@ -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 diff --git a/symbolic/src/Data/Macaw/Symbolic/MemOps.hs b/symbolic/src/Data/Macaw/Symbolic/MemOps.hs index bf7fe507..42d75717 100644 --- a/symbolic/src/Data/Macaw/Symbolic/MemOps.hs +++ b/symbolic/src/Data/Macaw/Symbolic/MemOps.hs @@ -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) diff --git a/x86_symbolic/src/Data/Macaw/X86/Crucible.hs b/x86_symbolic/src/Data/Macaw/X86/Crucible.hs index 2235a3a2..1e38527e 100644 --- a/x86_symbolic/src/Data/Macaw/X86/Crucible.hs +++ b/x86_symbolic/src/Data/Macaw/X86/Crucible.hs @@ -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)