X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghci%2FByteCodeFFI.lhs;h=d72f1ac94ee4b86e4cfb1253cd5277a7b6dcb7be;hb=d8b4de2312721efcf7d6ecc02f672d0aa6a95817;hp=09b32dae8b7b4c7153218d645003ff952fc56f85;hpb=ad94d40948668032189ad22a0ad741ac1f645f50;p=ghc-hetmet.git diff --git a/compiler/ghci/ByteCodeFFI.lhs b/compiler/ghci/ByteCodeFFI.lhs index 09b32da..d72f1ac 100644 --- a/compiler/ghci/ByteCodeFFI.lhs +++ b/compiler/ghci/ByteCodeFFI.lhs @@ -9,13 +9,25 @@ ByteCodeGen: Generate machine-code sequences for foreign import -- The above warning supression flag is a temporary kludge. -- While working on this module you are encouraged to remove it and fix -- any warnings in the module. See --- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings +-- http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings -- for details +#ifdef USE_LIBFFI + +module ByteCodeFFI ( moan64, newExec ) where + +import Outputable +import System.IO +import Foreign +import Foreign.C + +#else + module ByteCodeFFI ( mkMarshalCode, moan64, newExec ) where #include "HsVersions.h" +import TyCon import Outputable import SMRep import ForeignCall @@ -44,21 +56,6 @@ import System.IO ( hPutStrLn, stderr ) \begin{code} -moan64 :: String -> SDoc -> a -moan64 msg pp_rep - = unsafePerformIO ( - hPutStrLn stderr ( - "\nGHCi's bytecode generation machinery can't handle 64-bit\n" ++ - "code properly yet. You can work around this for the time being\n" ++ - "by compiling this module and all those it imports to object code,\n" ++ - "and re-starting your GHCi session. The panic below contains information,\n" ++ - "intended for the GHC implementors, about the exact place where GHC gave up.\n" - ) - ) - `seq` - pprPanic msg pp_rep - - -- For sparc_TARGET_ARCH, i386_TARGET_ARCH, etc. #include "nativeGen/NCG.h" @@ -78,27 +75,15 @@ itself expects only to be called using the ccall convention -- that is, we don't clear our own (single) arg off the C stack. -} mkMarshalCode :: CCallConv - -> (Int, CgRep) -> Int -> [(Int, CgRep)] + -> (Int, PrimRep) -> Int -> [(Int, PrimRep)] -> IO (FunPtr ()) mkMarshalCode cconv (r_offW, r_rep) addr_offW arg_offs_n_reps = let bytes = mkMarshalCode_wrk cconv (r_offW, r_rep) addr_offW arg_offs_n_reps in newExec bytes -newExec :: Storable a => [a] -> IO (FunPtr ()) -newExec code - = do ptr <- _allocateExec (fromIntegral $ codeSize undefined code) - pokeArray ptr code - return (castPtrToFunPtr ptr) - where - codeSize :: Storable a => a -> [a] -> Int - codeSize dummy array = sizeOf(dummy) * length array - -foreign import ccall unsafe "allocateExec" - _allocateExec :: CUInt -> IO (Ptr a) - mkMarshalCode_wrk :: CCallConv - -> (Int, CgRep) -> Int -> [(Int, CgRep)] + -> (Int, PrimRep) -> Int -> [(Int, PrimRep)] -> [Word8] mkMarshalCode_wrk cconv (r_offW, r_rep) addr_offW arg_offs_n_reps @@ -111,7 +96,7 @@ mkMarshalCode_wrk cconv (r_offW, r_rep) addr_offW arg_offs_n_reps offsets_to_pushW = concat [ -- reversed because x86 is little-endian - reverse [a_offW .. a_offW + cgRepSizeW a_rep - 1] + reverse [a_offW .. a_offW + primRepSizeW a_rep - 1] -- reversed because args are pushed L -> R onto C stack | (a_offW, a_rep) <- reverse arg_offs_n_reps @@ -267,11 +252,14 @@ mkMarshalCode_wrk cconv (r_offW, r_rep) addr_offW arg_offs_n_reps f64 = fstpl_offesimem 0 in case r_rep of - NonPtrArg -> i32 - DoubleArg -> f64 - FloatArg -> f32 - LongArg -> i64 - VoidArg -> [] + VoidRep -> [] + IntRep -> i32 + WordRep -> i32 + Int64Rep -> i64 + Word64Rep -> i64 + AddrRep -> i32 + FloatRep -> f32 + DoubleRep -> f64 other -> moan64 "ByteCodeFFI.mkMarshalCode_wrk(x86)" (ppr r_rep) @@ -368,13 +356,13 @@ mkMarshalCode_wrk cconv (r_offW, r_rep) addr_offW arg_offs_n_reps load_arg_regs args [] [] code = (args, [], code) load_arg_regs [] iregs fregs code = ([], fregs, code) load_arg_regs ((off,rep):args) iregs fregs code - | FloatArg <- rep = + | FloatRep <- rep = case fregs of [] -> push_this_arg n : frest -> load_arg_regs args iregs frest (mov_f32_rbpoff_xmm n (bytes_per_word * off) : code) - | DoubleArg <- rep = + | DoubleRep <- rep = case fregs of [] -> push_this_arg n : frest -> @@ -390,10 +378,10 @@ mkMarshalCode_wrk cconv (r_offW, r_rep) addr_offW arg_offs_n_reps push_args [] code pushed_words = (code, pushed_words) push_args ((off,rep):args) code pushed_words - | FloatArg <- rep = + | FloatRep <- rep = push_args args (push_f32_rbpoff (bytes_per_word * off) : code) (pushed_words+1) - | DoubleArg <- rep = + | DoubleRep <- rep = push_args args (push_f64_rbpoff (bytes_per_word * off) : code) (pushed_words+1) | otherwise = @@ -403,16 +391,16 @@ mkMarshalCode_wrk cconv (r_offW, r_rep) addr_offW arg_offs_n_reps assign_result = case r_rep of - DoubleArg -> f64 - FloatArg -> f32 - VoidArg -> [] + DoubleRep -> f64 + FloatRep -> f32 + VoidRep -> [] _other -> i64 where i64 = movq_rax_rbpoff 0 f32 = mov_f32_xmm0_rbpoff 0 f64 = mov_f64_xmm0_rbpoff 0 --- ######### x86_64 machine code: +-- ######### x86_64 machine code: -- 0: 48 89 fd mov %rdi,%rbp -- 3: 48 8b bd 78 56 34 12 mov 0x12345678(%rbp),%rdi @@ -489,7 +477,7 @@ mkMarshalCode_wrk cconv (r_offW, r_rep) addr_offW arg_offs_n_reps offsets_to_pushW = concat - [ [a_offW .. a_offW + cgRepSizeW a_rep - 1] + [ [a_offW .. a_offW + primRepSizeW a_rep - 1] | (a_offW, a_rep) <- arg_offs_n_reps ] @@ -640,10 +628,12 @@ mkMarshalCode_wrk cconv (r_offW, r_rep) addr_offW arg_offs_n_reps f64 = [mkSTF f0 i0 0, mkSTF f1 i0 4] in case r_rep of - NonPtrArg -> i32 - DoubleArg -> f64 - FloatArg -> f32 - VoidArg -> [] + VoidRep -> [] + IntRep -> i32 + WordRep -> i32 + AddrRep -> i32 + FloatRep -> f32 + DoubleRep -> f64 other -> moan64 "ByteCodeFFI.mkMarshalCode_wrk(sparc)" (ppr r_rep) @@ -668,7 +658,7 @@ mkMarshalCode_wrk cconv (r_offW, r_rep) addr_offW arg_offs_n_reps result_off = r_offW * bytes_per_word linkageArea = 24 - parameterArea = sum [ cgRepSizeW a_rep * bytes_per_word + parameterArea = sum [ primRepSizeW a_rep * bytes_per_word | (_, a_rep) <- arg_offs_n_reps ] savedRegisterArea = 4 frameSize = padTo16 (linkageArea + max parameterArea 32 + savedRegisterArea) @@ -680,7 +670,7 @@ mkMarshalCode_wrk cconv (r_offW, r_rep) addr_offW arg_offs_n_reps pass_parameters ((a_offW, a_rep):args) nextFPR offsetW = let haskellArgOffset = a_offW * bytes_per_word - offsetW' = offsetW + cgRepSizeW a_rep + offsetW' = offsetW + primRepSizeW a_rep pass_word w | offsetW + w < 8 = @@ -697,34 +687,34 @@ mkMarshalCode_wrk cconv (r_offW, r_rep) addr_offW arg_offs_n_reps dst = linkageArea + (offsetW+w) * bytes_per_word in case a_rep of - FloatArg | nextFPR < 14 -> + FloatRep | nextFPR < 14 -> (0xc01f0000 -- lfs fX, haskellArgOffset(r31) .|. (fromIntegral haskellArgOffset .&. 0xFFFF) .|. (fromIntegral nextFPR `shiftL` 21)) : pass_parameters args (nextFPR+1) offsetW' - DoubleArg | nextFPR < 14 -> + DoubleRep | nextFPR < 14 -> (0xc81f0000 -- lfd fX, haskellArgOffset(r31) .|. (fromIntegral haskellArgOffset .&. 0xFFFF) .|. (fromIntegral nextFPR `shiftL` 21)) : pass_parameters args (nextFPR+1) offsetW' _ -> - concatMap pass_word [0 .. cgRepSizeW a_rep - 1] + concatMap pass_word [0 .. primRepSizeW a_rep - 1] ++ pass_parameters args nextFPR offsetW' gather_result = case r_rep of - VoidArg -> [] - FloatArg -> + VoidRep -> [] + FloatRep -> [0xd03f0000 .|. (fromIntegral result_off .&. 0xFFFF)] -- stfs f1, result_off(r31) - DoubleArg -> + DoubleRep -> [0xd83f0000 .|. (fromIntegral result_off .&. 0xFFFF)] -- stfd f1, result_off(r31) - _ | cgRepSizeW r_rep == 2 -> + _ | primRepSizeW r_rep == 2 -> [0x907f0000 .|. (fromIntegral result_off .&. 0xFFFF), 0x909f0000 .|. (fromIntegral (result_off+4) .&. 0xFFFF)] -- stw r3, result_off(r31) -- stw r4, result_off+4(r31) - _ | cgRepSizeW r_rep == 1 -> + _ | primRepSizeW r_rep == 1 -> [0x907f0000 .|. (fromIntegral result_off .&. 0xFFFF)] -- stw r3, result_off(r31) in @@ -775,10 +765,11 @@ mkMarshalCode_wrk cconv (r_offW, r_rep) addr_offW arg_offs_n_reps where gather_result :: [Word32] gather_result = case r_rep of - VoidArg -> [] - FloatArg -> storeFloat 1 r_offW - DoubleArg -> storeDouble 1 r_offW - LongArg -> storeLong 3 r_offW + VoidRep -> [] + FloatRep -> storeFloat 1 r_offW + DoubleRep -> storeDouble 1 r_offW + Int64Rep -> storeLong 3 r_offW + Word64Rep -> storeLong 3 r_offW _ -> storeWord 3 r_offW pass_parameters :: [Word32] @@ -790,24 +781,27 @@ mkMarshalCode_wrk cconv (r_offW, r_rep) addr_offW arg_offs_n_reps ((_,_,argsize), params) = mapAccumL loadparam (3,1,2) arg_offs_n_reps -- handle one argument, returning machine code and the updated state - loadparam :: (Int, Int, Int) -> (Int, CgRep) -> + loadparam :: (Int, Int, Int) -> (Int, PrimRep) -> ((Int, Int, Int), [Word32]) loadparam (gpr, fpr, stack) (ofs, rep) = case rep of - FloatArg | fpr <= 8 -> ( (gpr, fpr + 1, stack), loadFloat fpr ofs ) - FloatArg -> ( (gpr, fpr, stack + 1), stackWord stack ofs ) + FloatRep | fpr <= 8 -> ( (gpr, fpr + 1, stack), loadFloat fpr ofs ) + FloatRep -> ( (gpr, fpr, stack + 1), stackWord stack ofs ) - DoubleArg | fpr <= 8 -> ( (gpr, fpr + 1, stack), loadDouble fpr ofs ) - DoubleArg -> ( (gpr, fpr, astack + 2), stackLong astack ofs ) - - LongArg | even gpr -> loadparam (gpr + 1, fpr, stack) (ofs, rep) - LongArg | gpr <= 9 -> ( (gpr + 2, fpr, stack), loadLong gpr ofs ) - LongArg -> ( (gpr, fpr, astack + 2), stackLong astack ofs ) + DoubleRep | fpr <= 8 -> ( (gpr, fpr + 1, stack), loadDouble fpr ofs ) + DoubleRep -> ( (gpr, fpr, astack + 2), stackLong astack ofs ) + r | is64 r && even gpr -> loadparam (gpr + 1, fpr, stack) (ofs, rep) + r | is64 r && gpr <= 9 -> ( (gpr + 2, fpr, stack), loadLong gpr ofs ) + r | is64 r -> ( (gpr, fpr, astack + 2), stackLong astack ofs ) _ | gpr <= 10 -> ( (gpr + 1, fpr, stack), loadWord gpr ofs ) _ -> ( (gpr, fpr, stack + 1), stackWord stack ofs ) where astack = alignedTo 2 stack + is64 Int64Rep = True + is64 Word64Rep = True + is64 _ = False + alignedTo :: Int -> Int -> Int alignedTo alignment x = case x `mod` alignment of 0 -> x @@ -862,5 +856,33 @@ lit32 i = let w32 = (fromIntegral i) :: Word32 [w32, w32 `shiftR` 8, w32 `shiftR` 16, w32 `shiftR` 24] #endif + +#endif /* !USE_LIBFFI */ + +moan64 :: String -> SDoc -> a +moan64 msg pp_rep + = unsafePerformIO ( + hPutStrLn stderr ( + "\nGHCi's bytecode generation machinery can't handle 64-bit\n" ++ + "code properly yet. You can work around this for the time being\n" ++ + "by compiling this module and all those it imports to object code,\n" ++ + "and re-starting your GHCi session. The panic below contains information,\n" ++ + "intended for the GHC implementors, about the exact place where GHC gave up.\n" + ) + ) + `seq` + pprPanic msg pp_rep + +newExec :: Storable a => [a] -> IO (FunPtr ()) +newExec code + = do ptr <- _allocateExec (fromIntegral $ codeSize undefined code) + pokeArray ptr code + return (castPtrToFunPtr ptr) + where + codeSize :: Storable a => a -> [a] -> Int + codeSize dummy array = sizeOf(dummy) * length array + +foreign import ccall unsafe "allocateExec" + _allocateExec :: CUInt -> IO (Ptr a) \end{code}