Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/cfcf0a549da1f3d7d74fe4695c56e3763bf44599 >--------------------------------------------------------------- commit cfcf0a549da1f3d7d74fe4695c56e3763bf44599 Merge: 70bccc1... 9f24caa... Author: Simon Peyton Jones <[email protected]> Date: Thu Nov 24 12:32:03 2011 +0000 Merge branch 'master' of http://darcs.haskell.org/ghc Conflicts: compiler/ghci/ByteCodeItbls.lhs compiler/ghci/ByteCodeItbls.lhs | 34 ++++++++++++++++------------------ rts/RtsStartup.c | 2 +- 2 files changed, 17 insertions(+), 19 deletions(-) diff --cc compiler/ghci/ByteCodeItbls.lhs index 1783125,1af4231..2dd1d11 --- a/compiler/ghci/ByteCodeItbls.lhs +++ b/compiler/ghci/ByteCodeItbls.lhs @@@ -255,6 -237,23 +237,22 @@@ mkJumpToAddr = undefined #endif - + #if defined(i386_TARGET_ARCH) || defined(x86_64_TARGET_ARCH) + byte0, byte1, byte2, byte3 :: (Integral w, Bits w) => w -> Word8 + byte0 w = fromIntegral w + byte1 w = fromIntegral (w `shiftR` 8) + byte2 w = fromIntegral (w `shiftR` 16) + byte3 w = fromIntegral (w `shiftR` 24) + #endif + + #if defined(x86_64_TARGET_ARCH) + byte4, byte5, byte6, byte7 :: (Integral w, Bits w) => w -> Word8 + byte4 w = fromIntegral (w `shiftR` 32) + byte5 w = fromIntegral (w `shiftR` 40) + byte6 w = fromIntegral (w `shiftR` 48) + byte7 w = fromIntegral (w `shiftR` 56) + #endif + #ifndef __HADDOCK__ -- entry point for direct returns for created constr itbls foreign import ccall "&stg_interp_constr_entry" stg_interp_constr_entry :: Ptr () _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
