X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Mate%2FClassPool.hs;h=ae6ce4450def203be66630d80ec23e7aa3b07aff;hb=da245b03d80644c22b011acba31acacb880d8327;hp=0a4d35781b020ef7e565bd8b4c540aa151a2a9e2;hpb=2c988ece91e165480f387e66325de0b274a840eb;p=mate.git

diff --git a/Mate/ClassPool.hs b/Mate/ClassPool.hs
index 0a4d357..ae6ce44 100644
--- a/Mate/ClassPool.hs
+++ b/Mate/ClassPool.hs
@@ -1,97 +1,313 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE ForeignFunctionInterface #-}
-module Mate.ClassPool where
+#include "debug.h"
+module Mate.ClassPool (
+  getClassInfo,
+  getClassFile,
+  getMethodTable,
+  getObjectSize,
+  getMethodOffset,
+  getFieldOffset,
+  getStaticFieldAddr,
+  getInterfaceMethodOffset,
+  addClassPath,
+  addClassPathJAR
+  ) where
 
+import Data.Int
+import Data.Word
+import Data.Binary
 import qualified Data.Map as M
 import qualified Data.Set as S
+import Data.List
 import qualified Data.ByteString.Lazy as B
+import Data.String.Utils
+import Control.Monad
 
+#ifdef DEBUG
 import Text.Printf
+#endif
+#ifdef DBG_CLASS
+import JVM.Dump
+#endif
 
 import Foreign.Ptr
 import Foreign.C.Types
-import Foreign.Marshal.Alloc
+import Foreign.Storable
+
+import Data.IORef
+import System.IO.Unsafe
+import System.Directory
 
 import JVM.ClassFile
 import JVM.Converter
