codegen: map each real PC to java bytecode PC

and store that information also in the global table (needed for handling a
exception at runtime)

diff --git a/Mate.hs b/Mate.hs
index a191048495b26244a1ceab9bcd226d6e0289fb1a..e93fea493e6d5a527dfe32a9e92ddc92c2c5ad9a 100644 (file)
--- a/Mate.hs
+++ b/Mate.hs
@@ -70,5 +70,5 @@ executeMain bclspath cls = do
       entry <- compileBB rawmethod mi
       addMethodRef entry mi [bclspath]
       printfInfo "executing `main' now:\n"
-      executeFuncPtr entry
+      executeFuncPtr $ fst entry
     Nothing -> error "main not found"

diff --git a/Mate/ClassPool.hs b/Mate/ClassPool.hs
index 0f235c01044eb1dc5a2935c3eb9a6574c73dacc6..baf49a3d6eca25a762c5c06952695e747c827f46 100644 (file)
--- a/Mate/ClassPool.hs
+++ b/Mate/ClassPool.hs
@@ -278,7 +278,7 @@ loadAndInitClass path = do
       entry <- compileBB rawmethod mi
       addMethodRef entry mi [path]
       printfCp $ printf "executing static initializer from %s now\n" (toString path)
-      executeFuncPtr entry
+      executeFuncPtr $ fst entry
       printfCp $ printf "static initializer from %s done\n" (toString path)
     Nothing -> return ()
 

diff --git a/Mate/MethodPool.hs b/Mate/MethodPool.hs
index 9280112455f8fcba9e57a80bcc15beb64df18366..6eba0d4ac21273f6fb520a1d1ee272e9af7938a5 100644 (file)
--- a/Mate/MethodPool.hs
+++ b/Mate/MethodPool.hs
@@ -39,11 +39,11 @@ foreign import ccall "&loadLibrary"
 foreign import ccall "&printGCStats"
   printGCStatsAddr :: FunPtr (IO ())
 
-getMethodEntry :: MethodInfo -> IO CPtrdiff
+getMethodEntry :: MethodInfo -> IO (CPtrdiff, JpcNpcMap)
 getMethodEntry mi@(MethodInfo method cm sig) = do
   mmap <- getMethodMap
 
-  entryaddr <- case M.lookup mi mmap of
+  (entryaddr, jnmap) <- case M.lookup mi mmap of
     Nothing -> do
       cls <- getClassFile cm
       printfMp $ printf "getMethodEntry: no method \"%s\" found. compile it\n" (show mi)
@@ -57,11 +57,11 @@ getMethodEntry mi@(MethodInfo method cm sig) = do
                 if scm == "jmate/lang/MateRuntime" then
                   case smethod of
                     "loadLibrary" ->
-                       return . funPtrToAddr $ loadLibraryAddr
+                       return (funPtrToAddr loadLibraryAddr, M.empty)
                     "printGCStats" ->
-                       return . funPtrToAddr $ printGCStatsAddr
+                       return (funPtrToAddr printGCStatsAddr, M.empty)
                     "printMemoryUsage" ->
-                       return . funPtrToAddr $ printMemoryUsageAddr
+                       return (funPtrToAddr printMemoryUsageAddr, M.empty)
                     _ ->
                        error $ "native-call: " ++ smethod ++ " not found."
                 else do
@@ -72,16 +72,17 @@ getMethodEntry mi@(MethodInfo method cm sig) = do
                       symbol = sym1 ++ "__" ++ smethod ++ "__" ++ sym2
                   printfMp $ printf "native-call: symbol: %s\n" symbol
                   nf <- loadNativeFunction symbol
