methodlookup: unique identifier for methods are name+signature

[mate.git] / Mate / MethodPool.hs

diff --git a/Mate/MethodPool.hs b/Mate/MethodPool.hs
index 216a287daa15c1683a857b5aee7ffc2620428c1f..5a0144521ad241e626b110726612de27ade683bd 100644 (file)
--- a/Mate/MethodPool.hs
+++ b/Mate/MethodPool.hs
@@ -27,9 +27,9 @@ import Text.Printf
 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 ()
@@ -55,7 +55,7 @@ getMethodEntry signal_from methodtable = do
     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'
@@ -72,7 +72,7 @@ getMethodEntry signal_from methodtable = do
                 setMethodMap $ M.insert mi' w32_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)
@@ -82,18 +82,18 @@ getMethodEntry signal_from methodtable = do
         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 =
+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
       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
@@ -133,17 +133,19 @@ 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
+  -- 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 <classfile>'
   -- (2) on getLine, press ctrl+c
   -- (3) `br *0x<addr>'; obtain the address from the disasm above