X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Mate%2FClassPool.hs;h=b9b8b3cafb158366aff27752a250a8cae71b735a;hb=69737e443614cbe6c2acec6c3f7f6918325d4435;hp=8788e75ab9261caa320d425cdd55d2a31a00d66e;hpb=f82dbecc763818452667ac568da96b7c5dd7cc97;p=mate.git diff --git a/Mate/ClassPool.hs b/Mate/ClassPool.hs index 8788e75..b9b8b3c 100644 --- a/Mate/ClassPool.hs +++ b/Mate/ClassPool.hs @@ -3,6 +3,7 @@ #include "debug.h" module Mate.ClassPool ( getClassInfo, + classLoaded, getClassFile, getMethodTable, getObjectSize, @@ -15,7 +16,6 @@ module Mate.ClassPool ( ) where import Data.Int -import Data.Word import Data.Binary import qualified Data.Map as M import qualified Data.Set as S @@ -47,8 +47,10 @@ import Java.JAR import Mate.BasicBlocks import {-# SOURCE #-} Mate.MethodPool import Mate.Types +import Mate.Utilities import Mate.Debug import Mate.GarbageAlloc +import Mate.NativeSizes getClassInfo :: B.ByteString -> IO ClassInfo getClassInfo path = do @@ -57,12 +59,17 @@ getClassInfo path = do Nothing -> loadAndInitClass path Just ci -> return ci +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 @@ -73,26 +80,26 @@ 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 @@ -103,7 +110,7 @@ getStaticFieldAddr from = do _ -> 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 @@ -140,15 +147,18 @@ readClass path = do -- 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 + let wn_iftable = fromIntegral $ ptrToIntPtr iftable :: NativeWord -- 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 + 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 @@ -189,9 +199,9 @@ 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 Direct -> Maybe ClassInfo -> IO (FieldMap, FieldMap) @@ -215,15 +225,15 @@ calculateFields cf superclass = do 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..] + 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 :: Class Direct -> Maybe ClassInfo -> IO (FieldMap, NativeWord) calculateMethodMap cf superclass = do let methods = filter (\x -> (not . S.member ACC_STATIC . methodAccessFlags) x && @@ -254,16 +264,13 @@ loadAndInitClass path = do -- execute class initializer case lookupMethod "" (ciFile ci) of Just m -> do - hmap <- parseMethod (ciFile ci) "" $ MethodSignature [] ReturnsVoid - 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 "readClass: 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 @@ -275,23 +282,23 @@ loadAndInitClass path = do 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" + 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 |