X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Mate%2FMethodPool.hs;h=1403eaea045745436919ce5c90755c0bd283722c;hb=8cce0bebc102531155bece6f56200cb7cf12d976;hp=a9aee0fd67de2bf991be1b5a95d6097cdcdde8d6;hpb=4acc971dbcafd34fa7f5716513ae4dd47e0ea0eb;p=mate.git diff --git a/Mate/MethodPool.hs b/Mate/MethodPool.hs index a9aee0f..1403eae 100644 --- a/Mate/MethodPool.hs +++ b/Mate/MethodPool.hs @@ -1,6 +1,7 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE ForeignFunctionInterface #-} +#include "debug.h" module Mate.MethodPool where import Data.Binary @@ -17,83 +18,85 @@ import Foreign.C.String import JVM.ClassFile import Harpy -#ifdef DEBUG import Harpy.X86Disassembler +#ifdef DEBUG import Text.Printf #endif import Mate.BasicBlocks import Mate.Types import Mate.X86CodeGen -import Mate.Utilities import Mate.ClassPool - +import Mate.Debug +import Mate.Utilities foreign import ccall "dynamic" - code_void :: FunPtr (IO ()) -> (IO ()) + code_void :: FunPtr (IO ()) -> IO () -foreign export ccall getMethodEntry :: CUInt -> CUInt -> IO CUInt getMethodEntry :: CUInt -> CUInt -> IO CUInt getMethodEntry signal_from methodtable = do - mmap <- get_methodmap >>= ptr2methodmap - tmap <- get_trapmap >>= ptr2trapmap - vmap <- get_virtualmap >>= ptr2virtualmap + mmap <- getMethodMap + tmap <- getTrapMap + vmap <- getVirtualMap let w32_from = fromIntegral signal_from let mi = tmap M.! w32_from let mi'@(MethodInfo method cm sig) = case mi of - (MI x) -> x - (VI (MethodInfo methname _ msig)) -> - (MethodInfo methname (vmap M.! (fromIntegral methodtable)) msig) - _ -> error $ "getMethodEntry: no trapInfo. abort." + (StaticMethod x) -> x + (VirtualMethod _ (MethodInfo methname _ msig)) -> newMi methname msig + (InterfaceMethod _ (MethodInfo methname _ msig)) -> newMi methname msig + _ -> error "getMethodEntry: no TrapCause found. abort." + where newMi mn = MethodInfo mn (vmap M.! fromIntegral methodtable) + -- bernhard (TODO): doesn't work with gnu classpath at some point. didn't + -- figured out the problem yet :/ therefore, I have no + -- testcase for replaying the situation. + -- setTrapMap $ M.delete w32_from tmap case M.lookup mi' mmap of Nothing -> do cls <- getClassFile cm -#ifdef DEBUG - printf "getMethodEntry(from 0x%08x): no method \"%s\" found. compile it\n" w32_from (show mi') -#endif - mm <- lookupMethodRecursive method [] cls + printfMp "getMethodEntry(from 0x%08x): no method \"%s\" found. compile it\n" w32_from (show mi') + mm <- lookupMethodRecursive method sig [] cls case mm of Just (mm', clsnames, cls') -> do let flags = methodAccessFlags mm' - case S.member ACC_NATIVE flags of - False -> do - hmap <- parseMethod cls' method + if S.member ACC_NATIVE flags + then do + -- TODO(bernhard): cleaner please... *do'h* + let sym1 = replace "/" "_" $ toString cm + parenth = replace "(" "_" $ replace ")" "_" $ toString $ encode sig + sym2 = replace ";" "_" $ replace "/" "_" parenth + symbol = sym1 ++ "__" ++ toString method ++ "__" ++ sym2 + printfMp "native-call: symbol: %s\n" symbol + nf <- loadNativeFunction symbol + let w32_nf = fromIntegral nf + setMethodMap $ M.insert mi' w32_nf mmap + return nf + else do + hmap <- parseMethod cls' method sig case hmap of Just hmap' -> do entry <- compileBB hmap' (MethodInfo method (thisClass cls') sig) addMethodRef entry mi' clsnames return $ fromIntegral entry - Nothing -> error $ (show method) ++ " not found. abort" - True -> do - -- TODO(bernhard): cleaner please... *do'h* - let symbol = (replace "/" "_" $ toString cm) ++ "__" ++ (toString method) ++ "__" ++ (replace ";" "_" $ replace "/" "_" $ replace "(" "_" (replace ")" "_" $ toString $ encode sig)) -#ifdef DEBUG - printf "native-call: symbol: %s\n" symbol -#endif - nf <- loadNativeFunction symbol - let w32_nf = fromIntegral nf - let mmap' = M.insert mi' w32_nf mmap - methodmap2ptr mmap' >>= set_methodmap - return nf - Nothing -> error $ (show method) ++ " not found. abort" + Nothing -> error $ show method ++ " not found. abort" + Nothing -> error $ show method ++ " not found. abort" Just w32 -> return (fromIntegral w32) -lookupMethodRecursive :: B.ByteString -> [B.ByteString] -> Class Resolved - -> IO (Maybe ((Method Resolved, [B.ByteString], Class Resolved))) -lookupMethodRecursive name clsnames cls = do +lookupMethodRecursive :: B.ByteString -> MethodSignature -> [B.ByteString] -> Class Direct + -> IO (Maybe (Method Direct, [B.ByteString], Class Direct)) +lookupMethodRecursive name sig clsnames cls = case res of Just x -> return $ Just (x, nextclsn, cls) Nothing -> if thisname == "java/lang/Object" - then return $ Nothing + then return Nothing else do supercl <- getClassFile (superClass cls) - lookupMethodRecursive name nextclsn supercl + lookupMethodRecursive name sig nextclsn supercl where - res = lookupMethod name cls + res = lookupMethodSig name sig cls thisname = thisClass cls nextclsn :: [B.ByteString] nextclsn = thisname:clsnames @@ -102,13 +105,13 @@ lookupMethodRecursive name clsnames cls = do foreign import ccall safe "lookupSymbol" c_lookupSymbol :: CString -> IO (Ptr a) -loadNativeFunction :: String -> IO (CUInt) +loadNativeFunction :: String -> IO CUInt loadNativeFunction sym = do _ <- loadRawObject "ffi/native.o" -- TODO(bernhard): WTF resolveObjs (return ()) ptr <- withCString sym c_lookupSymbol - if (ptr == nullPtr) + if ptr == nullPtr then error $ "dyn. loading of \"" ++ sym ++ "\" failed." else return $ fromIntegral $ ptrToIntPtr ptr @@ -121,42 +124,34 @@ loadNativeFunction sym = do -- mmap2ptr mmap >>= set_mmap -- demo_mmap -- access Data.Map from C -initMethodPool :: IO () -initMethodPool = do - methodmap2ptr M.empty >>= set_methodmap - trapmap2ptr M.empty >>= set_trapmap - classmap2ptr M.empty >>= set_classmap - virtualmap2ptr M.empty >>= set_virtualmap - stringsmap2ptr M.empty >>= set_stringsmap - - addMethodRef :: Word32 -> MethodInfo -> [B.ByteString] -> IO () addMethodRef entry (MethodInfo mmname _ msig) clsnames = do - mmap <- get_methodmap >>= ptr2methodmap - let newmap = M.fromList $ map (\x -> ((MethodInfo mmname x msig), entry)) clsnames - methodmap2ptr (mmap `M.union` newmap) >>= set_methodmap + mmap <- getMethodMap + let newmap = M.fromList $ map (\x -> (MethodInfo mmname x msig, entry)) clsnames + setMethodMap $ mmap `M.union` newmap compileBB :: MapBB -> MethodInfo -> IO Word32 compileBB hmap methodinfo = do - tmap <- get_trapmap >>= ptr2trapmap + tmap <- getTrapMap cls <- getClassFile (methClassName methodinfo) - let ebb = emitFromBB (methName methodinfo) cls hmap + let ebb = emitFromBB (methName methodinfo) (methSignature methodinfo) cls hmap (_, Right right) <- runCodeGen ebb () () let ((entry, _, _, new_tmap), _) = right - let tmap' = M.union tmap new_tmap -- prefers elements in cmap - trapmap2ptr tmap' >>= set_trapmap - -#ifdef DEBUG - printf "disasm:\n" - mapM_ (putStrLn . showAtt) (snd right) -#endif - -- UNCOMMENT NEXT LINE FOR GDB FUN - -- _ <- getLine - -- (1) start it with `gdb ./mate' and then `run ' - -- (2) on getLine, press ctrl+c + setTrapMap $ tmap `M.union` new_tmap -- prefers elements in tmap + + printfJit "generated code of \"%s\" from \"%s\":\n" (toString $ methName methodinfo) (toString $ methClassName methodinfo) + mapM_ (printfJit "%s\n" . showAtt) (snd right) + printfJit "\n\n" + -- UNCOMMENT NEXT LINES FOR GDB FUN + -- if (toString $ methName methodinfo) == "thejavamethodIwant2debug" + -- then putStrLn "press CTRL+C now for setting a breakpoint. then `c' and ENTER for continue" >> getLine + -- else return "foo" + -- (1) build a debug build (see HACKING) and execute `make tests/Fib.gdb' + -- for example, where the suffix is important + -- (2) on getLine, press CTRL+C -- (3) `br *0x'; obtain the address from the disasm above -- (4) `cont' and press enter return $ fromIntegral $ ptrToIntPtr entry @@ -164,4 +159,4 @@ compileBB hmap methodinfo = do executeFuncPtr :: Word32 -> IO () executeFuncPtr entry = - code_void $ ((castPtrToFunPtr $ intPtrToPtr $ fromIntegral entry) :: FunPtr (IO ())) + code_void ((castPtrToFunPtr $ intPtrToPtr $ fromIntegral entry) :: FunPtr (IO ()))