X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Mate%2FMethodPool.hs;h=5330ade2e6a5b8d1eac3b3878fd08622a9f91a25;hb=c803146cc80b61305fde8279f0a36f8fe6ef7eb2;hp=508ff117c6365961b3a7ffb3f4f42fc8b0569be4;hpb=da245b03d80644c22b011acba31acacb880d8327;p=mate.git

diff --git a/Mate/MethodPool.hs b/Mate/MethodPool.hs
index 508ff11..5330ade 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,7 +28,7 @@ import Text.Printf
 
 import Mate.BasicBlocks
 import Mate.Types
-import Mate.X86CodeGen
+import Mate.NativeMachine
 import Mate.ClassPool
 import Mate.Debug
 import Mate.Utilities
@@ -35,7 +37,7 @@ foreign import ccall "dynamic"
    code_void :: FunPtr (IO ()) -> IO ()
 
 
-getMethodEntry :: CUInt -> CUInt -> IO CUInt
+getMethodEntry :: CPtrdiff -> CPtrdiff -> IO CPtrdiff
 getMethodEntry signal_from methodtable = do
   mmap <- getMethodMap
   tmap <- getTrapMap
@@ -44,12 +46,11 @@ 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.
@@ -74,13 +75,10 @@ getMethodEntry signal_from methodtable = do
                 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 w32
   return $ fromIntegral entryaddr
@@ -96,55 +94,58 @@ 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 Word32
+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 = foldr (\i -> M.insert (MethodInfo mmname i msig) entry) M.empty clsnames
   setMethodMap $ mmap `M.union` newmap
 
 
-compileBB :: RawMethod -> MethodInfo -> IO Word32
+compileBB :: RawMethod -> MethodInfo -> IO NativeWord
 compileBB rawmethod methodinfo = do
   tmap <- getTrapMap
 
   cls <- getClassFile (methClassName methodinfo)
-  let ebb = emitFromBB (methName methodinfo) (methSignature methodinfo) cls rawmethod
-  (_, 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"
@@ -158,6 +159,6 @@ compileBB rawmethod methodinfo = do
   return $ fromIntegral $ ptrToIntPtr entry
 
 
-executeFuncPtr :: Word32 -> IO ()
+executeFuncPtr :: NativeWord -> IO ()
 executeFuncPtr entry =
   code_void ((castPtrToFunPtr $ intPtrToPtr $ fromIntegral entry) :: FunPtr (IO ()))