import Mate.Debug
foreign import ccall "dynamic"
- code_void :: FunPtr (IO ()) -> (IO ())
+ code_void :: FunPtr (IO ()) -> IO ()
foreign export ccall getTrapType :: CUInt -> CUInt -> IO CUInt
getTrapType :: CUInt -> CUInt -> IO CUInt
getTrapType signal_from from2 = do
- tmap <- get_trapmap >>= ptr2trapmap
+ tmap <- getTrapMap
case M.lookup (fromIntegral signal_from) tmap of
(Just (MI _)) -> return 0
(Just (VI _)) -> return 1
Nothing -> case M.lookup (fromIntegral from2) tmap of
(Just (VI _)) -> return 1
(Just (II _)) -> return 4
- (Just _) -> error $ "getTrapType: abort #1 :-("
- Nothing -> error $ "getTrapType: abort #2 :-("
+ (Just _) -> error "getTrapType: abort #1 :-("
+ Nothing -> error "getTrapType: abort #2 :-("
foreign export ccall getMethodEntry :: CUInt -> CUInt -> IO CUInt
getMethodEntry :: CUInt -> CUInt -> IO CUInt
getMethodEntry signal_from methodtable = do
- mmap <- get_methodmap >>= ptr2methodmap
- tmap <- get_trapmap >>= ptr2trapmap
- vmap <- get_virtualmap >>= ptr2virtualmap
+ mmap <- getMethodMap
+ tmap <- getTrapMap
+ vmap <- getVirtualMap
let w32_from = fromIntegral signal_from
let mi = tmap M.! w32_from
case mi of
(MI x) -> x
(VI (MethodInfo methname _ msig)) ->
- (MethodInfo methname (vmap M.! (fromIntegral methodtable)) msig)
+ MethodInfo methname (vmap M.! fromIntegral methodtable) msig
(II (MethodInfo methname _ msig)) ->
- (MethodInfo methname (vmap M.! (fromIntegral methodtable)) msig)
- _ -> error $ "getMethodEntry: no trapInfo. abort."
+ MethodInfo methname (vmap M.! fromIntegral methodtable) msig
+ _ -> error "getMethodEntry: no trapInfo. abort."
case M.lookup mi' mmap of
Nothing -> do
cls <- getClassFile cm
- printf_mp "getMethodEntry(from 0x%08x): no method \"%s\" found. compile it\n" w32_from (show mi')
+ printfMp "getMethodEntry(from 0x%08x): no method \"%s\" found. compile it\n" w32_from (show mi')
mm <- lookupMethodRecursive method [] cls
case mm of
Just (mm', clsnames, cls') -> do
let flags = methodAccessFlags mm'
- case S.member ACC_NATIVE flags of
- False -> do
+ if S.member ACC_NATIVE flags
+ then do
+ -- TODO(bernhard): cleaner please... *do'h*
+ let sym1 = replace "/" "_" $ toString cm
+ parenth = replace "(" "_" $ replace ")" "_" $ toString $ encode sig
+ sym2 = replace ";" "_" $ replace "/" "_" parenth
+ symbol = sym1 ++ "__" ++ toString method ++ "__" ++ sym2
+ printfMp "native-call: symbol: %s\n" symbol
+ nf <- loadNativeFunction symbol
+ let w32_nf = fromIntegral nf
+ setMethodMap $ M.insert mi' w32_nf mmap
+ return nf
+ else do
hmap <- parseMethod cls' method
case hmap of
Just hmap' -> do
entry <- compileBB hmap' (MethodInfo method (thisClass cls') sig)
addMethodRef entry mi' clsnames
return $ fromIntegral entry
- Nothing -> error $ (show method) ++ " not found. abort"
- True -> do
- -- TODO(bernhard): cleaner please... *do'h*
- let symbol = (replace "/" "_" $ toString cm) ++ "__" ++ (toString method) ++ "__" ++ (replace ";" "_" $ replace "/" "_" $ replace "(" "_" (replace ")" "_" $ toString $ encode sig))
- printf_mp "native-call: symbol: %s\n" symbol
- nf <- loadNativeFunction symbol
- let w32_nf = fromIntegral nf
- let mmap' = M.insert mi' w32_nf mmap
- methodmap2ptr mmap' >>= set_methodmap
- return nf
- Nothing -> error $ (show method) ++ " not found. abort"
+ Nothing -> error $ show method ++ " not found. abort"
+ Nothing -> error $ show method ++ " not found. abort"
Just w32 -> return (fromIntegral w32)
lookupMethodRecursive :: B.ByteString -> [B.ByteString] -> Class Resolved
- -> IO (Maybe ((Method Resolved, [B.ByteString], Class Resolved)))
-lookupMethodRecursive name clsnames cls = do
+ -> IO (Maybe (Method Resolved, [B.ByteString], Class Resolved))
+lookupMethodRecursive name clsnames cls =
case res of
Just x -> return $ Just (x, nextclsn, cls)
Nothing -> if thisname == "java/lang/Object"
- then return $ Nothing
+ then return Nothing
else do
supercl <- getClassFile (superClass cls)
lookupMethodRecursive name nextclsn supercl
foreign import ccall safe "lookupSymbol"
c_lookupSymbol :: CString -> IO (Ptr a)
-loadNativeFunction :: String -> IO (CUInt)
+loadNativeFunction :: String -> IO CUInt
loadNativeFunction sym = do
_ <- loadRawObject "ffi/native.o"
-- TODO(bernhard): WTF
resolveObjs (return ())
ptr <- withCString sym c_lookupSymbol
- if (ptr == nullPtr)
+ if ptr == nullPtr
then error $ "dyn. loading of \"" ++ sym ++ "\" failed."
else return $ fromIntegral $ ptrToIntPtr ptr
-- demo_mmap -- access Data.Map from C
initMethodPool :: IO ()
-initMethodPool = do
- methodmap2ptr M.empty >>= set_methodmap
- trapmap2ptr M.empty >>= set_trapmap
- classmap2ptr M.empty >>= set_classmap
- virtualmap2ptr M.empty >>= set_virtualmap
- stringsmap2ptr M.empty >>= set_stringsmap
- interfacesmap2ptr M.empty >>= set_interfacesmap
- interfacemethodmap2ptr M.empty >>= set_interfacemethodmap
+initMethodPool = ctx2ptr emptyMateCtx >>= set_mate_context
addMethodRef :: Word32 -> MethodInfo -> [B.ByteString] -> IO ()
addMethodRef entry (MethodInfo mmname _ msig) clsnames = do
- mmap <- get_methodmap >>= ptr2methodmap
- let newmap = M.fromList $ map (\x -> ((MethodInfo mmname x msig), entry)) clsnames
- methodmap2ptr (mmap `M.union` newmap) >>= set_methodmap
+ mmap <- getMethodMap
+ let newmap = M.fromList $ map (\x -> (MethodInfo mmname x msig, entry)) clsnames
+ setMethodMap $ mmap `M.union` newmap
compileBB :: MapBB -> MethodInfo -> IO Word32
compileBB hmap methodinfo = do
- tmap <- get_trapmap >>= ptr2trapmap
+ tmap <- getTrapMap
cls <- getClassFile (methClassName methodinfo)
let ebb = emitFromBB (methName methodinfo) cls hmap
(_, Right right) <- runCodeGen ebb () ()
let ((entry, _, _, new_tmap), _) = right
- let tmap' = M.union tmap new_tmap -- prefers elements in cmap
- trapmap2ptr tmap' >>= set_trapmap
+ setTrapMap $ tmap `M.union` new_tmap -- prefers elements in tmap
- printf_jit "generated code of \"%s\":\n" (toString $ methName methodinfo)
- mapM_ (printf_jit "%s\n" . showAtt) (snd right)
- printf_jit "\n\n"
+ printfJit "generated code of \"%s\":\n" (toString $ methName methodinfo)
+ mapM_ (printfJit "%s\n" . showAtt) (snd right)
+ printfJit "\n\n"
-- UNCOMMENT NEXT LINE FOR GDB FUN
-- _ <- getLine
-- (1) start it with `gdb ./mate' and then `run <classfile>'
executeFuncPtr :: Word32 -> IO ()
executeFuncPtr entry =
- code_void $ ((castPtrToFunPtr $ intPtrToPtr $ fromIntegral entry) :: FunPtr (IO ()))
+ code_void ((castPtrToFunPtr $ intPtrToPtr $ fromIntegral entry) :: FunPtr (IO ()))
projects / mate.git / blobdiff