else M.insert key [value] emap
where
key = (&&&) eStartPC eEndPC ce
- value = (&&&) (buildClassID cls . eCatchType) eHandlerPC ce
+ value = (&&&) g eHandlerPC ce
+ where
+ g ce' = case eCatchType ce' of
+ 0 -> B.empty
+ x -> buildClassID cls x
let msig = methodSignature method
printfBb $ printf "BB: analysing \"%s\"\n" $ toString (methodname `B.append` ": " `B.append` encode msig)
parseBasicBlock :: Int -> [OffIns] -> BasicBlock
parseBasicBlock i insns = emptyBasicBlock
- { code = insonly
+ { code = zip offsets insonly
, bblength = lastoff - i + (insnLength lastins)
, successor = endblock }
where
(lastblock, is) = takeWhilePlusOne validins omitins insns
- (_, _, insonly) = unzip3 is
+ (offsets, _, insonly) = unzip3 is
(lastoff, Just endblock, lastins) = fromJust lastblock
-- also take last (non-matched) element and return it
import Data.Binary
import Data.String.Utils
import qualified Data.Map as M
+import qualified Data.Bimap as BI
import qualified Data.Set as S
import qualified Data.ByteString.Lazy as B
import System.Plugins
if scm == "jmate/lang/MateRuntime" then
case smethod of
"loadLibrary" ->
- return (funPtrToAddr loadLibraryAddr, M.empty)
+ return (funPtrToAddr loadLibraryAddr, BI.empty)
"printGCStats" ->
- return (funPtrToAddr printGCStatsAddr, M.empty)
+ return (funPtrToAddr printGCStatsAddr, BI.empty)
"printMemoryUsage" ->
- return (funPtrToAddr printMemoryUsageAddr, M.empty)
+ return (funPtrToAddr printMemoryUsageAddr, BI.empty)
_ ->
error $ "native-call: " ++ smethod ++ " not found."
else do
symbol = sym1 ++ "__" ++ smethod ++ "__" ++ sym2
printfMp $ printf "native-call: symbol: %s\n" symbol
nf <- loadNativeFunction symbol
- let nf' = (nf, M.empty)
+ let nf' = (nf, BI.empty)
setMethodMap $ M.insert mi nf' mmap
return nf'
else do
printfJit $ printf "emit code of \"%s\" from \"%s\":\n" (toString $ methName methodinfo) (toString $ methClassName methodinfo)
let ebb = emitFromBB cls mi rawmethod
let cgconfig = defaultCodeGenConfig { codeBufferSize = fromIntegral $ rawCodeLength rawmethod * 32 }
- (jnmap, Right right) <- runCodeGenWithConfig ebb () M.empty cgconfig
+ (jnmap, Right right) <- runCodeGenWithConfig ebb () BI.empty cgconfig
let ((entry, _, new_tmap), _) = right
setTrapMap $ tmap `M.union` new_tmap -- prefers elements in tmap
, ExceptionMap
, JpcNpcMap
, RawMethod(..)
+ , TrapPatcher, TrapPatcherEax, TrapPatcherEaxEsp
, TrapMap, MethodMap, ClassMap, FieldMap
, StringMap, VirtualMap, InterfaceMap
, InterfaceMethodMap
import Data.Functor
import Data.Word
import qualified Data.Map as M
+import qualified Data.Bimap as BI
import qualified Data.ByteString.Lazy as B
import Data.IORef
type BlockID = Int
-- Represents a CFG node
data BasicBlock = BasicBlock {
- code :: [Instruction],
+ code :: [(Int, Instruction)],
bblength :: Int,
successor :: BBEnd }
type ExceptionMap = M.Map (Word16, Word16) [(B.ByteString, Word16)]
-- java byte code PC -> native PC
-type JpcNpcMap = M.Map Word32 Int
+type JpcNpcMap = BI.Bimap Int Word32
data RawMethod = RawMethod {
rawMapBB :: MapBB,
type TrapMap = M.Map NativeWord TrapCause
type TrapPatcher = CPtrdiff -> CodeGen () () CPtrdiff
-type TrapPatcherEax = CPtrdiff -> CPtrdiff -> CodeGen () () CPtrdiff
-type TrapPatcherEsp = TrapPatcherEax
+type TrapPatcherEax = CPtrdiff -> TrapPatcher
+type TrapPatcherEaxEsp = CPtrdiff -> TrapPatcherEax
data TrapCause
= StaticMethod TrapPatcher -- for static calls
| VirtualCall Bool MethodInfo (IO NativeWord) -- for invoke{interface,virtual}
| InstanceOf TrapPatcherEax
- | ThrowException TrapPatcherEsp
+ | ThrowException TrapPatcherEaxEsp
| NewObject TrapPatcher
| StaticField StaticFieldInfo
| ObjectField TrapPatcher
import Data.BinaryState
import Data.Int
import Data.Maybe
-import Data.List (genericLength)
+import Data.List (genericLength, find)
import qualified Data.Map as M
+import qualified Data.Bimap as BI
import qualified Data.ByteString.Lazy as B
import Control.Monad
import Control.Applicative
import JVM.Assembler hiding (Instruction)
import JVM.ClassFile
-import Harpy
+import Harpy hiding (fst)
import Harpy.X86Disassembler
import Mate.BasicBlocks
import Mate.ClassHierarchy
import {-# SOURCE #-} Mate.MethodPool
import Mate.Strings
+import Mate.Debug
foreign import ccall "&mallocObjectGC"
-- depending on the method-table-ptr
return $ Just (calladdr, VirtualCall isInterface mi offset)
- emit'' :: J.Instruction -> CodeGen e JpcNpcMap (Maybe (Word32, TrapCause))
- emit'' insn = do
- ep <- (fromIntegral . ptrToIntPtr) <$> getEntryPoint
+ emit'' :: (Int, J.Instruction) -> CodeGen e JpcNpcMap (Maybe (Word32, TrapCause))
+ emit'' (jpc, insn) = do
+ npc <- getCurrentOffset
jpcrpc <- getState
- setState (M.insert ep bid jpcrpc)
+ setState (BI.insert jpc npc jpcrpc)
newNamedLabel ("jvm_insn: " ++ show insn) >>= defineLabel >> emit' insn
emit' :: J.Instruction -> CodeGen e s (Maybe (Word32, TrapCause))
return $ Just (trapaddr, NewObject patcher)
emit' ATHROW = do
+ pop eax
+ push eax
+ mov eax (Disp 0, eax)
trapaddr <- emitSigIllTrap 2
- let patcher resp reip = do
+ let patcher :: TrapPatcherEaxEsp
+ patcher reax resp reip = do
+ liftIO $ printfJit $ printf "reip: %d\n" (fromIntegral reip :: Word32)
+ liftIO $ printfJit $ printf "reax: %d\n" (fromIntegral reax :: Word32)
(_, jnmap) <- liftIO $ getMethodEntry miThis
- error "no athrow for you, sorry"
+ liftIO $ printfJit $ printf "size: %d\n" (BI.size jnmap)
+ liftIO $ printfJit $ printf "jnmap: %s\n" (show $ BI.toList jnmap)
+ -- TODO: (-4) is a hack (due to the insns above)
+ let jpc = fromIntegral (jnmap BI.!> (fromIntegral reip - 4))
+ let exceptionmap = rawExcpMap method
+ liftIO $ printfJit $ printf "exmap: %s\n" (show $ M.toList exceptionmap)
+ let key =
+ case find f $ M.keys exceptionmap of
+ Just x -> x
+ Nothing -> error "exception: no handler found. (TODO1)"
+ where
+ f (x, y) = jpc >= x && jpc <= y
+ liftIO $ printfJit $ printf "exception: key is: %s\n" (show key)
+ let handlerJPCs = exceptionmap M.! key
+ let f (x, y) = do x' <- getMethodTable x; return (fromIntegral x', y)
+ handlers <- liftIO $ mapM f handlerJPCs
+ liftIO $ printfJit $ printf "exception: handlers: %s\n" (show handlers)
+ let handlerJPC =
+ case find ((==) reax . fst) handlers of
+ Just x -> x
+ Nothing -> error "exception: no handler found (TODO2)"
+ let handlerNPC = jnmap BI.! (fromIntegral $ snd handlerJPC)
+ liftIO $ printfJit $ printf "exception: handler at: 0x%08x\n" handlerNPC
emitSigIllTrap 2
- return reip
+ return $ fromIntegral handlerNPC
return $ Just (trapaddr, ThrowException patcher)
emit' insn = emit insn >> return Nothing
(Just (InstanceOf patcher)) ->
patchWithHarpy (patcher reax) reip >>= delFalse
(Just (ThrowException patcher)) ->
- patchWithHarpy (patcher resp) reip >>= delFalse
+ patchWithHarpy (patcher reax resp) reip >>= delFalse
(Just (NewObject patcher)) ->
patchWithHarpy patcher reip >>= delTrue
(Just (VirtualCall False mi io_offset)) ->
>>= delFalse
Nothing -> case resi of
0x13371234 -> delFalse (-1)
- _ -> error $ "getTrapType: abort :-( " ++ showHex reip ". "
- ++ concatMap (`showHex` ", ") (M.keys tmap)
+ _ -> error $ "getTrapType: abort :-( eip: "
+ ++ showHex reip ". " ++ concatMap (`showHex` ", ") (M.keys tmap)
when deleteMe $ setTrapMap $ M.delete reipw32 tmap
return ret_nreip
where
--- /dev/null
+package java.lang;
+
+public class IllegalArgumentException extends RuntimeException { }
--- /dev/null
+package tests;
+
+public class Exception2 {
+ public static void main(String []args) {
+ try {
+ throw new NullPointerException();
+ } catch (NullPointerException _) {
+ System.out.printf("NullPointerException\n");
+ }
+ }
+}
--- /dev/null
+package tests;
+
+public class Exception3 {
+ public static void main(String []args) {
+ try {
+ throw new NullPointerException();
+ } catch (NullPointerException _) {
+ System.out.printf("NullPointerException\n");
+ } catch (IllegalArgumentException _) {
+ System.out.printf("IllegalArgumentException\n");
+ }
+ try {
+ throw new NullPointerException();
+ } catch (IllegalArgumentException _) {
+ System.out.printf("IllegalArgumentException\n");
+ } catch (NullPointerException _) {
+ System.out.printf("NullPointerException\n");
+ }
+ try {
+ throw new IllegalArgumentException();
+ } catch (NullPointerException _) {
+ System.out.printf("NullPointerException\n");
+ } catch (IllegalArgumentException _) {
+ System.out.printf("IllegalArgumentException\n");
+ }
+ try {
+ throw new IllegalArgumentException();
+ } catch (IllegalArgumentException _) {
+ System.out.printf("IllegalArgumentException\n");
+ } catch (NullPointerException _) {
+ System.out.printf("NullPointerException\n");
+ }
+ System.out.printf("hmmm\n");
+ }
+}
--- /dev/null
+package tests;
+
+public class Exception4 {
+ public static void main(String []args) {
+ try {
+ throw new NullPointerException();
+ } catch (NullPointerException _) {
+ System.out.printf("NullPointerException\n");
+ } finally {
+ System.out.printf("it's finally over\n");
+ }
+
+ try {
+ System.out.printf("I'm fine\n");
+ } finally {
+ System.out.printf("o rly\n");
+ }
+ System.out.printf("hmmm\n");
+ }
+}
cabal install heap $CABAL_OPT
cabal install plugins $CABAL_OPT
cabal install split $CABAL_OPT
+cabal install bimap $CABAL_OPT
# cabal install hs-java $CABAL_OPT
gitinstall git://wien.tomnetworks.com/hs-java.git