+import Java.ClassPath hiding (Directory)
+import Java.JAR
 
 import Mate.BasicBlocks
 import {-# SOURCE #-} Mate.MethodPool
 import Mate.Types
-import Mate.Utilities
+import Mate.Debug
+import Mate.GarbageAlloc
 
 getClassInfo :: B.ByteString -> IO ClassInfo
 getClassInfo path = do
-  ptr_classmap <- get_classmap
-  class_map <- ptr2classmap ptr_classmap
+  class_map <- getClassMap
   case M.lookup path class_map of
-    Nothing -> loadClass path
+    Nothing -> loadAndInitClass path
     Just ci -> return ci
 
-getClassFile :: B.ByteString -> IO (Class Resolved)
+getClassFile :: B.ByteString -> IO (Class Direct)
 getClassFile path = do
-  (ClassInfo _ cfile _ _) <- getClassInfo path
-  return cfile
+  ci <- getClassInfo path
+  return $ ciFile ci
 
--- TODO(bernhard): I think we don't need that anymore. also remove fieldbase
---                 entry in ClassInfo
-getFieldBase :: B.ByteString -> IO (CUInt)
-getFieldBase path = do
-  (ClassInfo _ _ fs _) <- getClassInfo path
-  return $ fromIntegral $ ptrToIntPtr fs
+getStaticFieldOffset :: B.ByteString -> B.ByteString -> IO CUInt
+getStaticFieldOffset path field = do
+  ci <- getClassInfo path
+  return $ fromIntegral $ ciStaticMap ci M.! field
 
-getFieldOffset :: B.ByteString -> B.ByteString -> IO (CUInt)
+getFieldOffset :: B.ByteString -> B.ByteString -> IO Int32
 getFieldOffset path field = do
-  (ClassInfo _ _ _ fieldmap) <- getClassInfo path
-  return $ fromIntegral $ fieldmap M.! field
+  ci <- getClassInfo path
+  return $ ciFieldMap ci M.! field
+
+-- method + signature plz!
+getMethodOffset :: B.ByteString -> B.ByteString -> IO Word32
+getMethodOffset path method = do
+  ci <- getClassInfo path
+  -- (4+) one slot for "interface-table-ptr"
+  return $ (+4) $ fromIntegral $ ciMethodMap ci M.! method
+
+getMethodTable :: B.ByteString -> IO Word32
+getMethodTable path = do
+  ci <- getClassInfo path
+  return $ ciMethodBase ci
 
-foreign export ccall getFieldAddr :: CUInt -> Ptr () -> IO CUInt
-getFieldAddr :: CUInt -> Ptr () -> IO CUInt
-getFieldAddr from ptr_trapmap = do
-  trapmap <- ptr2tmap ptr_trapmap
+getObjectSize :: B.ByteString -> IO Word32
+getObjectSize path = do
+  ci <- getClassInfo path
+  -- TODO(bernhard): correct sizes for different types...
+  let fsize = fromIntegral $ M.size $ ciFieldMap ci
+  -- one slot for "method-table-ptr"
+  return $ (1 + fsize) * 4
+
+getStaticFieldAddr :: CUInt -> IO CUInt
+getStaticFieldAddr from = do
+  trapmap <- getTrapMap
   let w32_from = fromIntegral from
   let sfi = trapmap M.! w32_from
+  setTrapMap $ M.delete w32_from trapmap
   case sfi of
-    (SFI (StaticFieldInfo cls field)) -> do
-      getFieldOffset cls field
-    _ -> error $ "getFieldAddr: no trapInfo. abort"
-
-loadClass :: B.ByteString -> IO ClassInfo
-loadClass path = do
-  printf "loadClass: \"%s\"\n" $ toString path
-  let rpath = toString $ path `B.append` ".class"
-  cfile <- parseClassFile rpath
-  superclass <- case (path /= "java/lang/Object") of
-      True -> do
-        sc <- loadClass $ superClass cfile
-        return $ Just $ sc
-      False -> return $ Nothing
-  class_map <- get_classmap >>= ptr2classmap
-  -- TODO(bernhard): correct sizes. int only atm
-  let filteredfields = filter (S.member ACC_STATIC . fieldAccessFlags) (classFields cfile)
-  fieldbase <- mallocBytes ((fromIntegral $ length filteredfields) * 4)
-  let i_fb = fromIntegral $ ptrToIntPtr $ fieldbase
-  let fm = zipWith (\x y -> (fieldName y, x + i_fb)) [0,4..] filteredfields
-  let sc_fm = case superclass of Just x -> clFieldMap x; Nothing -> M.empty
-  -- new fields "overwrite" old ones, if they have the same name
-  let fieldmap = (M.fromList fm) `M.union` sc_fm
-  printf "fieldmap: %s @ %s\n" (show fieldmap) (toString path)
-  let new_ci = ClassInfo path cfile fieldbase fieldmap
-  let class_map' = M.insert path new_ci class_map
-  classmap2ptr class_map' >>= set_classmap
+    (StaticField (StaticFieldInfo cls field)) -> getStaticFieldOffset cls field
+    _ -> error "getFieldAddr: no TrapCause found. abort"
+
+-- interface + method + signature plz!
+getInterfaceMethodOffset :: B.ByteString -> B.ByteString -> B.ByteString -> IO Word32
+getInterfaceMethodOffset ifname meth sig = do
+  loadInterface ifname
+  ifmmap <- getInterfaceMethodMap
+  let k = ifname `B.append` meth `B.append` sig
+  case M.lookup k ifmmap of
+    Just w32 -> return $ w32 + 4
+    Nothing -> error "getInterfaceMethodOffset: no offset set"
+
+
+readClass :: B.ByteString -> IO ClassInfo
+readClass path = do
+  class_map' <- getClassMap
+  case M.lookup path class_map' of
+    Just cm -> return cm
+    Nothing -> do
+      cfile <- readClassFile $ toString path
+#ifdef DBG_CLASS
+      dumpClass cfile
+#endif
+      -- load all interfaces, which are implemented by this class
+      sequence_ [ loadInterface i | i <- interfaces cfile ]
+      superclass <- if path /= "java/lang/Object"
+          then do
+            sc <- readClass $ superClass cfile
+            return $ Just sc
+          else return Nothing
+
+      (staticmap, fieldmap) <- calculateFields cfile superclass
+      (methodmap, mbase) <- calculateMethodMap cfile superclass
+      immap <- getInterfaceMethodMap
+
+      -- allocate interface offset table for this class
+      -- TODO(bernhard): we have some duplicates in immap (i.e. some
+      --                 entries have the same offset), so we could
+      --                 save some memory here.
+      iftable <- mallocClassData ((4*) $ M.size immap)
+      let w32_iftable = fromIntegral $ ptrToIntPtr iftable :: Word32
+      -- store interface-table at offset 0 in method-table
+      pokeElemOff (intPtrToPtr $ fromIntegral mbase) 0 w32_iftable
+      printfCp "staticmap: %s @ %s\n" (show staticmap) (toString path)
+      printfCp "fieldmap:  %s @ %s\n" (show fieldmap) (toString path)
+      printfCp "methodmap: %s @ %s\n" (show methodmap) (toString path)
+      printfCp "mbase: 0x%08x\n" mbase
+      printfCp "interfacemethod: %s @ %s\n" (show immap) (toString path)
+      printfCp "iftable: 0x%08x\n" w32_iftable
+      virtual_map <- getVirtualMap
+      setVirtualMap $ M.insert mbase path virtual_map
+
+      class_map <- getClassMap
+      let new_ci = ClassInfo path cfile staticmap fieldmap methodmap mbase False
+      setClassMap $ M.insert path new_ci class_map
+      return new_ci
+
+
+loadInterface :: B.ByteString -> IO ()
+loadInterface path = do
+  imap <- getInterfaceMap
+  -- interface already loaded?
+  case M.lookup path imap of
+    Just _ -> return ()
+    Nothing -> do
+      printfCp "interface: loading \"%s\"\n" $ toString path
+      cfile <- readClassFile $ toString path
+      -- load "superinterfaces" first
+      sequence_ [ loadInterface i | i <- interfaces cfile ]
+      immap <- getInterfaceMethodMap
+
+      -- load map again, because there could be new entries now
+      -- due to loading superinterfaces
+      imap' <- getInterfaceMap
+      let max_off = fromIntegral $ M.size immap * 4
+      -- create index of methods by this interface
+      let mm = zipbase max_off (classMethods cfile)
+
+      -- create for each method from *every* superinterface a entry to,
+      -- but just put in the same offset as it is already in the map
+      let (ifnames, methodnames) = unzip $ concat
+            [ zip (repeat ifname) (classMethods $ imap' M.! ifname)
+            | ifname <- interfaces cfile ]
+      let sm = zipWith (\x y -> (entry y, immap M.! getname x y)) ifnames methodnames
+
+      -- merge all offset tables
+      setInterfaceMethodMap $ M.fromList sm `M.union` M.fromList mm `M.union` immap
+      setInterfaceMap $ M.insert path cfile imap'
+  where
+  zipbase base = zipWith (\x y -> (entry y, x + base)) [0,4..]
+  entry = getname path
+  getname p y = p `B.append` methodName y `B.append` encode (methodSignature y)
+
+
+calculateFields :: Class Direct -> Maybe ClassInfo -> IO (FieldMap, FieldMap)
+calculateFields cf superclass = do
+    -- TODO(bernhard): correct sizes. int only atm
+
+    let (sfields, ifields) = partition (S.member ACC_STATIC . fieldAccessFlags) (classFields cf)
+
+    let sc_sm = getsupermap superclass ciStaticMap
+    staticbase <- mallocClassData $ fromIntegral (length sfields) * 4
+    let sm = zipbase (fromIntegral $ ptrToIntPtr staticbase) sfields
+    -- new fields "overwrite" old ones, if they have the same name
+    let staticmap = sm `M.union` sc_sm
+
+    let sc_im = getsupermap superclass ciFieldMap
+    -- "+ 4" for the method table pointer
+    let max_off = (4+) $ fromIntegral $ M.size sc_im * 4
+    let im = zipbase max_off ifields
+    -- new fields "overwrite" old ones, if they have the same name
+    let fieldmap = im `M.union` sc_im
+
+    return (staticmap, fieldmap)
+  where
+  zipbase :: Int32 -> [Field Direct] -> FieldMap
+  zipbase base = foldr (\(x,y) -> M.insert (fieldName y) (x + base)) M.empty . zip [0,4..]
+
+-- helper
+getsupermap :: Maybe ClassInfo -> (ClassInfo -> FieldMap) -> FieldMap
+getsupermap superclass getter = case superclass of Just x -> getter x; Nothing -> M.empty
+
+
+calculateMethodMap :: Class Direct -> Maybe ClassInfo -> IO (FieldMap, Word32)
+calculateMethodMap cf superclass = do
+    let methods = filter
+                  (\x -> (not . S.member ACC_STATIC . methodAccessFlags) x &&
+                         ((/=) "<init>" . methodName) x)
+                  (classMethods cf)
+    let sc_mm = getsupermap superclass ciMethodMap
+    let max_off = fromIntegral $ M.size sc_mm * 4
+    let mm = zipbase max_off methods
+    let methodmap = M.fromList mm `M.union` sc_mm
+
+    -- (+1): one slot for the interface-table-ptr
+    methodbase <- mallocClassData (((+1) $ fromIntegral $ M.size methodmap) * 4)
+    return (methodmap, fromIntegral $ ptrToIntPtr methodbase)
+  where zipbase base = zipWith (\x y -> (entry y, x + base)) [0,4..]
+          where entry y = methodName y `B.append` encode (methodSignature y)
+
+
+loadAndInitClass :: B.ByteString -> IO ClassInfo
+loadAndInitClass path = do
+  class_map <- getClassMap
+  ci <- case M.lookup path class_map of
+    Nothing -> readClass path
+    Just x -> return x
+
+  -- first try to execute class initializer of superclass
+  when (path /= "java/lang/Object") (void $ loadAndInitClass $ superClass $ ciFile ci)
+
   -- execute class initializer
-  case lookupMethod "<clinit>" cfile of
+  case lookupMethod "<clinit>" (ciFile ci) of
     Just m -> do
-      hmap <- parseMethod cfile "<clinit>"
-      printMapBB hmap
-      case hmap of
-        Just hmap' -> do
-          let mi = (MethodInfo "<clinit>" path (methodSignature m))
-          entry <- compileBB hmap' mi
+      method <- parseMethod (ciFile ci) "<clinit>" $ MethodSignature [] ReturnsVoid
+      case method of
+        Just rawmethod -> do
+          let mi = MethodInfo "<clinit>" path (methodSignature m)
+          entry <- compileBB rawmethod mi
           addMethodRef entry mi [path]
-          printf "executing static initializer from %s now\n" (toString path)
+          printfCp "executing static initializer from %s now\n" (toString path)
           executeFuncPtr entry
-          printf "static initializer from %s done\n" (toString path)
-          return new_ci
-        Nothing -> error $ "loadClass: static initializer not found (WTF?). abort"
-    Nothing -> return new_ci
+          printfCp "static initializer from %s done\n" (toString path)
+        Nothing -> error "readClass: static initializer not found (WTF?). abort"
+    Nothing -> return ()
+
+  class_map' <- getClassMap
+  let new_ci = ci { ciInitDone = True }
+  setClassMap $ M.insert path new_ci class_map'
+  return new_ci
+
+
+readClassFile :: String -> IO (Class Direct)
+readClassFile path' = readIORef classPaths >>= rcf
+  where
+  path = replace "." "/" path'
+  rcf :: [MClassPath] -> IO (Class Direct)
+  rcf [] = error $ "readClassFile: Class \"" ++ show path ++ "\" not found."
+  rcf (Directory pre:xs) = do
+    let cf = pre ++ path ++ ".class"
+    printfCp "rcf: searching @ %s for %s\n" (show pre) (show path)
+    b <- doesFileExist cf
+    if b
+      then parseClassFile cf
+      else rcf xs
+  rcf (JAR p:xs) = do
+    printfCp "rcf: searching %s in JAR\n" (show path)
+    entry <- getEntry p path
+    case entry of
+      Just (LoadedJAR _ cls) -> return cls
+      Nothing -> rcf xs
+      _ -> error $ "readClassFile: Class \"" ++ show path ++ "\" in JAR not found. #1"
+
+data MClassPath =
+  Directory String |
+  JAR [Tree CPEntry]
+
+classPaths :: IORef [MClassPath]
+{-# NOINLINE classPaths #-}
+classPaths = unsafePerformIO $ newIORef []
+
+addClassPath :: String -> IO ()
+addClassPath x = do
+  cps <- readIORef classPaths
+  writeIORef classPaths (Directory x:cps)
+
+addClassPathJAR :: String -> IO ()
+addClassPathJAR x = do
+  cps <- readIORef classPaths
+  t <- execClassPath $ addJAR x
+  writeIORef classPaths (JAR t:cps)