(InterfaceMethod _ (MethodInfo methname _ msig)) -> newMi methname msig
_ -> error "getMethodEntry: no TrapCause found. abort."
where newMi mn = MethodInfo mn (vmap M.! fromIntegral methodtable)
- setTrapMap $ M.delete w32_from tmap
- case M.lookup mi' mmap of
+ -- bernhard (TODO): doesn't work with gnu classpath at some point. didn't
+ -- figured out the problem yet :/ therefore, I have no
+ -- testcase for replaying the situation.
+ -- setTrapMap $ M.delete w32_from tmap
+ entryaddr <- case M.lookup mi' mmap of
Nothing -> do
cls <- getClassFile cm
printfMp "getMethodEntry(from 0x%08x): no method \"%s\" found. compile it\n" w32_from (show mi')
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
+ setMethodMap $ M.insert mi' nf mmap
return nf
else do
hmap <- parseMethod cls' method sig
return $ fromIntegral entry
Nothing -> error $ show method ++ " not found. abort"
Nothing -> error $ show method ++ " not found. abort"
- Just w32 -> return (fromIntegral w32)
+ Just w32 -> return w32
+ return $ fromIntegral entryaddr
lookupMethodRecursive :: B.ByteString -> MethodSignature -> [B.ByteString] -> Class Direct
-> IO (Maybe (Method Direct, [B.ByteString], Class Direct))
foreign import ccall safe "lookupSymbol"
c_lookupSymbol :: CString -> IO (Ptr a)
-loadNativeFunction :: String -> IO CUInt
+loadNativeFunction :: String -> IO Word32
loadNativeFunction sym = do
_ <- loadRawObject "ffi/native.o"
-- TODO(bernhard): WTF
addMethodRef :: Word32 -> MethodInfo -> [B.ByteString] -> IO ()
addMethodRef entry (MethodInfo mmname _ msig) clsnames = do
mmap <- getMethodMap
- let newmap = M.fromList $ map (\x -> (MethodInfo mmname x msig, entry)) clsnames
+ let newmap = foldr (\i -> M.insert (MethodInfo mmname i msig) entry) M.empty clsnames
setMethodMap $ mmap `M.union` newmap
mapM_ (printfJit "%s\n" . showAtt) (snd right)
printfJit "\n\n"
-- UNCOMMENT NEXT LINES FOR GDB FUN
- --if (toString $ methName methodinfo) == "thejavamethodIwant2debug"
- -- then getLine
- -- else return "foo"
- -- (1) start it with `gdb ./mate' and then `run <classfile>'
- -- (2) on getLine, press ctrl+c
+ -- if (toString $ methName methodinfo) == "thejavamethodIwant2debug"
+ -- then putStrLn "press CTRL+C now for setting a breakpoint. then `c' and ENTER for continue" >> getLine
+ -- else return "foo"
+ -- (1) build a debug build (see HACKING) and execute `make tests/Fib.gdb'
+ -- for example, where the suffix is important
+ -- (2) on getLine, press CTRL+C
-- (3) `br *0x<addr>'; obtain the address from the disasm above
-- (4) `cont' and press enter
return $ fromIntegral $ ptrToIntPtr entry