basicblock: rewrite buildCFG with states

[mate.git] / Mate / MethodPool.hs

diff --git a/Mate/MethodPool.hs b/Mate/MethodPool.hs
index 223f50909fc6d04f62167be770392f7d21e00aa2..db83f98b51465b917c3795da42a6dc8439d3ce11 100644 (file)
--- a/Mate/MethodPool.hs
+++ b/Mate/MethodPool.hs
@@ -8,6 +8,7 @@ import qualified Data.Map as M
 import qualified Data.Set as S
 import qualified Data.ByteString.Lazy as B
 import System.Plugins
+import Control.Monad
 
 import Foreign.Ptr
 import Foreign.C.Types
@@ -38,28 +39,14 @@ foreign import ccall "&loadLibrary"
 foreign import ccall "&printGCStats"
   printGCStatsAddr :: FunPtr (IO ())
 
-getMethodEntry :: CPtrdiff -> CPtrdiff -> IO CPtrdiff
-getMethodEntry signal_from methodtable = do
+getMethodEntry :: MethodInfo -> IO CPtrdiff
+getMethodEntry mi@(MethodInfo method cm sig) = do
   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
-         (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
-  entryaddr <- case M.lookup mi' mmap of
+
+  entryaddr <- case M.lookup mi mmap of
     Nothing -> do
       cls <- getClassFile cm
-      printfMp $ printf "getMethodEntry(from 0x%08x): no method \"%s\" found. compile it\n" w32_from (show mi')
+      printfMp $ printf "getMethodEntry: no method \"%s\" found. compile it\n" (show mi)
       mm <- lookupMethodRecursive method sig [] cls
       case mm of
         Just (mm', clsnames, cls') -> do
@@ -67,7 +54,7 @@ getMethodEntry signal_from methodtable = do
             if S.member ACC_NATIVE flags
               then do
                 let scm = toString cm; smethod = toString method
-                if scm == "jmate/lang/MateRuntime" then do
+                if scm == "jmate/lang/MateRuntime" then
                   case smethod of
                     "loadLibrary" ->
                        return . funPtrToAddr $ loadLibraryAddr
@@ -85,12 +72,12 @@ getMethodEntry signal_from methodtable = do
                       symbol = sym1 ++ "__" ++ smethod ++ "__" ++ sym2
                   printfMp $ printf "native-call: symbol: %s\n" symbol
                   nf <- loadNativeFunction symbol
-                  setMethodMap $ M.insert mi' nf mmap
+                  setMethodMap $ M.insert mi nf mmap
                   return nf
               else do
                 rawmethod <- parseMethod cls' method sig
                 entry <- compileBB rawmethod (MethodInfo method (thisClass cls') sig)
-                addMethodRef entry mi' clsnames
+                addMethodRef entry mi clsnames
                 return $ fromIntegral entry
         Nothing -> error $ show method ++ " not found. abort"
     Just w32 -> return w32
@@ -150,8 +137,9 @@ compileBB rawmethod methodinfo = do
   tmap <- getTrapMap
 
   cls <- getClassFile (methClassName methodinfo)
+  printfJit $ printf "emit code of \"%s\" from \"%s\":\n" (toString $ methName methodinfo) (toString $ methClassName methodinfo)
   let ebb = emitFromBB cls rawmethod
-  let cgconfig = defaultCodeGenConfig { codeBufferSize = fromIntegral $ (rawCodeLength rawmethod) * 32 }
+  let cgconfig = defaultCodeGenConfig { codeBufferSize = fromIntegral $ rawCodeLength rawmethod * 32 }
   (_, Right right) <- runCodeGenWithConfig ebb () () cgconfig
 
   let ((entry, _, _, new_tmap), _) = right
@@ -159,9 +147,7 @@ compileBB rawmethod methodinfo = do
 
   printfJit $ printf "generated code of \"%s\" from \"%s\":\n" (toString $ methName methodinfo) (toString $ methClassName methodinfo)
   printfJit $ printf "\tstacksize: 0x%04x, locals: 0x%04x\n" (rawStackSize rawmethod) (rawLocals rawmethod)
-  if mateDEBUG
-    then mapM_ (printfJit . printf "%s\n" . showAtt) (snd right)
-    else return ()
+  when mateDEBUG $ mapM_ (printfJit . printf "%s\n" . showIntel) (snd right)
   printfJit $ printf "\n\n"
   -- UNCOMMENT NEXT LINES FOR GDB FUN
   -- if (toString $ methName methodinfo) == "thejavamethodIwant2debug"