codegen: handle exceptions of a method

[mate.git] / Mate / X86TrapHandling.hs

diff --git a/Mate/X86TrapHandling.hs b/Mate/X86TrapHandling.hs
index b7b81d679e2081f8a241e3aabf25dd27fe613fec..82ed7ca0d738ca3ad52b1a0f23562ac8ae0e9597 100644 (file)
--- a/Mate/X86TrapHandling.hs
+++ b/Mate/X86TrapHandling.hs
@@ -41,7 +41,7 @@ mateHandler reip reax rebx resi resp = do
     (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)) ->
@@ -52,8 +52,8 @@ mateHandler reip reax rebx resi resp = do
         >>= 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
@@ -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