X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Mate%2FTypes.hs;h=bff97df650a9b87d0679c643e010dd199c71a259;hb=ecec298c7b0723081b1aea7447eae6f04118df34;hp=b1fc6def65492c31543668631c7fcb5284a56063;hpb=c8169c16f11efe17090cd221d0a3ebde6db50de5;p=mate.git

diff --git a/Mate/Types.hs b/Mate/Types.hs
index b1fc6de..bff97df 100644
--- a/Mate/Types.hs
+++ b/Mate/Types.hs
@@ -1,14 +1,39 @@
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE CPP #-}
-module Mate.Types where
+module Mate.Types
+  ( BlockID
+  , BasicBlock(..)
+  , BBEnd(..)
+  , MapBB
+  , ExceptionMap
+  , RawMethod(..)
+  , TrapMap, MethodMap, ClassMap, FieldMap
+  , StringMap, VirtualMap, InterfaceMap
+  , InterfaceMethodMap
+  , TrapCause(..)
+  , StaticFieldInfo(..)
+  , MethodInfo(..)
+  , ClassInfo(..)
+  , setTrapMap, getTrapMap
+  , setMethodMap, getMethodMap
+  , setClassMap, getClassMap
+  , setStringMap, getStringMap
+  , setVirtualMap, getVirtualMap
+  , setInterfaceMap, getInterfaceMap
+  , setInterfaceMethodMap, getInterfaceMethodMap
+  ) where
 
 import Data.Int
+import Data.Functor
+import Data.Word
 import qualified Data.Map as M
 import qualified Data.ByteString.Lazy as B
 
 import Data.IORef
 import System.IO.Unsafe
 
+import Harpy
+import Foreign.C.Types
+
 import JVM.ClassFile
 import JVM.Assembler
 
@@ -19,31 +44,45 @@ type BlockID = Int
 -- Represents a CFG node
 data BasicBlock = BasicBlock {
   code :: [Instruction],
+  bblength :: Int,
   successor :: BBEnd }
 
 -- describes (leaving) edges of a CFG node
-data BBEnd = Return | FallThrough BlockID | OneTarget BlockID | TwoTarget BlockID BlockID deriving Show
+data BBEnd
+  = Return
+  | FallThrough BlockID
+  | OneTarget BlockID
+  | TwoTarget BlockID BlockID
+  deriving Show
 
 type MapBB = M.Map BlockID BasicBlock
+type ExceptionMap = M.Map (Word16, Word16) [(B.ByteString, Word16)]
 
 data RawMethod = RawMethod {
   rawMapBB :: MapBB,
+  rawExcpMap :: ExceptionMap,
   rawLocals :: Int,
   rawStackSize :: Int,
-  rawArgCount :: NativeWord }
+  rawArgCount :: NativeWord,
+  rawCodeLength :: NativeWord }
 
 
 -- NativeWord = point of method call in generated code
 -- MethodInfo = relevant information about callee
 type TrapMap = M.Map NativeWord TrapCause
 
-data TrapCause =
-  StaticMethod MethodInfo | -- for static calls
-  VirtualMethod Bool MethodInfo | -- for virtual calls
-  InterfaceMethod Bool MethodInfo | -- for interface calls
-  InstanceOf B.ByteString | -- class name
-  NewObject B.ByteString | -- class name
-  StaticField StaticFieldInfo deriving Show
+type TrapPatcher = CPtrdiff -> CodeGen () () CPtrdiff
+type TrapPatcherEax = CPtrdiff -> CPtrdiff -> CodeGen () () CPtrdiff
+type TrapPatcherEsp = TrapPatcherEax
+
+data TrapCause
+  = StaticMethod TrapPatcher -- for static calls
+  | VirtualCall Bool MethodInfo (IO NativeWord) -- for invoke{interface,virtual}
+  | InstanceOf TrapPatcherEax
+  | ThrowException TrapPatcherEsp
+  | NewObject TrapPatcher
+  | StaticField StaticFieldInfo
+  | ObjectField TrapPatcher
 
 data StaticFieldInfo = StaticFieldInfo {
   sfiClassName :: B.ByteString,
@@ -107,7 +146,6 @@ 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,
@@ -125,32 +163,47 @@ 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 };
+setMap :: (MateCtx -> MateCtx) -> IO ()
+setMap recordupdate = recordupdate <$> readIORef mateCtx >>= writeIORef mateCtx
+
+setMethodMap :: MethodMap -> IO ()
+setMethodMap m = setMap (\x -> x {ctxMethodMap = m})
+
+getMethodMap :: IO MethodMap
+getMethodMap = ctxMethodMap <$> readIORef mateCtx
+
+setTrapMap :: TrapMap -> IO ()
+setTrapMap m = setMap (\x -> x {ctxTrapMap = m})
+
+getTrapMap :: IO TrapMap
+getTrapMap = ctxTrapMap <$> readIORef mateCtx
+
+setClassMap :: ClassMap -> IO ()
+setClassMap m = setMap (\x -> x {ctxClassMap = m})
+
+getClassMap :: IO ClassMap
+getClassMap = ctxClassMap <$> readIORef mateCtx
 
-#define GETMAP(name) get##name :: IO name ; \
-  get##name = do ctx <- readIORef mateCtx; \
-  return $ ctx##name ctx;
+setVirtualMap :: VirtualMap -> IO ()
+setVirtualMap m = setMap (\x -> x {ctxVirtualMap = m})
 
-SETMAP(MethodMap);
-GETMAP(MethodMap)
+getVirtualMap :: IO VirtualMap
+getVirtualMap = ctxVirtualMap <$> readIORef mateCtx
 
-SETMAP(TrapMap)
-GETMAP(TrapMap)
+setStringMap :: StringMap -> IO ()
+setStringMap m = setMap (\x -> x {ctxStringMap = m})
 
-SETMAP(ClassMap)
-GETMAP(ClassMap)
+getStringMap :: IO StringMap
+getStringMap = ctxStringMap <$> readIORef mateCtx
 
-SETMAP(VirtualMap)
-GETMAP(VirtualMap)
+setInterfaceMap :: InterfaceMap -> IO ()
+setInterfaceMap m = setMap (\x -> x {ctxInterfaceMap = m})
 
-SETMAP(StringMap)
-GETMAP(StringMap)
+getInterfaceMap :: IO InterfaceMap
+getInterfaceMap = ctxInterfaceMap <$> readIORef mateCtx
 
-SETMAP(InterfaceMap)
-GETMAP(InterfaceMap)
+setInterfaceMethodMap :: InterfaceMethodMap -> IO ()
+setInterfaceMethodMap m = setMap (\x -> x {ctxInterfaceMethodMap = m})
 
-SETMAP(InterfaceMethodMap)
-GETMAP(InterfaceMethodMap)
+getInterfaceMethodMap :: IO InterfaceMethodMap
+getInterfaceMethodMap = ctxInterfaceMethodMap <$> readIORef mateCtx