mirror of
https://github.com/GaloisInc/macaw.git
synced 2024-11-27 12:52:52 +03:00
Update dependencies/minor corrections.
This commit is contained in:
parent
d58292feda
commit
c3f747aa86
@ -31,7 +31,7 @@ library
|
||||
base >= 4,
|
||||
ansi-wl-pprint,
|
||||
binary,
|
||||
binary-symbols >= 0.1.2,
|
||||
binary-symbols >= 0.1.3,
|
||||
bytestring,
|
||||
containers >= 0.5.8.1,
|
||||
elf-edit >= 0.34.1,
|
||||
|
@ -642,10 +642,10 @@ summarizeBlock interpState b = do
|
||||
-- Add this label to block demand map with empty set.
|
||||
addBlockDemands addr mempty
|
||||
|
||||
ainfo <- asks $ archDemandInfo
|
||||
let ctx = demandInfoCtx ainfo
|
||||
ctx <- ask
|
||||
let ainfo = archDemandInfo ctx
|
||||
-- Add all values demanded by non-terminal statements in list.
|
||||
mapM_ (mapM_ (\(Some v) -> demandValue addr v) . stmtDemandedValues ctx)
|
||||
mapM_ (mapM_ (\(Some v) -> demandValue addr v) . stmtDemandedValues (demandInfoCtx ainfo))
|
||||
(pblockStmts b)
|
||||
-- Add values demanded by terminal statements
|
||||
case pblockTermStmt b of
|
||||
@ -662,17 +662,15 @@ summarizeBlock interpState b = do
|
||||
summarizeCall addr finalRegs mRetAddr
|
||||
|
||||
PLTStub regs _ sym -> do
|
||||
-- case Map.lookup (versymName sym) m of
|
||||
-- Nothing -> do
|
||||
-- addWarning
|
||||
|
||||
-- relocationOffset r == 0
|
||||
-- PLT Stubs demand all registers that could be function
|
||||
-- arguments, as well as any registers in regs.
|
||||
-- Get argument registers if known for symbol.
|
||||
let argRegs
|
||||
| Just cr <- Map.lookup (versymName sym) (knownSymbolDecls ctx) =
|
||||
crArguments cr
|
||||
| otherwise =
|
||||
functionArgRegs ainfo
|
||||
|
||||
-- Get all registers in arguments that are not defined in regs.
|
||||
demands <- withAssignmentCache $ do
|
||||
|
||||
let addRegUses :: RegisterSet (ArchReg arch)
|
||||
-> Some (ArchReg arch)
|
||||
-> State (AssignmentCache (ArchReg arch) ids) (RegisterSet (ArchReg arch))
|
||||
|
2
deps/crucible
vendored
2
deps/crucible
vendored
@ -1 +1 @@
|
||||
Subproject commit ee990cc8e1b4704688832d95ae44140db84f64d9
|
||||
Subproject commit 51c03f500e514c5c9dbc7346672b07d35cc19542
|
2
deps/flexdis86
vendored
2
deps/flexdis86
vendored
@ -1 +1 @@
|
||||
Subproject commit 2c71bfbc2834917c673a8248fc475e2afc07274e
|
||||
Subproject commit a6786e261dddf2ff3d206c7f8f76c17e50928e96
|
2
deps/llvm-pretty-bc-parser
vendored
2
deps/llvm-pretty-bc-parser
vendored
@ -1 +1 @@
|
||||
Subproject commit 64a79acf913fe1abfc5155634cf07e9568f309bf
|
||||
Subproject commit 228d26ea852085d977f146cef0f40a4132791192
|
@ -1 +1 @@
|
||||
Subproject commit 61eb4f791f1e66a678b11af7b96503cb05276def
|
||||
Subproject commit 0bdff040af56fcd7a584e45cca4f017b681b5b43
|
Loading…
Reference in New Issue
Block a user