refactor: reduce global var in trap.c to one pointer

[mate.git] / Mate / Types.hs

diff --git a/Mate/Types.hs b/Mate/Types.hs
index 7d1583dbb0b1bb51f4e17ba67fe48128988e36c5..2cdad11970d731afad72661936c44eae36f3171c 100644 (file)
--- a/Mate/Types.hs
+++ b/Mate/Types.hs
@@ -36,11 +36,12 @@ type TrapMap = M.Map Word32 TrapInfo
 data TrapInfo =
   MI MethodInfo | -- for static calls
   VI MethodInfo | -- for virtual calls
-  SFI StaticFieldInfo
+  II MethodInfo | -- for interface calls
+  SFI StaticFieldInfo deriving Show
 
 data StaticFieldInfo = StaticFieldInfo {
   sfiClassName :: B.ByteString,
-  sfiFieldName :: B.ByteString }
+  sfiFieldName :: B.ByteString } deriving Show
 
 
 
@@ -59,13 +60,12 @@ data MethodInfo = MethodInfo {
 instance Ord MethodSignature where
   compare (MethodSignature args_a ret_a) (MethodSignature args_b ret_b)
     | cmp_args /= EQ = cmp_args
-    | otherwise = (show ret_a) `compare` (show ret_b)
-    where
-    cmp_args = (show args_a) `compare` (show args_b)
+    | otherwise = show ret_a `compare` show ret_b
+    where cmp_args = show args_a `compare` show args_b
 
 instance Show MethodInfo where
   show (MethodInfo method c sig) =
-    (toString c) ++ "." ++ (toString method) ++ "." ++ (show sig)
+    toString c ++ "." ++ toString method ++ "." ++ show sig
 
 
 
@@ -88,7 +88,7 @@ type FieldMap = M.Map B.ByteString Int32
 
 -- java strings are allocated only once, therefore we
 -- use a hashmap to store the address for a String
-type StringsMap = M.Map B.ByteString Word32
+type StringMap = M.Map B.ByteString Word32
 
 
 -- map "methodtable addr" to "classname"
@@ -97,81 +97,118 @@ type StringsMap = M.Map B.ByteString Word32
 type VirtualMap = M.Map Word32 B.ByteString
 
 
+-- store each parsed Interface upon first loading
+type InterfaceMap = M.Map B.ByteString (Class Resolved)
+
+-- store offset for each <Interface><Method><Signature> pair
+type InterfaceMethodMap = M.Map B.ByteString Word32
+
+
 toString :: B.ByteString -> String
 toString bstr = decodeString $ map (chr . fromIntegral) $ B.unpack bstr
 
 
 -- those functions are for the "global map hax"
 -- TODO(bernhard): other solution please
-foreign import ccall "get_trapmap"
-  get_trapmap :: IO (Ptr ())
+foreign import ccall "set_mate_context"
+  set_mate_context :: Ptr () -> IO ()
+
+foreign import ccall "get_mate_context"
+  get_mate_context :: IO (Ptr ())
+
+data MateCtx = MateCtx {
+  ctxMethodMap :: MethodMap,
+  ctxTrapMap :: TrapMap,
+  ctxClassMap :: ClassMap,
+  ctxVirtualMap :: VirtualMap,
+  ctxStringMap :: StringMap,
+  ctxInterfaceMap :: InterfaceMap,
+  ctxInterfaceMethodMap :: InterfaceMethodMap }
+
+emptyMateCtx :: MateCtx
+emptyMateCtx = MateCtx M.empty M.empty M.empty M.empty M.empty M.empty M.empty
+
+ctx2ptr :: MateCtx -> IO (Ptr ())
+ctx2ptr ctx = do
+  ptr <- newStablePtr ctx
+  return $ castStablePtrToPtr ptr
+
+ptr2ctx :: Ptr () -> IO MateCtx
+ptr2ctx ptr = deRefStablePtr (castPtrToStablePtr ptr :: StablePtr MateCtx)
+
 
-foreign import ccall "set_trapmap"
-  set_trapmap :: Ptr () -> IO ()
+setMethodMap :: MethodMap -> IO ()
+setMethodMap m = do
+  ctx <- get_mate_context >>= ptr2ctx
+  ctx2ptr ctx { ctxMethodMap = m } >>= set_mate_context
 
-foreign import ccall "get_methodmap"
-  get_methodmap :: IO (Ptr ())
+getMethodMap :: IO MethodMap
+getMethodMap = do
+  ctx <- get_mate_context >>= ptr2ctx
+  return $ ctxMethodMap ctx
 
-foreign import ccall "set_methodmap"
-  set_methodmap :: Ptr () -> IO ()
 
-foreign import ccall "get_classmap"
-  get_classmap :: IO (Ptr ())
+setTrapMap :: TrapMap -> IO ()
+setTrapMap m = do
+  ctx <- get_mate_context >>= ptr2ctx
+  ctx2ptr ctx { ctxTrapMap = m } >>= set_mate_context
 
-foreign import ccall "set_classmap"
-  set_classmap :: Ptr () -> IO ()
+getTrapMap :: IO TrapMap
+getTrapMap = do
+  ctx <- get_mate_context >>= ptr2ctx
+  return $ ctxTrapMap ctx
 
-foreign import ccall "get_virtualmap"
-  get_virtualmap :: IO (Ptr ())
 
-foreign import ccall "set_virtualmap"
-  set_virtualmap :: Ptr () -> IO ()
+setClassMap :: ClassMap -> IO ()
+setClassMap m = do
+  ctx <- get_mate_context >>= ptr2ctx
+  ctx2ptr ctx { ctxClassMap = m } >>= set_mate_context
 
-foreign import ccall "get_stringsmap"
-  get_stringsmap :: IO (Ptr ())
+getClassMap :: IO ClassMap
+getClassMap = do
+  ctx <- get_mate_context >>= ptr2ctx
+  return $ ctxClassMap ctx
 
-foreign import ccall "set_stringsmap"
-  set_stringsmap :: Ptr () -> IO ()
 
--- TODO(bernhard): make some typeclass magic 'n stuff
---                 or remove that sh**
-methodmap2ptr :: MethodMap -> IO (Ptr ())
-methodmap2ptr methodmap = do
-  ptr_methodmap <- newStablePtr methodmap
-  return $ castStablePtrToPtr ptr_methodmap
+setVirtualMap :: VirtualMap -> IO ()
+setVirtualMap m = do
+  ctx <- get_mate_context >>= ptr2ctx
+  ctx2ptr ctx { ctxVirtualMap = m } >>= set_mate_context
 
-ptr2methodmap :: Ptr () -> IO MethodMap
-ptr2methodmap methodmap = deRefStablePtr $ ((castPtrToStablePtr methodmap) :: StablePtr MethodMap)
+getVirtualMap :: IO VirtualMap
+getVirtualMap = do
+  ctx <- get_mate_context >>= ptr2ctx
+  return $ ctxVirtualMap ctx
 
-trapmap2ptr :: TrapMap -> IO (Ptr ())
-trapmap2ptr trapmap = do
-  ptr_trapmap <- newStablePtr trapmap
-  return $ castStablePtrToPtr ptr_trapmap
 
-ptr2trapmap :: Ptr () -> IO TrapMap
-ptr2trapmap vmap = deRefStablePtr $ ((castPtrToStablePtr vmap) :: StablePtr trapmap)
+setStringMap :: StringMap -> IO ()
+setStringMap m = do
+  ctx <- get_mate_context >>= ptr2ctx
+  ctx2ptr ctx { ctxStringMap = m } >>= set_mate_context
 
-classmap2ptr :: ClassMap -> IO (Ptr ())
-classmap2ptr cmap = do
-  ptr_cmap <- newStablePtr cmap
-  return $ castStablePtrToPtr ptr_cmap
+getStringMap :: IO StringMap
+getStringMap = do
+  ctx <- get_mate_context >>= ptr2ctx
+  return $ ctxStringMap ctx
 
-ptr2classmap :: Ptr () -> IO ClassMap
-ptr2classmap vmap = deRefStablePtr $ ((castPtrToStablePtr vmap) :: StablePtr cmap)
 
-virtualmap2ptr :: VirtualMap -> IO (Ptr ())
-virtualmap2ptr cmap = do
-  ptr_cmap <- newStablePtr cmap
-  return $ castStablePtrToPtr ptr_cmap
+setInterfaceMap :: InterfaceMap -> IO ()
+setInterfaceMap m = do
+  ctx <- get_mate_context >>= ptr2ctx
+  ctx2ptr ctx { ctxInterfaceMap = m } >>= set_mate_context
 
-ptr2virtualmap :: Ptr () -> IO VirtualMap
-ptr2virtualmap vmap = deRefStablePtr $ ((castPtrToStablePtr vmap) :: StablePtr cmap)
+getInterfaceMap :: IO InterfaceMap
+getInterfaceMap = do
+  ctx <- get_mate_context >>= ptr2ctx
+  return $ ctxInterfaceMap ctx
 
 
-stringsmap2ptr :: StringsMap -> IO (Ptr ())
-stringsmap2ptr cmap = do
-  ptr_cmap <- newStablePtr cmap
-  return $ castStablePtrToPtr ptr_cmap
+setInterfaceMethodMap :: InterfaceMethodMap -> IO ()
+setInterfaceMethodMap m = do
+  ctx <- get_mate_context >>= ptr2ctx
+  ctx2ptr ctx { ctxInterfaceMethodMap = m } >>= set_mate_context
 
-ptr2stringsmap :: Ptr () -> IO StringsMap
-ptr2stringsmap vmap = deRefStablePtr $ ((castPtrToStablePtr vmap) :: StablePtr cmap)
+getInterfaceMethodMap :: IO InterfaceMethodMap
+getInterfaceMethodMap = do
+  ctx <- get_mate_context >>= ptr2ctx
+  return $ ctxInterfaceMethodMap ctx