GaloisInc/macaw
1
1
Fork 0
mirror of https://github.com/GaloisInc/macaw.git synced 2024-11-29 21:44:11 +03:00
Code Issues Projects Releases Wiki Activity

Update register CFG initialization for new label and value fields.

Browse Source
This commit is contained in:
Kevin Quick 2018-08-10 15:06:04 -07:00
parent da991102e7
commit 05a4d96cd7
No known key found for this signature in database
GPG Key ID: E6D7733599CC0A21
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,14 +127,16 @@ mkCrucCFG archFns halloc nm action = do
h <- C.mkHandle' halloc nm argTypes macawStructRepr h <- C.mkHandle' halloc nm argTypes macawStructRepr
let ps0 = initCrucPersistentState 1 let ps0 = initCrucPersistentState 1
blockRes <- runMacawMonad ps0 action blockRes <- runMacawMonad ps0 action
blks <- (blks, finalSt) <-
case blockRes of case blockRes of
(Left err, _) -> fail err (Left err, _) -> fail err
(Right blks, _) -> pure blks (Right blks, fs) -> pure (blks, fs)
-- Create control flow graph -- Create control flow graph
let rg :: CR.CFG (MacawExt arch) s (MacawFunctionArgs arch) (MacawFunctionResult arch) let rg :: CR.CFG (MacawExt arch) s (MacawFunctionArgs arch) (MacawFunctionResult arch)
rg = CR.CFG { CR.cfgHandle = h rg = CR.CFG { CR.cfgHandle = h
, CR.cfgBlocks = blks , CR.cfgBlocks = blks
, CR.cfgNextValue = valueCount finalSt
, CR.cfgNextLabel = length blks
} }
crucGenArchConstraints archFns $ crucGenArchConstraints archFns $
pure $ C.toSSA rg pure $ C.toSSA rg