From 4a4b9d7a8abfb033c29f4797076068e6a7e9e001 Mon Sep 17 00:00:00 2001 From: Rob Dockins Date: Thu, 15 Mar 2018 17:21:42 -0700 Subject: [PATCH] Minor update to track crucible API --- symbolic/macaw-symbolic.cabal | 2 +- symbolic/src/Data/Macaw/Symbolic.hs | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/symbolic/macaw-symbolic.cabal b/symbolic/macaw-symbolic.cabal index 2b581697..d834f9c5 100644 --- a/symbolic/macaw-symbolic.cabal +++ b/symbolic/macaw-symbolic.cabal @@ -12,7 +12,7 @@ library base >= 4, ansi-wl-pprint, containers, - crucible, + crucible >= 0.3.2, lens, macaw-base, mtl, diff --git a/symbolic/src/Data/Macaw/Symbolic.hs b/symbolic/src/Data/Macaw/Symbolic.hs index 4bc71e2e..02060506 100644 --- a/symbolic/src/Data/Macaw/Symbolic.hs +++ b/symbolic/src/Data/Macaw/Symbolic.hs @@ -55,6 +55,7 @@ import qualified Lang.Crucible.FunctionHandle as C import qualified Lang.Crucible.FunctionName as C import qualified Lang.Crucible.ProgramLoc as C import qualified Lang.Crucible.Simulator.ExecutionTree as C +import qualified Lang.Crucible.Simulator.Intrinsics as C import qualified Lang.Crucible.Simulator.GlobalState as C import qualified Lang.Crucible.Simulator.OverrideSim as C import qualified Lang.Crucible.Simulator.RegMap as C @@ -241,10 +242,12 @@ mkFunCFG archFns halloc memBaseVarMap nm posFn fn = crucGenArchConstraints archF evalMacawExprExtension :: IsSymInterface sym => sym + -> C.IntrinsicTypes sym + -> (Int -> String -> IO ()) -> (forall utp . f utp -> IO (C.RegValue sym utp)) -> MacawExprExtension arch f tp -> IO (C.RegValue sym tp) -evalMacawExprExtension sym f e0 = +evalMacawExprExtension sym _iTypes _logFn f e0 = case e0 of MacawOverflows op w xv yv cv -> do