X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Mate%2FTypes.hs;h=1f67aa6844cdedfeb69977f988407066af9c5dcb;hb=03ddf0056a8ebae7ce10d694bbf906c276677a33;hp=cf4bc7834a51c8c296ac58ccc4db77c175238b19;hpb=d41300b14108d0fb6d478050852af46bc19069fa;p=mate.git

diff --git a/Mate/Types.hs b/Mate/Types.hs
index cf4bc78..1f67aa6 100644
--- a/Mate/Types.hs
+++ b/Mate/Types.hs
@@ -1,10 +1,14 @@
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE CPP #-}
 module Mate.Types where
 
-import Data.Char
 import Data.Word
+import Data.Int
 import qualified Data.Map as M
 import qualified Data.ByteString.Lazy as B
-import Codec.Binary.UTF8.String hiding (encode,decode)
+
+import Data.IORef
+import System.IO.Unsafe
 
 import JVM.ClassFile
 import JVM.Assembler
@@ -13,55 +17,137 @@ import JVM.Assembler
 type BlockID = Int
 -- Represents a CFG node
 data BasicBlock = BasicBlock {
-                     code    :: [Instruction],
-                     successor :: BBEnd }
+  code :: [Instruction],
+  successor :: BBEnd }
 
 -- describes (leaving) edges of a CFG node
 data BBEnd = Return | FallThrough BlockID | OneTarget BlockID | TwoTarget BlockID BlockID deriving Show
 
 type MapBB = M.Map BlockID BasicBlock
 
+data RawMethod = RawMethod {
+  rawMapBB :: MapBB,
+  rawLocals :: Int,
+  rawStackSize :: Int,
+  rawArgCount :: Word32 }
+
 
 -- Word32 = point of method call in generated code
 -- MethodInfo = relevant information about callee
-type CMap = M.Map Word32 MethodInfo
+type TrapMap = M.Map Word32 TrapCause
 
--- B.ByteString = name of method
--- Word32 = entrypoint of method
-type MMap = M.Map MethodInfo Word32
+data TrapCause =
+  StaticMethod MethodInfo | -- for static calls
+  VirtualMethod Bool MethodInfo | -- for virtual calls
+  InterfaceMethod Bool MethodInfo | -- for interface calls
+  StaticField StaticFieldInfo deriving Show
+
+data StaticFieldInfo = StaticFieldInfo {
+  sfiClassName :: B.ByteString,
+  sfiFieldName :: B.ByteString } deriving Show
 
 
 
+-- B.ByteString = name of method
+-- Word32 = entrypoint of method
+type MethodMap = M.Map MethodInfo Word32
+
 data MethodInfo = MethodInfo {
   methName :: B.ByteString,
-  cName :: B.ByteString,
-  mSignature :: MethodSignature}
-
-instance Eq MethodInfo where
-  (MethodInfo m_a c_a s_a) == (MethodInfo m_b c_b s_b) =
-    (m_a == m_b) && (c_a == c_b) && (s_a == s_b)
-
--- TODO(bernhard): not really efficient. also, outsource that to hs-java
-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)
-
-instance Ord MethodInfo where
-  compare (MethodInfo m_a c_a s_a) (MethodInfo m_b c_b s_b)
-    | cmp_m /= EQ = cmp_m
-    | cmp_c /= EQ = cmp_c
-    | otherwise = s_a `compare` s_b
-    where
-    cmp_m = m_a `compare` m_b
-    cmp_c = c_a `compare` c_b
+  methClassName :: B.ByteString,
+  methSignature :: MethodSignature
+  } deriving (Eq, Ord)
 
 instance Show MethodInfo where
   show (MethodInfo method c sig) =
-    (toString c) ++ "." ++ (toString method) ++ "." ++ (show sig)
+    toString c ++ "." ++ toString method ++ "." ++ show sig
+
+
+
+-- store information of loaded classes
+type ClassMap = M.Map B.ByteString ClassInfo
+
+data ClassInfo = ClassInfo {
+  ciName :: B.ByteString,
+  ciFile :: Class Direct,
+  ciStaticMap  :: FieldMap,
+  ciFieldMap :: FieldMap,
+  ciMethodMap :: FieldMap,
+  ciMethodBase :: Word32,
+  ciInitDone :: Bool }
+
+
+-- store field offsets in a map
+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 StringMap = M.Map B.ByteString Word32
+
 
+-- map "methodtable addr" to "classname"
+-- we need that to identify the actual type
+-- on the invokevirtual insn
+type VirtualMap = M.Map Word32 B.ByteString
 
+
+-- store each parsed Interface upon first loading
+type InterfaceMap = M.Map B.ByteString (Class Direct)
+
+-- 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
+-}
+
+-- better solutions for a global map hack are welcome! (typeclasses, TH, ...?)
+
+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
+
+mateCtx :: IORef MateCtx
+{-# NOINLINE mateCtx #-}
+mateCtx = unsafePerformIO $ newIORef emptyMateCtx
+
+-- TODO(bernhard): if we ever have thread support, don't forget MVars
+#define SETMAP(name) set##name :: name -> IO (); \
+  set##name m = do ctx <- readIORef mateCtx; \
+  writeIORef mateCtx $ ctx { ctx##name = m };
+
+#define GETMAP(name) get##name :: IO name ; \
+  get##name = do ctx <- readIORef mateCtx; \
+  return $ ctx##name ctx;
+
+SETMAP(MethodMap);
+GETMAP(MethodMap)
+
+SETMAP(TrapMap)
+GETMAP(TrapMap)
+
+SETMAP(ClassMap)
+GETMAP(ClassMap)
+
+SETMAP(VirtualMap)
+GETMAP(VirtualMap)
+
+SETMAP(StringMap)
+GETMAP(StringMap)
+
+SETMAP(InterfaceMap)
+GETMAP(InterfaceMap)
+
+SETMAP(InterfaceMethodMap)
+GETMAP(InterfaceMethodMap)