X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Mate%2FMethodPool.hs;h=4be3cf2577a7764660e59c19b1a55d01c33c6c1a;hb=1d125225bf0257dcfcf415f94eb46e07daee2dbf;hp=f7038f3b1e1afdaa640d274ba1c5e2c39a4a954c;hpb=be380d1452ca0ac7be1dc0d593b674d8db7707da;p=mate.git diff --git a/Mate/MethodPool.hs b/Mate/MethodPool.hs index f7038f3..4be3cf2 100644 --- a/Mate/MethodPool.hs +++ b/Mate/MethodPool.hs @@ -18,7 +18,9 @@ import Foreign.C.String import JVM.ClassFile import Harpy +#ifdef DBG_JIT import Harpy.X86Disassembler +#endif #ifdef DEBUG import Text.Printf @@ -26,16 +28,25 @@ import Text.Printf import Mate.BasicBlocks import Mate.Types -import Mate.X86CodeGen +import Mate.NativeMachine import Mate.ClassPool import Mate.Debug import Mate.Utilities +import Mate.Rts() foreign import ccall "dynamic" code_void :: FunPtr (IO ()) -> IO () +foreign import ccall "&demoInterfaceCall" + demoInterfaceCallAddr :: FunPtr (CUInt -> IO ()) + +foreign import ccall "&printMemoryUsage" + printMemoryUsageAddr :: FunPtr (IO ()) + +foreign import ccall "&loadLibrary" + loadLibraryAddr :: FunPtr (IO ()) -getMethodEntry :: CUInt -> CUInt -> IO CUInt +getMethodEntry :: CPtrdiff -> CPtrdiff -> IO CPtrdiff getMethodEntry signal_from methodtable = do mmap <- getMethodMap tmap <- getTrapMap @@ -44,17 +55,16 @@ getMethodEntry signal_from methodtable = do let w32_from = fromIntegral signal_from let mi = tmap M.! w32_from let mi'@(MethodInfo method cm sig) = - case mi of - (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) + case mi of + (StaticMethod x) -> x + (VirtualCall _ (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 + entryaddr <- case M.lookup mi' mmap of Nothing -> do cls <- getClassFile cm printfMp "getMethodEntry(from 0x%08x): no method \"%s\" found. compile it\n" w32_from (show mi') @@ -64,26 +74,38 @@ getMethodEntry signal_from methodtable = do let flags = methodAccessFlags mm' 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 + let scm = toString cm; smethod = toString method + if scm == "jmate/lang/MateRuntime" then do + case smethod of + "loadLibrary" -> + return . funPtrToAddr $ loadLibraryAddr + "demoInterfaceCall" -> + return . funPtrToAddr $ demoInterfaceCallAddr + "printMemoryUsage" -> + return . funPtrToAddr $ printMemoryUsageAddr + _ -> + error $ "native-call: " ++ smethod ++ " not found." + else do + -- TODO(bernhard): cleaner please... *do'h* + let sym1 = replace "/" "_" scm + parenth = replace "(" "_" $ replace ")" "_" $ toString $ encode sig + sym2 = replace ";" "_" $ replace "/" "_" parenth + symbol = sym1 ++ "__" ++ smethod ++ "__" ++ sym2 + printfMp "native-call: symbol: %s\n" symbol + nf <- loadNativeFunction symbol + setMethodMap $ M.insert mi' 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" + rawmethod <- parseMethod cls' method sig + entry <- compileBB rawmethod (MethodInfo method (thisClass cls') sig) + addMethodRef entry mi' clsnames + return $ fromIntegral entry Nothing -> error $ show method ++ " not found. abort" - Just w32 -> return (fromIntegral w32) + Just w32 -> return w32 + return $ fromIntegral entryaddr + +funPtrToAddr :: Num b => FunPtr a -> b +funPtrToAddr = fromIntegral . ptrToIntPtr . castFunPtrToPtr lookupMethodRecursive :: B.ByteString -> MethodSignature -> [B.ByteString] -> Class Direct -> IO (Maybe (Method Direct, [B.ByteString], Class Direct)) @@ -96,66 +118,71 @@ lookupMethodRecursive name sig clsnames cls = supercl <- getClassFile (superClass cls) lookupMethodRecursive name sig nextclsn supercl where - res = lookupMethodSig name sig cls - thisname = thisClass cls - nextclsn :: [B.ByteString] - nextclsn = thisname:clsnames + res = lookupMethodSig name sig cls + thisname = thisClass cls + nextclsn :: [B.ByteString] + nextclsn = thisname:clsnames -- TODO(bernhard): UBERHAX. ghc patch? foreign import ccall safe "lookupSymbol" c_lookupSymbol :: CString -> IO (Ptr a) -loadNativeFunction :: String -> IO CUInt +loadNativeFunction :: String -> IO NativeWord loadNativeFunction sym = do - _ <- loadRawObject "ffi/native.o" - -- TODO(bernhard): WTF - resolveObjs (return ()) - ptr <- withCString sym c_lookupSymbol - if ptr == nullPtr - then error $ "dyn. loading of \"" ++ sym ++ "\" failed." - else return $ fromIntegral $ ptrToIntPtr ptr + _ <- loadRawObject "ffi/native.o" + -- TODO(bernhard): WTF + resolveObjs (return ()) + ptr <- withCString sym c_lookupSymbol + if ptr == nullPtr + then error $ "dyn. loading of \"" ++ sym ++ "\" failed." + else return $ fromIntegral $ ptrToIntPtr ptr -- t_01 :: IO () -- t_01 = do -- (entry, _) <- testCase "./tests/Fib.class" "fib" --- let int_entry = ((fromIntegral $ ptrToIntPtr entry) :: Word32) +-- let int_entry = ((fromIntegral $ ptrToIntPtr entry) :: NativeWord) -- let mmap = M.insert ("fib" :: String) int_entry M.empty -- mapM_ (\(x,y) -> printf "%s at 0x%08x\n" x y) $ M.toList mmap -- mmap2ptr mmap >>= set_mmap -- demo_mmap -- access Data.Map from C -addMethodRef :: Word32 -> MethodInfo -> [B.ByteString] -> IO () +addMethodRef :: NativeWord -> MethodInfo -> [B.ByteString] -> IO () addMethodRef entry (MethodInfo mmname _ msig) clsnames = do mmap <- getMethodMap - let newmap = M.fromList $ map (\x -> (MethodInfo mmname x msig, entry)) clsnames + let newmap = foldr (\i -> M.insert (MethodInfo mmname i msig) entry) M.empty clsnames setMethodMap $ mmap `M.union` newmap -compileBB :: MapBB -> MethodInfo -> IO Word32 -compileBB hmap methodinfo = do +compileBB :: RawMethod -> MethodInfo -> IO NativeWord +compileBB rawmethod methodinfo = do tmap <- getTrapMap cls <- getClassFile (methClassName methodinfo) - let ebb = emitFromBB (methName methodinfo) (methSignature methodinfo) cls hmap - (_, Right right) <- runCodeGen ebb () () + let ebb = emitFromBB cls rawmethod + let cgconfig = defaultCodeGenConfig { codeBufferSize = fromIntegral $ (rawCodeLength rawmethod) * 32 } + (_, Right right) <- runCodeGenWithConfig ebb () () cgconfig let ((entry, _, _, new_tmap), _) = right setTrapMap $ tmap `M.union` new_tmap -- prefers elements in tmap printfJit "generated code of \"%s\" from \"%s\":\n" (toString $ methName methodinfo) (toString $ methClassName methodinfo) + printfJit "\tstacksize: 0x%04x, locals: 0x%04x\n" (rawStackSize rawmethod) (rawLocals rawmethod) +#ifdef DBG_JIT mapM_ (printfJit "%s\n" . showAtt) (snd right) +#endif printfJit "\n\n" -- UNCOMMENT NEXT LINES FOR GDB FUN - --if (toString $ methName methodinfo) == "thejavamethodIwant2debug" - -- then getLine - -- else return "foo" - -- (1) start it with `gdb ./mate' and then `run ' - -- (2) on getLine, press ctrl+c + -- 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 -executeFuncPtr :: Word32 -> IO () +executeFuncPtr :: NativeWord -> IO () executeFuncPtr entry = code_void ((castPtrToFunPtr $ intPtrToPtr $ fromIntegral entry) :: FunPtr (IO ()))