From 94985402292306da1db46b1750927ef46bdb87d3 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Wed, 18 Jul 2012 19:33:33 +0200 Subject: [PATCH] globalmaphack: use old school CPP I tried (1) typeclasses and (2) TH, but failed: (1) typeclasses are not designed to emulate object managment (2) TH needs GHCi (or at least something at compile-time?), and this doesn't work well with MateVM build stuff :/ --- Makefile | 2 +- Mate/Types.hs | 91 +++++++++++++-------------------------------------- 2 files changed, 24 insertions(+), 69 deletions(-) diff --git a/Makefile b/Makefile index cd0e887..00007fa 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ O_STATIC_FILES = $(shell ls $(B_STATIC)/Mate/*.o) $(wildcard $(B_STATIC)/ffi/*.o PACKAGES_ := bytestring harpy hs-java plugins PACKAGES := $(addprefix -package ,$(PACKAGES_)) -GHC_OPT := -I. -Wall -O0 -fno-warn-unused-do-bind -rtsopts +GHC_OPT := -I. -Wall -O0 -fno-warn-unused-do-bind -rtsopts -cpp -pgmP cpphs -optP --cpp GHC_LD := -optl-Xlinker -optl-x diff --git a/Mate/Types.hs b/Mate/Types.hs index 5405a43..dbf7e73 100644 --- a/Mate/Types.hs +++ b/Mate/Types.hs @@ -1,4 +1,5 @@ {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE CPP #-} module Mate.Types where import Data.Word @@ -98,6 +99,7 @@ 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, @@ -115,79 +117,32 @@ 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 }; -setMethodMap :: MethodMap -> IO () -setMethodMap m = do - ctx <- readIORef mateCtx - writeIORef mateCtx $ ctx { ctxMethodMap = m } +#define GETMAP(name) get##name :: IO name ; \ + get##name = do ctx <- readIORef mateCtx; \ + return $ ctx##name ctx; -getMethodMap :: IO MethodMap -getMethodMap = do - ctx <- readIORef mateCtx - return $ ctxMethodMap ctx +SETMAP(MethodMap); +GETMAP(MethodMap) +SETMAP(TrapMap) +GETMAP(TrapMap) -setTrapMap :: TrapMap -> IO () -setTrapMap m = do - ctx <- readIORef mateCtx - writeIORef mateCtx $ ctx { ctxTrapMap = m } +SETMAP(ClassMap) +GETMAP(ClassMap) -getTrapMap :: IO TrapMap -getTrapMap = do - ctx <- readIORef mateCtx - return $ ctxTrapMap ctx +SETMAP(VirtualMap) +GETMAP(VirtualMap) +SETMAP(StringMap) +GETMAP(StringMap) -setClassMap :: ClassMap -> IO () -setClassMap m = do - ctx <- readIORef mateCtx - writeIORef mateCtx $ ctx { ctxClassMap = m } +SETMAP(InterfaceMap) +GETMAP(InterfaceMap) -getClassMap :: IO ClassMap -getClassMap = do - ctx <- readIORef mateCtx - return $ ctxClassMap ctx - - -setVirtualMap :: VirtualMap -> IO () -setVirtualMap m = do - ctx <- readIORef mateCtx - writeIORef mateCtx $ ctx { ctxVirtualMap = m } - -getVirtualMap :: IO VirtualMap -getVirtualMap = do - ctx <- readIORef mateCtx - return $ ctxVirtualMap ctx - - -setStringMap :: StringMap -> IO () -setStringMap m = do - ctx <- readIORef mateCtx - writeIORef mateCtx $ ctx { ctxStringMap = m } - -getStringMap :: IO StringMap -getStringMap = do - ctx <- readIORef mateCtx - return $ ctxStringMap ctx - - -setInterfaceMap :: InterfaceMap -> IO () -setInterfaceMap m = do - ctx <- readIORef mateCtx - writeIORef mateCtx $ ctx { ctxInterfaceMap = m } - -getInterfaceMap :: IO InterfaceMap -getInterfaceMap = do - ctx <- readIORef mateCtx - return $ ctxInterfaceMap ctx - - -setInterfaceMethodMap :: InterfaceMethodMap -> IO () -setInterfaceMethodMap m = do - ctx <- readIORef mateCtx - writeIORef mateCtx $ ctx { ctxInterfaceMethodMap = m } - -getInterfaceMethodMap :: IO InterfaceMethodMap -getInterfaceMethodMap = do - ctx <- readIORef mateCtx - return $ ctxInterfaceMethodMap ctx +SETMAP(InterfaceMethodMap) +GETMAP(InterfaceMethodMap) -- 2.25.1