import Mate.Debug
import Mate.GarbageAlloc
import Mate.NativeSizes
+import {-# SOURCE #-} Mate.ClassHierarchy
getClassInfo :: B.ByteString -> IO ClassInfo
getClassInfo path = do
-- TODO(bernhard): correct sizes for different types...
let fsize = fromIntegral $ M.size $ ciFieldMap ci
-- one slot for "method-table-ptr"
- return $ (1 + fsize) * ptrSize
+ -- one slot for GC-data
+ return $ (2 + fsize) * ptrSize
getStaticFieldAddr :: CPtrdiff -> IO CPtrdiff
getStaticFieldAddr from = do
-- 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)
+ iftable <- mallocClassData ((ptrSize*) $ 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
where val = fromIntegral (mmap M.! key) :: NativeWord
printfCp $ printf "%s\n" header
mapM_ printValue (M.keys mmap)
- if mateDEBUG
- then do
- let strpath = toString path
- hexDumpMap ("staticmap @ " ++ strpath) staticmap
- hexDumpMap ("fieldmap @ " ++ strpath) fieldmap
- hexDumpMap ("methodmap @ " ++ strpath) methodmap
- hexDumpMap ("interfacemap @ " ++ strpath) immap
- printfCp $ printf "mbase: 0x%08x\n" mbase
- printfCp $ printf "iftable: 0x%08x\n" wn_iftable
- else return ()
+ when mateDEBUG $ do
+ let strpath = toString path
+ hexDumpMap ("staticmap @ " ++ strpath) staticmap
+ hexDumpMap ("fieldmap @ " ++ strpath) fieldmap
+ hexDumpMap ("methodmap @ " ++ strpath) methodmap
+ hexDumpMap ("interfacemap @ " ++ strpath) immap
+ printfCp $ printf "mbase: 0x%08x\n" mbase
+ printfCp $ printf "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
+
+ -- add Class to Hierarchy
+ super_mtable <- case superclass of
+ Nothing -> return 0
+ Just x -> getMethodTable $ ciName x
+ addClassEntry mbase super_mtable (interfaces cfile)
+
return new_ci
-- load map again, because there could be new entries now
-- due to loading superinterfaces
imap' <- getInterfaceMap
- let max_off = fromIntegral $ M.size immap * 4
+ let max_off = fromIntegral $ M.size immap * ptrSize
-- create index of methods by this interface
let mm = zipbase max_off (classMethods cfile)
- -- create for each method from *every* superinterface a entry to,
+ -- create for each method from *every* superinterface an entry too,
-- 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)
-- merge all offset tables
setInterfaceMethodMap $ M.fromList sm `M.union` M.fromList mm `M.union` immap
setInterfaceMap $ M.insert path cfile imap'
+
+ -- add Interface to Hierarchy
+ addInterfaceEntry path (interfaces cfile)
where
- zipbase base = zipWith (\x y -> (entry y, x + base)) [0,4..]
+ zipbase base = zipWith (\x y -> (entry y, x + base)) [0,ptrSize..]
entry = getname path
getname p y = p `B.append` methodName y `B.append` encode (methodSignature y)
let (sfields, ifields) = partition (S.member ACC_STATIC . fieldAccessFlags) (classFields cf)
let sc_sm = getsupermap superclass ciStaticMap
- staticbase <- mallocClassData $ fromIntegral (length sfields) * 4
+ staticbase <- mallocClassData $ fromIntegral (length sfields) * ptrSize
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
+ -- "+ (2*ptrsize)" for the method table pointer and GC data
+ let max_off = (+ (2*ptrSize)) $ fromIntegral $ M.size sc_im * ptrSize
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..]
+ zipbase base = foldr (\(x,y) -> M.insert (fieldName y) (x + base)) M.empty . zip [0,ptrSize..]
-- helper
getsupermap :: Maybe ClassInfo -> (ClassInfo -> FieldMap) -> FieldMap
((/=) "<init>" . methodName) x)
(classMethods cf)
let sc_mm = getsupermap superclass ciMethodMap
- let max_off = fromIntegral $ M.size sc_mm * 4
+ let max_off = fromIntegral $ M.size sc_mm * ptrSize
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)
+ methodbase <- mallocClassData (((+1) $ fromIntegral $ M.size methodmap) * ptrSize)
return (methodmap, fromIntegral $ ptrToIntPtr methodbase)
- where zipbase base = zipWith (\x y -> (entry y, x + base)) [0,4..]
+ where zipbase base = zipWith (\x y -> (entry y, x + base)) [0,ptrSize..]
where entry y = methodName y `B.append` encode (methodSignature y)
Just m -> do
rawmethod <- parseMethod (ciFile ci) "<clinit>" $ MethodSignature [] ReturnsVoid
let mi = MethodInfo "<clinit>" path (methodSignature m)
- entry <- compileBB rawmethod mi
+ -- TODO(bernhard): test exception handling in static initalizer
+ entry <- compileBB mi rawmethod mi
addMethodRef entry mi [path]
printfCp $ printf "executing static initializer from %s now\n" (toString path)
- executeFuncPtr entry
+ executeFuncPtr $ fst entry
printfCp $ printf "static initializer from %s done\n" (toString path)
Nothing -> return ()
projects / mate.git / blobdiff