classpool: staticfields calculation: bugfix

[mate.git] / Mate / ClassPool.hs

diff --git a/Mate/ClassPool.hs b/Mate/ClassPool.hs
index d9e965c3cacc7085d9ec44d47404f0ecb49def86..8b3e8a961fdb71af97418061fe2f23f8ceeb3041 100644 (file)
--- a/Mate/ClassPool.hs
+++ b/Mate/ClassPool.hs
@@ -114,43 +114,47 @@ getInterfaceMethodOffset ifname meth sig = do
 
 readClass :: B.ByteString -> IO ClassInfo
 readClass path = do
-  cfile <- readClassFile $ toString path
+  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 <- 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
+      -- 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 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 ()
@@ -193,7 +197,14 @@ 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)
+    -- TODO(bernhard): nicer replacement for `myspan'
+    let (sfields, ifields) = myspan (S.member ACC_STATIC . fieldAccessFlags) (classFields cf)
+        myspan :: (a -> Bool) -> [a] -> ([a], [a])
+        myspan _ [] = ([],[])
+        myspan p (x:xs)
+          | p x = (x:ns, ni)
+          | otherwise = (ns, x:ni)
+          where (ns,ni) = myspan p xs
 
     staticbase <- mallocClassData $ fromIntegral (length sfields) * 4
     let i_sb = fromIntegral $ ptrToIntPtr staticbase