, BasicBlock(..)
, BBEnd(..)
, MapBB
+ , ExceptionMap
+ , JpcNpcMap
, RawMethod(..)
+ , TrapPatcher, TrapPatcherEax, TrapPatcherEaxEsp
, TrapMap, MethodMap, ClassMap, FieldMap
, StringMap, VirtualMap, InterfaceMap
, InterfaceMethodMap
import Data.Int
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
import System.IO.Unsafe
+import Harpy
+import Foreign.C.Types
+
import JVM.ClassFile
import JVM.Assembler
type BlockID = Int
-- Represents a CFG node
data BasicBlock = BasicBlock {
- code :: [Instruction],
+ code :: [(Int, Instruction)],
+ bblength :: Int,
successor :: BBEnd }
-- describes (leaving) edges of a CFG node
deriving Show
type MapBB = M.Map BlockID BasicBlock
+type ExceptionMap = M.Map (Word16, Word16) [(B.ByteString, Word16)]
+
+-- java byte code PC -> native PC
+type JpcNpcMap = BI.Bimap Int Word32
data RawMethod = RawMethod {
rawMapBB :: MapBB,
+ rawExcpMap :: ExceptionMap,
rawLocals :: Int,
rawStackSize :: Int,
rawArgCount :: NativeWord,
-- MethodInfo = relevant information about callee
type TrapMap = M.Map NativeWord TrapCause
+type TrapPatcher = CPtrdiff -> CodeGen () () CPtrdiff
+type TrapPatcherEax = CPtrdiff -> TrapPatcher
+type TrapPatcherEaxEsp = CPtrdiff -> TrapPatcherEax
+
data TrapCause
- = StaticMethod MethodInfo -- for static calls
+ = StaticMethod TrapPatcher -- for static calls
| VirtualCall Bool MethodInfo (IO NativeWord) -- for invoke{interface,virtual}
- | InstanceOf B.ByteString -- class name
- | NewObject B.ByteString -- class name
+ | InstanceOf TrapPatcherEax
+ | ThrowException TrapPatcherEaxEsp
+ | NewObject TrapPatcher
| StaticField StaticFieldInfo
+ | ObjectField TrapPatcher
data StaticFieldInfo = StaticFieldInfo {
sfiClassName :: B.ByteString,
-- 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,