diff options
| author | Adam Gundry <adam@well-typed.com> | 2015-10-16 13:58:52 +0100 |
|---|---|---|
| committer | Adam Gundry <adam@well-typed.com> | 2015-10-16 13:58:52 +0100 |
| commit | 5a1b4f814f74ec1c48152d97523744518e212777 (patch) | |
| tree | 7c2207ecacbd37f12c78dbcf9d4334827164e0fb /compiler/ghci/ByteCodeItbls.hs | |
| parent | 6757950cdd8bb0af0355539987ee78401a6a8f6b (diff) | |
| parent | 808bbdf08058785ae5bc59b5b4f2b04951d4cbbf (diff) | |
| download | haskell-wip/orf-reboot.tar.gz | |
Merge remote-tracking branch 'origin/master' into wip/orf-rebootwip/orf-reboot
Conflicts:
compiler/rename/RnNames.hs
compiler/typecheck/TcRnMonad.hs
utils/haddock
Diffstat (limited to 'compiler/ghci/ByteCodeItbls.hs')
| -rw-r--r-- | compiler/ghci/ByteCodeItbls.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compiler/ghci/ByteCodeItbls.hs b/compiler/ghci/ByteCodeItbls.hs index cd31acb7b6..a01fcd89b9 100644 --- a/compiler/ghci/ByteCodeItbls.hs +++ b/compiler/ghci/ByteCodeItbls.hs @@ -219,17 +219,17 @@ mkJumpToAddr dflags a = case platformArch (targetPlatform dflags) of , fromIntegral ((w64 `shiftR` 32) .&. 0x0000FFFF) ] ArchARM { } -> - -- Generates Thumb sequence, + -- Generates Arm sequence, -- ldr r1, [pc, #0] -- bx r1 -- -- which looks like: -- 00000000 <.addr-0x8>: - -- 0: 4900 ldr r1, [pc] ; 8 <.addr> - -- 4: 4708 bx r1 + -- 0: 00109fe5 ldr r1, [pc] ; 8 <.addr> + -- 4: 11ff2fe1 bx r1 let w32 = fromIntegral (funPtrToInt a) :: Word32 - in Left [ 0x49, 0x00 - , 0x47, 0x08 + in Left [ 0x00, 0x10, 0x9f, 0xe5 + , 0x11, 0xff, 0x2f, 0xe1 , byte0 w32, byte1 w32, byte2 w32, byte3 w32] arch -> |