Merge pull request #641 from adrianherrera/bugfix/haskell-sample-thumb-fix

Fixed ARM THUMB Haskell sample as per Issue #638
This commit is contained in:
Nguyen Anh Quynh 2016-09-21 15:52:29 +08:00 committed by GitHub
commit 8181a5eaf0

View file

@ -4,6 +4,7 @@ import Unicorn
import Unicorn.Hook import Unicorn.Hook
import qualified Unicorn.CPU.Arm as Arm import qualified Unicorn.CPU.Arm as Arm
import Data.Bits
import qualified Data.ByteString as BS import qualified Data.ByteString as BS
import Data.Word import Data.Word
import qualified Numeric as N (showHex) import qualified Numeric as N (showHex)
@ -112,7 +113,7 @@ testThumb = do
-- Emulate machine code in infinite time (last param = Nothing), or -- Emulate machine code in infinite time (last param = Nothing), or
-- when finishing all the code -- when finishing all the code
let codeLen = codeLength thumbCode let codeLen = codeLength thumbCode
start uc address (address + codeLen) Nothing Nothing start uc (address .|. 1) (address + codeLen) Nothing Nothing
-- Return the results -- Return the results
sp <- regRead uc Arm.Sp sp <- regRead uc Arm.Sp