Wed Sep 22 19:03:20 CEST 2004 Paolo Molaro <lupus@ximian.com>

	* mini.h, exceptions-ppc.c, exceptions-s390.c, exceptions-s390x.c,
	mini-exceptions.c: updates for changed stack walk interface.

svn path=/trunk/mono/; revision=34229

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 8b23cf005bde9085604ee69a78b2afe7ddf4559e..0f181528a4600b0325a0c501bb6b7fb747a66a4e 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,9 @@
+
+Wed Sep 22 19:03:20 CEST 2004 Paolo Molaro <lupus@ximian.com>
+
+       * mini.h, exceptions-ppc.c, exceptions-s390.c, exceptions-s390x.c,
+       mini-exceptions.c: updates for changed stack walk interface.
+
 2004-09-21  Neale Ferguson <Neale.Ferguson@SoftwareAG-usa.com>
 
        * mini-s390.c, cpu-s390.md: Minor changes to OP_ARGLIST handling

diff --git a/mono/mini/exceptions-ppc.c b/mono/mini/exceptions-ppc.c
index 524cf6c3f56a116f0a8476680ed35a205174e77f..11a41f73bdbd0e1d16bc1e4a513c0ca18d93f87e 100644 (file)
--- a/mono/mini/exceptions-ppc.c
+++ b/mono/mini/exceptions-ppc.c
@@ -655,7 +655,7 @@ ves_icall_get_trace (MonoException *exc, gint32 skip, MonoBoolean need_file_info
 }
 
 void
-mono_jit_walk_stack (MonoStackWalk func, gpointer user_data) {
+mono_jit_walk_stack (MonoStackWalk func, gboolean do_il_offset, gpointer user_data) {
        MonoDomain *domain = mono_domain_get ();
        MonoJitTlsData *jit_tls = TlsGetValue (mono_jit_tls_id);
        MonoLMF *lmf = jit_tls->lmf;
@@ -687,7 +687,7 @@ mono_jit_walk_stack (MonoStackWalk func, gpointer user_data) {
                if (ji == (gpointer)-1)
                        return;
 
-               il_offset = mono_debug_il_offset_from_address (ji->method, native_offset, domain);
+               il_offset = do_il_offset ? mono_debug_il_offset_from_address (ji->method, native_offset, domain): -1;
 
                if (func (ji->method, native_offset, il_offset, managed, user_data))
                        return;

diff --git a/mono/mini/exceptions-s390.c b/mono/mini/exceptions-s390.c
index 30e062767ec07e077648ee0ddaa75a1db5788d65..96d84bac04f21c71f40968ef4707d7ba766aad72 100644 (file)
--- a/mono/mini/exceptions-s390.c
+++ b/mono/mini/exceptions-s390.c
@@ -880,7 +880,7 @@ ves_icall_get_trace (MonoException *exc, gint32 skip, MonoBoolean need_file_info
 /*------------------------------------------------------------------*/
 
 void
-mono_jit_walk_stack (MonoStackWalk func, gpointer user_data) {
+mono_jit_walk_stack (MonoStackWalk func, gboolean do_il_offset, gpointer user_data) {
        MonoDomain *domain = mono_domain_get ();
        MonoJitTlsData *jit_tls = TlsGetValue (mono_jit_tls_id);
        MonoLMF *lmf = jit_tls->lmf;
@@ -902,7 +902,7 @@ mono_jit_walk_stack (MonoStackWalk func, gpointer user_data) {
                if (ji == (gpointer)-1)
                        return;
 
-               il_offset = mono_debug_il_offset_from_address (ji->method, native_offset, domain);
+               il_offset = do_il_offset ? mono_debug_il_offset_from_address (ji->method, native_offset, domain): -1;
 
                if (func (ji->method, native_offset, il_offset, managed, user_data))
                        return;

diff --git a/mono/mini/exceptions-s390x.c b/mono/mini/exceptions-s390x.c
index 45503d6cee9b3727427674845492497a377d1238..5ddd5822aa445ed540447f897f33bfc01801a1fb 100644 (file)
--- a/mono/mini/exceptions-s390x.c
+++ b/mono/mini/exceptions-s390x.c
@@ -860,7 +860,7 @@ ves_icall_get_trace (MonoException *exc, gint32 skip, MonoBoolean need_file_info
 /*------------------------------------------------------------------*/
 
 void
-mono_jit_walk_stack (MonoStackWalk func, gpointer user_data) {
+mono_jit_walk_stack (MonoStackWalk func, gboolean do_il_offset, gpointer user_data) {
        MonoDomain *domain = mono_domain_get ();
        MonoJitTlsData *jit_tls = TlsGetValue (mono_jit_tls_id);
        MonoLMF *lmf = jit_tls->lmf;
@@ -882,7 +882,7 @@ mono_jit_walk_stack (MonoStackWalk func, gpointer user_data) {
                if (ji == (gpointer)-1)
                        return;
 
-               il_offset = mono_debug_il_offset_from_address (ji->method, native_offset, domain);
+               il_offset = do_il_offset ? mono_debug_il_offset_from_address (ji->method, native_offset, domain): -1;
 
                if (func (ji->method, native_offset, il_offset, managed, user_data))
                        return;

diff --git a/mono/mini/mini-exceptions.c b/mono/mini/mini-exceptions.c
index 1270ec1b63e434dbe1655393dbfc4defe8929d35..b7de285afdd2b435c1be0ce2e7754a7184c531e1 100644 (file)
--- a/mono/mini/mini-exceptions.c
+++ b/mono/mini/mini-exceptions.c
@@ -155,7 +155,7 @@ ves_icall_get_trace (MonoException *exc, gint32 skip, MonoBoolean need_file_info
 }
 
 void
-mono_jit_walk_stack (MonoStackWalk func, gpointer user_data) {
+mono_jit_walk_stack (MonoStackWalk func, gboolean do_il_offset, gpointer user_data) {
        MonoDomain *domain = mono_domain_get ();
        MonoJitTlsData *jit_tls = TlsGetValue (mono_jit_tls_id);
        MonoLMF *lmf = jit_tls->lmf;
@@ -178,7 +178,7 @@ mono_jit_walk_stack (MonoStackWalk func, gpointer user_data) {
                if (ji == (gpointer)-1)
                        return;
 
-               il_offset = mono_debug_il_offset_from_address (ji->method, native_offset, domain);
+               il_offset = do_il_offset ? mono_debug_il_offset_from_address (ji->method, native_offset, domain): -1;
 
                if (func (ji->method, native_offset, il_offset, managed, user_data))
                        return;

diff --git a/mono/mini/mini.h b/mono/mini/mini.h
index bc4b9ac792a12fb045e898c4a73d8db110cca434..e88cae992de8f5dfaf4e291d7d0eea084baf1225 100644 (file)
--- a/mono/mini/mini.h
+++ b/mono/mini/mini.h
@@ -801,7 +801,7 @@ void     mono_arch_invalidate_method            (MonoJitInfo *ji, void *func, gp
 /* Exception handling */
 gboolean mono_handle_exception                  (MonoContext *ctx, gpointer obj,
                                                 gpointer original_ip, gboolean test_only);
-void      mono_jit_walk_stack                   (MonoStackWalk func, gpointer user_data);
+void      mono_jit_walk_stack                   (MonoStackWalk func, gboolean do_il_offset, gpointer user_data);
 MonoArray *ves_icall_get_trace                  (MonoException *exc, gint32 skip, MonoBoolean need_file_info);
 MonoBoolean ves_icall_get_frame_info            (gint32 skip, MonoBoolean need_file_info, 
                                                 MonoReflectionMethod **method,