X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Mate%2FClassPool.hs;h=b9b8b3cafb158366aff27752a250a8cae71b735a;hb=a60718741f1acee2830528f57e2d48f2df1f7acb;hp=216194709978fc72a8107c284629a0a9e4aa2e69;hpb=7f54316f216f6508e8d6d5b37bed49350fc0d14e;p=mate.git diff --git a/Mate/ClassPool.hs b/Mate/ClassPool.hs index 2161947..b9b8b3c 100644 --- a/Mate/ClassPool.hs +++ b/Mate/ClassPool.hs @@ -1,24 +1,27 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE ForeignFunctionInterface #-} #include "debug.h" module Mate.ClassPool ( getClassInfo, + classLoaded, getClassFile, getMethodTable, getObjectSize, getMethodOffset, getFieldOffset, getStaticFieldAddr, - getInterfaceMethodOffset + 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 @@ -32,8 +35,14 @@ import Foreign.Ptr import Foreign.C.Types 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 @@ -41,6 +50,7 @@ import Mate.Types import Mate.Utilities import Mate.Debug import Mate.GarbageAlloc +import Mate.NativeSizes getClassInfo :: B.ByteString -> IO ClassInfo getClassInfo path = do @@ -49,12 +59,17 @@ getClassInfo path = do Nothing -> loadAndInitClass path Just ci -> return ci -getClassFile :: B.ByteString -> IO (Class Resolved) +classLoaded :: B.ByteString -> IO Bool +classLoaded path = do + class_map <- getClassMap + return $ M.member path class_map + +getClassFile :: B.ByteString -> IO (Class Direct) getClassFile path = do ci <- getClassInfo path return $ ciFile ci -getStaticFieldOffset :: B.ByteString -> B.ByteString -> IO CUInt +getStaticFieldOffset :: B.ByteString -> B.ByteString -> IO CPtrdiff getStaticFieldOffset path field = do ci <- getClassInfo path return $ fromIntegral $ ciStaticMap ci M.! field @@ -65,36 +80,37 @@ getFieldOffset path field = do return $ ciFieldMap ci M.! field -- method + signature plz! -getMethodOffset :: B.ByteString -> B.ByteString -> IO Word32 +getMethodOffset :: B.ByteString -> B.ByteString -> IO NativeWord getMethodOffset path method = do ci <- getClassInfo path - -- (4+) one slot for "interface-table-ptr" - return $ (+4) $ fromIntegral $ ciMethodMap ci M.! method + -- (+ ptrSize) one slot for "interface-table-ptr" + return $ (+ ptrSize) $ fromIntegral $ ciMethodMap ci M.! method -getMethodTable :: B.ByteString -> IO Word32 +getMethodTable :: B.ByteString -> IO NativeWord getMethodTable path = do ci <- getClassInfo path return $ ciMethodBase ci -getObjectSize :: B.ByteString -> IO Word32 +getObjectSize :: B.ByteString -> IO NativeWord 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 + return $ (1 + fsize) * ptrSize -getStaticFieldAddr :: CUInt -> IO CUInt +getStaticFieldAddr :: CPtrdiff -> IO CPtrdiff 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)) -> getStaticFieldOffset cls field - _ -> error "getFieldAddr: no trapInfo. abort" + (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 :: B.ByteString -> B.ByteString -> B.ByteString -> IO NativeWord getInterfaceMethodOffset ifname meth sig = do loadInterface ifname ifmmap <- getInterfaceMethodMap @@ -104,46 +120,52 @@ getInterfaceMethodOffset ifname meth sig = do Nothing -> error "getInterfaceMethodOffset: no offset set" -loadClass :: B.ByteString -> IO ClassInfo -loadClass path = do - let rpath = toString $ path `B.append` ".class" - cfile <- parseClassFile rpath +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 + 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 <- loadClass $ 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 + -- 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 - 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 + -- 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 wn_iftable = fromIntegral $ ptrToIntPtr iftable :: NativeWord + -- store interface-table at offset 0 in method-table + pokeElemOff (intPtrToPtr $ fromIntegral mbase) 0 wn_iftable + let strpath = toString path +#ifdef DBG_CLASS + hexDumpMap ("staticmap @ " ++ strpath) staticmap + hexDumpMap ("fieldmap @ " ++ strpath) fieldmap + hexDumpMap ("methodmap @ " ++ strpath) methodmap + hexDumpMap ("interfacemap @ " ++ strpath) immap +#endif + printfCp "mbase: 0x%08x\n" mbase + printfCp "iftable: 0x%08x\n" wn_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 () @@ -154,8 +176,7 @@ loadInterface path = do Just _ -> return () Nothing -> do printfCp "interface: loading \"%s\"\n" $ toString path - let ifpath = toString $ path `B.append` ".class" - cfile <- parseClassFile ifpath + cfile <- readClassFile $ toString path -- load "superinterfaces" first sequence_ [ loadInterface i | i <- interfaces cfile ] immap <- getInterfaceMethodMap @@ -178,41 +199,41 @@ loadInterface path = do 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) + 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 Resolved -> Maybe ClassInfo -> IO (FieldMap, FieldMap) +calculateFields :: Class Direct -> Maybe ClassInfo -> IO (FieldMap, FieldMap) calculateFields cf superclass = do -- TODO(bernhard): correct sizes. int only atm - let (sfields, ifields) = span (S.member ACC_STATIC . fieldAccessFlags) (classFields cf) + let (sfields, ifields) = partition (S.member ACC_STATIC . fieldAccessFlags) (classFields cf) - staticbase <- mallocClassData $ fromIntegral (length sfields) * 4 - let i_sb = fromIntegral $ ptrToIntPtr staticbase - let sm = zipbase i_sb sfields 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 = M.fromList sm `M.union` sc_sm + 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 = M.fromList im `M.union` sc_im + let fieldmap = im `M.union` sc_im return (staticmap, fieldmap) where - zipbase base = zipWith (\x y -> (fieldName y, x + base)) [0,4..] + 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 Resolved -> Maybe ClassInfo -> IO (FieldMap, Word32) +calculateMethodMap :: Class Direct -> Maybe ClassInfo -> IO (FieldMap, NativeWord) calculateMethodMap cf superclass = do let methods = filter (\x -> (not . S.member ACC_STATIC . methodAccessFlags) x && @@ -234,7 +255,7 @@ loadAndInitClass :: B.ByteString -> IO ClassInfo loadAndInitClass path = do class_map <- getClassMap ci <- case M.lookup path class_map of - Nothing -> loadClass path + Nothing -> readClass path Just x -> return x -- first try to execute class initializer of superclass @@ -243,19 +264,57 @@ loadAndInitClass path = do -- execute class initializer case lookupMethod "" (ciFile ci) of Just m -> do - hmap <- parseMethod (ciFile ci) "" - case hmap of - Just hmap' -> do - let mi = MethodInfo "" path (methodSignature m) - entry <- compileBB hmap' mi - addMethodRef entry mi [path] - printfCp "executing static initializer from %s now\n" (toString path) - executeFuncPtr entry - printfCp "static initializer from %s done\n" (toString path) - Nothing -> error "loadClass: static initializer not found (WTF?). abort" + rawmethod <- parseMethod (ciFile ci) "" $ MethodSignature [] ReturnsVoid + let mi = MethodInfo "" path (methodSignature m) + entry <- compileBB rawmethod mi + addMethodRef entry mi [path] + printfCp "executing static initializer from %s now\n" (toString path) + executeFuncPtr entry + printfCp "static initializer from %s done\n" (toString path) 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)