X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fexceptions-alpha.c;h=f507f7572104529059e83bf6695768e14bbc1b5e;hb=7f23a0c1f3b357cea793f429b52a918f45157855;hp=4a3a5bbcdd479b1e5dea660f6467f395281ca0f5;hpb=5bcfd754a5c39a091251e12d95169c494434d730;p=mono.git

diff --git a/mono/mini/exceptions-alpha.c b/mono/mini/exceptions-alpha.c
index 4a3a5bbcdd4..f507f757210 100644
--- a/mono/mini/exceptions-alpha.c
+++ b/mono/mini/exceptions-alpha.c
@@ -271,7 +271,7 @@ static void throw_exception(MonoException *exc, unsigned long RA,
 	mono_ex->stack_trace = NULL;
     }
 
-  mono_handle_exception (&ctx, exc, (gpointer)RA, FALSE);
+  mono_handle_exception (&ctx, exc);
 
   restore_context(&ctx);
 
@@ -565,18 +565,15 @@ mono_arch_get_throw_corlib_exception (void)
 /*                                                                  */
 /* Parameters   - ctx       - Saved processor state                 */
 /*                obj       - The exception object                  */
-/*                test_only - Only test if the exception is caught, */
-/*                            but don't call handlers               */
 /*                                                                  */
 /*------------------------------------------------------------------*/
 
 gboolean
-mono_arch_handle_exception (void *uc, gpointer obj, gboolean test_only)
+mono_arch_handle_exception (void *uc, gpointer obj)
 {
   ALPHA_DEBUG("mono_arch_handle_exception");
 
-  return mono_handle_exception (uc, obj, mono_arch_ip_from_context(uc),
-				test_only);
+  return mono_handle_exception (uc, obj);
 }
 
 /*========================= End of Function ========================*/
@@ -782,6 +779,7 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
                          MonoJitInfo *res, MonoJitInfo *prev_ji,
 						 MonoContext *ctx,
                          MonoContext *new_ctx, MonoLMF **lmf,
+						 mgreg_t **save_locations,
                          gboolean *managed)
 {
   MonoJitInfo *ji;
@@ -796,7 +794,7 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
        ((guint8*)ip < ((guint8*)prev_ji->code_start) + prev_ji->code_size)))
     ji = prev_ji;
   else
-    ji = mono_jit_info_table_find (domain, ip);
+	  ji = mini_jit_info_table_find (domain, ip, NULL);
 
   if (managed)
     *managed = FALSE;
@@ -975,7 +973,7 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
       if (!(*lmf)->method)
 	return (gpointer)-1;
 
-      if ((ji = mono_jit_info_table_find (domain, (gpointer)(*lmf)->eip))) {
+      if ((ji = mini_jit_info_table_find (domain, (gpointer)(*lmf)->eip, NULL))) {
       } else {
 	memset (res, 0, MONO_SIZEOF_JIT_INFO);
 	res->method = (*lmf)->method;