refactor: style, fun, hlint, ...

[mate.git] / Mate / MethodPool.hs

diff --git a/Mate/MethodPool.hs b/Mate/MethodPool.hs
index c243d113950084fa56652f7b4950a64765c50797..7f0779c2627e1b905c0bf159b626a553f6e2424a 100644 (file)
--- a/Mate/MethodPool.hs
+++ b/Mate/MethodPool.hs
@@ -29,6 +29,7 @@ import Mate.Types
 import Mate.X86CodeGen
 import Mate.ClassPool
 import Mate.Debug
+import Mate.Utilities
 
 foreign import ccall "dynamic"
    code_void :: FunPtr (IO ()) -> IO ()
@@ -44,17 +45,20 @@ getMethodEntry signal_from methodtable = do
   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
-          (II (MethodInfo methname _ msig)) ->
-              MethodInfo methname (vmap M.! fromIntegral methodtable) msig
-          _ -> error "getMethodEntry: no trapInfo. abort."
-  case M.lookup mi' mmap 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)
+  -- 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
+  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')
-      mm <- lookupMethodRecursive method [] cls
+      mm <- lookupMethodRecursive method sig [] cls
       case mm of
         Just (mm', clsnames, cls') -> do
             let flags = methodAccessFlags mm'
@@ -67,11 +71,10 @@ getMethodEntry signal_from methodtable = do
                     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
+                setMethodMap $ M.insert mi' nf mmap
                 return nf
               else do
-                hmap <- parseMethod cls' method
+                hmap <- parseMethod cls' method sig
                 case hmap of
                   Just hmap' -> do
                     entry <- compileBB hmap' (MethodInfo method (thisClass cls') sig)
@@ -79,20 +82,21 @@ getMethodEntry signal_from methodtable = do
                     return $ fromIntegral entry
                   Nothing -> error $ show method ++ " not found. abort"
         Nothing -> error $ show method ++ " not found. abort"
-    Just w32 -> return (fromIntegral w32)
+    Just w32 -> return w32
+  return $ fromIntegral entryaddr
 
-lookupMethodRecursive :: B.ByteString -> [B.ByteString] -> Class Direct
+lookupMethodRecursive :: B.ByteString -> MethodSignature -> [B.ByteString] -> Class Direct
                          -> IO (Maybe (Method Direct, [B.ByteString], Class Direct))
-lookupMethodRecursive name clsnames cls =
+lookupMethodRecursive name sig clsnames cls =
   case res of
     Just x -> return $ Just (x, nextclsn, cls)
     Nothing -> if thisname == "java/lang/Object"
       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
@@ -101,7 +105,7 @@ lookupMethodRecursive name clsnames cls =
 foreign import ccall safe "lookupSymbol"
    c_lookupSymbol :: CString -> IO (Ptr a)
 
-loadNativeFunction :: String -> IO CUInt
+loadNativeFunction :: String -> IO Word32
 loadNativeFunction sym = do
         _ <- loadRawObject "ffi/native.o"
         -- TODO(bernhard): WTF
@@ -123,7 +127,7 @@ loadNativeFunction sym = do
 addMethodRef :: Word32 -> 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
 
 
@@ -132,19 +136,22 @@ compileBB hmap methodinfo = do
   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
   setTrapMap $ tmap `M.union` new_tmap -- prefers elements in tmap
 
-  printfJit "generated code of \"%s\":\n" (toString $ methName methodinfo)
+  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 LINE FOR GDB FUN
-  -- _ <- getLine
-  -- (1) start it with `gdb ./mate' and then `run <classfile>'
-  -- (2) on getLine, press ctrl+c
+  -- 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<addr>'; obtain the address from the disasm above
   -- (4) `cont' and press enter
   return $ fromIntegral $ ptrToIntPtr entry