-                  setMethodMap $ M.insert mi nf mmap
-                  return nf
+                  let nf' = (nf, M.empty)
+                  setMethodMap $ M.insert mi nf' mmap
+                  return nf'
               else do
                 rawmethod <- parseMethod cls' method sig
                 entry <- compileBB rawmethod (MethodInfo method (thisClass cls') sig)
                 addMethodRef entry mi clsnames
-                return $ fromIntegral entry
+                return entry
         Nothing -> error $ show method ++ " not found. abort"
     Just w32 -> return w32
-  return $ fromIntegral entryaddr
+  return (fromIntegral entryaddr, jnmap)
 
 funPtrToAddr :: Num b => FunPtr a -> b
 funPtrToAddr = fromIntegral . ptrToIntPtr . castFunPtrToPtr
@@ -125,14 +126,14 @@ loadNativeFunction sym = do
 --   mmap2ptr mmap >>= set_mmap
 --   demo_mmap -- access Data.Map from C
 
-addMethodRef :: NativeWord -> MethodInfo -> [B.ByteString] -> IO ()
+addMethodRef :: (NativeWord, JpcNpcMap) -> MethodInfo -> [B.ByteString] -> IO ()
 addMethodRef entry (MethodInfo mmname _ msig) clsnames = do
   mmap <- getMethodMap
   let newmap = foldr (\i -> M.insert (MethodInfo mmname i msig) entry) M.empty clsnames
   setMethodMap $ mmap `M.union` newmap
 
 
-compileBB :: RawMethod -> MethodInfo -> IO NativeWord
+compileBB :: RawMethod -> MethodInfo -> IO (NativeWord, JpcNpcMap)
 compileBB rawmethod methodinfo = do
   tmap <- getTrapMap
 
@@ -140,7 +141,7 @@ compileBB rawmethod methodinfo = do
   printfJit $ printf "emit code of \"%s\" from \"%s\":\n" (toString $ methName methodinfo) (toString $ methClassName methodinfo)
   let ebb = emitFromBB cls rawmethod
   let cgconfig = defaultCodeGenConfig { codeBufferSize = fromIntegral $ rawCodeLength rawmethod * 32 }
-  (_, Right right) <- runCodeGenWithConfig ebb () () cgconfig
+  (jnmap, Right right) <- runCodeGenWithConfig ebb () M.empty cgconfig
 
   let ((entry, _, new_tmap), _) = right
   setTrapMap $ tmap `M.union` new_tmap -- prefers elements in tmap
@@ -158,7 +159,7 @@ compileBB rawmethod methodinfo = do
   -- (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
+  return (fromIntegral $ ptrToIntPtr entry, jnmap)
 
 
 executeFuncPtr :: NativeWord -> IO ()

diff --git a/Mate/MethodPool.hs-boot b/Mate/MethodPool.hs-boot
index a1dfe4f0c134a358f9935e1b1b1d6b1afe4bfed7..e55aab8b654717e1b3e92f0079a2601f57bd60bf 100644 (file)
--- a/Mate/MethodPool.hs-boot
+++ b/Mate/MethodPool.hs-boot
@@ -9,7 +9,7 @@ import Mate.NativeSizes
 import Foreign.C.Types
 
 
-addMethodRef :: NativeWord -> MethodInfo -> [B.ByteString] -> IO ()
-compileBB :: RawMethod -> MethodInfo -> IO NativeWord
+addMethodRef :: (NativeWord, JpcNpcMap) -> MethodInfo -> [B.ByteString] -> IO ()
+compileBB :: RawMethod -> MethodInfo -> IO (NativeWord, JpcNpcMap)
 executeFuncPtr :: NativeWord -> IO ()
-getMethodEntry :: MethodInfo -> IO CPtrdiff
+getMethodEntry :: MethodInfo -> IO (CPtrdiff, JpcNpcMap)

diff --git a/Mate/Types.hs b/Mate/Types.hs
index bff97df650a9b87d0679c643e010dd199c71a259..eea9550e37e36ae72df49b2537c24e55fa28681c 100644 (file)
--- a/Mate/Types.hs
+++ b/Mate/Types.hs
@@ -5,6 +5,7 @@ module Mate.Types
   , BBEnd(..)
   , MapBB
   , ExceptionMap
+  , JpcNpcMap
   , RawMethod(..)
   , TrapMap, MethodMap, ClassMap, FieldMap
   , StringMap, VirtualMap, InterfaceMap
@@ -58,6 +59,9 @@ data BBEnd
 type MapBB = M.Map BlockID BasicBlock
 type ExceptionMap = M.Map (Word16, Word16) [(B.ByteString, Word16)]
 
+-- java byte code PC -> native PC
+type JpcNpcMap = M.Map Word32 Int
+
 data RawMethod = RawMethod {
   rawMapBB :: MapBB,
   rawExcpMap :: ExceptionMap,
@@ -92,7 +96,7 @@ data StaticFieldInfo = StaticFieldInfo {
 
 -- B.ByteString = name of method
 -- NativeWord = entrypoint of method
-type MethodMap = M.Map MethodInfo NativeWord
+type MethodMap = M.Map MethodInfo (NativeWord, JpcNpcMap)
 
 data MethodInfo = MethodInfo {
   methName :: B.ByteString,

diff --git a/Mate/X86CodeGen.hs b/Mate/X86CodeGen.hs
index 621f0c2c6c70ed171a5f0236f06f323abe05e384..03333ce0d35d5163a3b31da763a60eb3d20b6ad6 100644 (file)
--- a/Mate/X86CodeGen.hs
+++ b/Mate/X86CodeGen.hs
@@ -45,7 +45,7 @@ type BBStarts = M.Map BlockID Int
 type CompileInfo = (EntryPoint, Int, TrapMap)
 
 
-emitFromBB :: Class Direct -> RawMethod -> CodeGen e s (CompileInfo, [Instruction])
+emitFromBB :: Class Direct -> RawMethod -> CodeGen e JpcNpcMap (CompileInfo, [Instruction])
 emitFromBB cls method = do
     let keys = M.keys hmap
     llmap <- mapM (newNamedLabel . (++) "bb_" . show) keys
@@ -65,16 +65,16 @@ emitFromBB cls method = do
   getLabel bid [] = error $ "label " ++ show bid ++ " not found"
   getLabel i ((x,l):xs) = if i==x then l else getLabel i xs
 
-  efBB :: [(BlockID, Label)] -> BlockID -> CodeGen e s [(Maybe (Word32, TrapCause))]
+  efBB :: [(BlockID, Label)] -> BlockID -> CodeGen e JpcNpcMap [(Maybe (Word32, TrapCause))]
   efBB lmap bid = do
     defineLabel $ getLabel bid lmap
-    ret <- mapM emit'' $ code bb
+    retval <- mapM emit'' $ code bb
     case successor bb of
         FallThrough t -> do
           -- TODO(bernhard): le dirty hax. see java/lang/Integer.toString(int, int)
           jmp (getLabel t lmap)
         _ -> return ()
-    return ret
+    return retval
     where
     bb = hmap M.! bid
 
@@ -98,7 +98,7 @@ emitFromBB cls method = do
       -- like: call $0x01234567
       calladdr <- emitSigIllTrap 5
       let patcher reip = do
-            entryAddr <- liftIO $ getMethodEntry l
+            (entryAddr, _) <- liftIO $ getMethodEntry l
             call (fromIntegral (entryAddr - (reip + 5)) :: NativeWord)
             return reip
       -- discard arguments on stack
@@ -137,8 +137,12 @@ emitFromBB cls method = do
       -- depending on the method-table-ptr
       return $ Just (calladdr, VirtualCall isInterface mi offset)
 
-    emit'' :: J.Instruction -> CodeGen e s (Maybe (Word32, TrapCause))
-    emit'' insn = newNamedLabel ("jvm_insn: " ++ show insn) >>= defineLabel >> emit' insn
+    emit'' :: J.Instruction -> CodeGen e JpcNpcMap (Maybe (Word32, TrapCause))
+    emit'' insn = do
+      ep <- (fromIntegral . ptrToIntPtr) <$> getEntryPoint
+      jpcrpc <- getState
+      setState (M.insert ep bid jpcrpc)
+      newNamedLabel ("jvm_insn: " ++ show insn) >>= defineLabel >> emit' insn
 
     emit' :: J.Instruction -> CodeGen e s (Maybe (Word32, TrapCause))
     emit' (INVOKESPECIAL cpidx) = emitInvoke cpidx True

diff --git a/Mate/X86TrapHandling.hs b/Mate/X86TrapHandling.hs
index b7b81d679e2081f8a241e3aabf25dd27fe613fec..b4bf8ca2b5eaa536e36e58fd7b198128546acbd1 100644 (file)
--- a/Mate/X86TrapHandling.hs
+++ b/Mate/X86TrapHandling.hs
@@ -94,7 +94,7 @@ patchInvoke (MethodInfo methname _ msig)  method_table table2patch io_offset rei
   vmap <- liftIO getVirtualMap
   let newmi = MethodInfo methname (vmap M.! fromIntegral method_table) msig
   offset <- liftIO io_offset
-  entryAddr <- liftIO $ getMethodEntry newmi
+  (entryAddr, _) <- liftIO $ getMethodEntry newmi
   call32Eax (Disp offset)
   -- patch entry in table
   let call_insn = intPtrToPtr . fromIntegral $ table2patch + fromIntegral offset