GaloisInc/macaw
1
1
Fork 0
mirror of https://github.com/GaloisInc/macaw.git synced 2024-11-28 01:35:33 +03:00
Code Issues Projects Releases Wiki Activity

Replace diassemble error with trace

Browse Source
This commit is contained in:
Joe Hendrix 2017-02-24 01:54:44 -05:00
parent 953e607e0e
commit e97e7c7f49
No known key found for this signature in database
GPG Key ID: 00F67DE32381DB9F
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Data/Macaw/Discovery.hs
View File

@ -215,6 +215,7 @@ printAddrBacktrace found_map addr rsn = do
SplitAt src -> pp ("Split from read of " ++ show src ++ ".") : prev src
InterProcedureJump src -> pp ("Reference from external address " ++ show src ++ ".") : prev src
-- | Return true if this address was added because of the contents of a global address
-- in memory initially.
--
@ -263,10 +264,11 @@ tryDisassembleAddr rsn addr ab = do
case maybeError of
Just e -> do
when (not (cameFromUnsoundReason (s0^.foundAddrs) rsn)) $ do
error $ "Failed to disassemble " ++ show e ++ "\n"
++ unlines (printAddrBacktrace (s0^.foundAddrs) addr rsn)
trace ("Failed to disassemble " ++ show e ++ "\n"
++ unlines (printAddrBacktrace (s0^.foundAddrs) addr rsn)) $ pure ()
Nothing -> do
pure ()
assert (segmentIndex (addrSegment next_ip) == segmentIndex (addrSegment addr)) $ do
assert (next_ip^.addrOffset > addr^.addrOffset) $ do
let block_map = Map.fromList [ (labelIndex (blockLabel b), b) | b <- bs ]