invokevirtual: implement lazy class loading right

[mate.git] / Mate / Types.hs

diff --git a/Mate/Types.hs b/Mate/Types.hs
index b1fc6def65492c31543668631c7fcb5284a56063..5e5bf221e0ba26420943967d2b77e2cdcedb7ab6 100644 (file)
--- a/Mate/Types.hs
+++ b/Mate/Types.hs
@@ -30,7 +30,8 @@ data RawMethod = RawMethod {
   rawMapBB :: MapBB,
   rawLocals :: Int,
   rawStackSize :: Int,
-  rawArgCount :: NativeWord }
+  rawArgCount :: NativeWord,
+  rawCodeLength :: NativeWord }
 
 
 -- NativeWord = point of method call in generated code
@@ -39,11 +40,10 @@ type TrapMap = M.Map NativeWord TrapCause
 
 data TrapCause =
   StaticMethod MethodInfo | -- for static calls
-  VirtualMethod Bool MethodInfo | -- for virtual calls
-  InterfaceMethod Bool MethodInfo | -- for interface calls
+  VirtualCall Bool MethodInfo (IO NativeWord) | -- for invoke{interface,virtual}
   InstanceOf B.ByteString | -- class name
   NewObject B.ByteString | -- class name
-  StaticField StaticFieldInfo deriving Show
+  StaticField StaticFieldInfo
 
 data StaticFieldInfo = StaticFieldInfo {
   sfiClassName :: B.ByteString,