basicblock: using arrows

[mate.git] / Mate / Types.hs

diff --git a/Mate/Types.hs b/Mate/Types.hs
index ec76a4cb7d41f5b3631b550e296ee479ba085708..67ac2a52b1d016cab35d6fa625287344d0eaba9e 100644 (file)
--- a/Mate/Types.hs
+++ b/Mate/Types.hs
@@ -67,12 +67,15 @@ data RawMethod = RawMethod {
 type TrapMap = M.Map NativeWord TrapCause
 
 type TrapPatcher = CPtrdiff -> CodeGen () () CPtrdiff
+type TrapPatcherEax = CPtrdiff -> CPtrdiff -> CodeGen () () CPtrdiff
+type TrapPatcherEsp = TrapPatcherEax
 
 data TrapCause
   = StaticMethod TrapPatcher -- for static calls
   | VirtualCall Bool MethodInfo (IO NativeWord) -- for invoke{interface,virtual}
-  | InstanceOf B.ByteString -- class name
-  | NewObject TrapPatcher -- class name
+  | InstanceOf TrapPatcherEax
+  | ThrowException TrapPatcherEsp
+  | NewObject TrapPatcher
   | StaticField StaticFieldInfo
   | ObjectField TrapPatcher