Commit cfcf0a54 authored by Simon Peyton Jones's avatar Simon Peyton Jones
Browse files

Merge branch 'master' of http://darcs.haskell.org/ghc

Conflicts:
	compiler/ghci/ByteCodeItbls.lhs
parents 70bccc12 9f24caab
......@@ -198,13 +198,6 @@ mkJumpToAddr a
in
insnBytes
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)
#elif x86_64_TARGET_ARCH
-- Generates:
-- jmpq *.L1(%rip)
......@@ -227,17 +220,6 @@ mkJumpToAddr a
in
insnBytes
byte0, byte1, byte2, byte3, byte4, byte5, byte6, byte7
:: (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)
byte4 w = fromIntegral (w `shiftR` 32)
byte5 w = fromIntegral (w `shiftR` 40)
byte6 w = fromIntegral (w `shiftR` 48)
byte7 w = fromIntegral (w `shiftR` 56)
#elif alpha_TARGET_ARCH
type ItblCode = Word32
mkJumpToAddr a
......@@ -255,6 +237,22 @@ mkJumpToAddr a
= 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 ()
......
......@@ -431,7 +431,7 @@ static void flushStdHandles(void)
{
Capability *cap;
cap = rts_lock();
rts_evalIO(cap, flushStdHandles_closure, NULL);
cap = rts_evalIO(cap, flushStdHandles_closure, NULL);
rts_unlock(cap);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment