global map hack: refactor

[mate.git] / Mate / MethodPool.hs

diff --git a/Mate/MethodPool.hs b/Mate/MethodPool.hs
index e7a1aeb384ffa994ba2f8e7c168cddc47e10d98a..cba2d174da877a5c94c9ab5841a29f6661ada29c 100644 (file)
--- a/Mate/MethodPool.hs
+++ b/Mate/MethodPool.hs
@@ -3,34 +3,35 @@
 module Mate.MethodPool where
 
 import Data.Binary
+import Data.String.Utils
 import qualified Data.Map as M
+import qualified Data.Set as S
 import qualified Data.ByteString.Lazy as B
+import System.Plugins
 
 import Text.Printf
 
 import Foreign.Ptr
 import Foreign.C.Types
+import Foreign.C.String
 import Foreign.StablePtr
 
 import JVM.ClassFile
+import JVM.Converter
 
 import Harpy
 import Harpy.X86Disassembler
 
 import Mate.BasicBlocks
+import Mate.Types
 import Mate.X86CodeGen
+import Mate.Utilities
+import Mate.ClassPool
 
 
-foreign import ccall "get_mmap"
-  get_mmap :: IO (Ptr ())
-
-foreign import ccall "set_mmap"
-  set_mmap :: Ptr () -> IO ()
-
+foreign import ccall "dynamic"
+   code_void :: FunPtr (IO ()) -> (IO ())
 
--- B.ByteString = name of method
--- Word32 = entrypoint of method
-type MMap = M.Map B.ByteString Word32
 
 foreign export ccall getMethodEntry :: CUInt -> Ptr () -> Ptr () -> IO CUInt
 getMethodEntry :: CUInt -> Ptr () -> Ptr () -> IO CUInt
@@ -39,22 +40,50 @@ getMethodEntry signal_from ptr_mmap ptr_cmap = do
   cmap <- ptr2cmap ptr_cmap
 
   let w32_from = fromIntegral signal_from
-  let (method, cls, cpidx) = cmap M.! w32_from
-  case M.lookup method mmap of
+  let mi@(MethodInfo method cm sig) = cmap M.! w32_from
+  -- TODO(bernhard): replace parsing with some kind of classpool
+  cls <- getClassFile cm
+  case M.lookup mi mmap of
     Nothing -> do
-      printf "getMethodEntry(from 0x%08x): no method \"%s\" found. compile it\n" w32_from (show method)
-      -- TODO(bernhard): maybe we have to load the class first?
-      --                 (Or better in X86CodeGen?)
-      let (CMethod _ nt) = (constsPool cls) M.! cpidx
-      hmap <- parseMethod cls (ntName nt)
-      printMapBB hmap
-      case hmap of
-        Just hmap' -> do
-          entry <- compileBB hmap' cls method
-          return $ fromIntegral $ ((fromIntegral $ ptrToIntPtr entry) :: Word32)
+      printf "getMethodEntry(from 0x%08x): no method \"%s\" found. compile it\n" w32_from (show mi)
+      let mm = lookupMethod method cls
+      case mm of
+        Just mm' -> do
+            let flags = methodAccessFlags mm'
+            case S.member ACC_NATIVE flags of
+              False -> do
+                hmap <- parseMethod cls method
+                printMapBB hmap
+                case hmap of
+                  Just hmap' -> do
+                    entry <- compileBB hmap' mi
+                    return $ fromIntegral $ ((fromIntegral $ ptrToIntPtr entry) :: Word32)
+                  Nothing -> error $ (show method) ++ " not found. abort"
+              True -> do
+                let symbol = (replace "/" "_" $ toString cm) ++ "__" ++ (toString method) ++ "__" ++ (replace "(" "_" (replace ")" "_" $ toString $ encode sig))
+                printf "native-call: symbol: %s\n" symbol
+                nf <- loadNativeFunction symbol
+                let w32_nf = fromIntegral nf
+                let mmap' = M.insert mi w32_nf mmap
+                mmap2ptr mmap' >>= set_methodmap
+                return nf
         Nothing -> error $ (show method) ++ " not found. abort"
     Just w32 -> return (fromIntegral w32)
 
+-- TODO(bernhard): UBERHAX.  ghc patch?
+foreign import ccall safe "lookupSymbol"
+   c_lookupSymbol :: CString -> IO (Ptr a)
+
+loadNativeFunction :: String -> IO (CUInt)
+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 $ minusPtr ptr nullPtr
+
 -- t_01 :: IO ()
 -- t_01 = do
 --   (entry, _) <- testCase "./tests/Fib.class" "fib"
@@ -66,22 +95,25 @@ getMethodEntry signal_from ptr_mmap ptr_cmap = do
 
 initMethodPool :: IO ()
 initMethodPool = do
-  mmap2ptr M.empty >>= set_mmap
-  cmap2ptr M.empty >>= set_cmap
+  mmap2ptr M.empty >>= set_methodmap
+  cmap2ptr M.empty >>= set_callermap
+  classmap2ptr M.empty >>= set_classmap
 
-compileBB :: MapBB -> Class Resolved -> B.ByteString -> IO (Ptr Word8)
-compileBB hmap cls name = do
-  mmap <- get_mmap >>= ptr2mmap
-  cmap <- get_cmap >>= ptr2cmap
+compileBB :: MapBB -> MethodInfo -> IO (Ptr Word8)
+compileBB hmap methodinfo = do
+  mmap <- get_methodmap >>= ptr2mmap
+  cmap <- get_callermap >>= ptr2cmap
 
+  -- TODO(bernhard): replace parsing with some kind of classpool
+  cls <- getClassFile (cName methodinfo)
   let ebb = emitFromBB cls hmap
   (_, Right ((entry, _, _, new_cmap), disasm)) <- runCodeGen ebb () ()
   let w32_entry = ((fromIntegral $ ptrToIntPtr entry) :: Word32)
 
-  let mmap' = M.insert name w32_entry mmap
+  let mmap' = M.insert methodinfo w32_entry mmap
   let cmap' = M.union cmap new_cmap -- prefers elements in cmap
-  mmap2ptr mmap' >>= set_mmap
-  cmap2ptr cmap' >>= set_cmap
+  mmap2ptr mmap' >>= set_methodmap
+  cmap2ptr cmap' >>= set_callermap
 
   printf "disasm:\n"
   mapM_ (putStrLn . showAtt) disasm
@@ -94,25 +126,5 @@ compileBB hmap cls name = do
   return entry
 
 
-foreign import ccall "dynamic"
-   code_void :: FunPtr (IO ()) -> (IO ())
-
 executeFuncPtr :: Ptr Word8 -> IO ()
 executeFuncPtr entry = code_void $ ((castPtrToFunPtr entry) :: FunPtr (IO ()))
-
--- TODO(bernhard): make some typeclass magic 'n stuff
-mmap2ptr :: MMap -> IO (Ptr ())
-mmap2ptr mmap = do
-  ptr_mmap <- newStablePtr mmap
-  return $ castStablePtrToPtr ptr_mmap
-
-ptr2mmap :: Ptr () -> IO MMap
-ptr2mmap vmap = deRefStablePtr $ ((castPtrToStablePtr vmap) :: StablePtr MMap)
-
-cmap2ptr :: CMap -> IO (Ptr ())
-cmap2ptr cmap = do
-  ptr_cmap <- newStablePtr cmap
-  return $ castStablePtrToPtr ptr_cmap
-
-ptr2cmap :: Ptr () -> IO CMap
-ptr2cmap vmap = deRefStablePtr $ ((castPtrToStablePtr vmap) :: StablePtr cmap)