projects / mono.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 224abec)
Remove some duplicate code from mono_arch_find_jit_info ().
authorZoltan Varga <vargaz@gmail.com>
Mon, 31 Jan 2011 21:44:13 +0000 (22:44 +0100)
committerZoltan Varga <vargaz@gmail.com>
Mon, 31 Jan 2011 21:44:13 +0000 (22:44 +0100)
mono/mini/exceptions-amd64.c patch | blob | history
mono/mini/exceptions-arm.c patch | blob | history
mono/mini/exceptions-ia64.c patch | blob | history
mono/mini/exceptions-mips.c patch | blob | history
mono/mini/exceptions-ppc.c patch | blob | history
mono/mini/exceptions-s390.c patch | blob | history
mono/mini/exceptions-s390x.c patch | blob | history
mono/mini/exceptions-sparc.c patch | blob | history
mono/mini/exceptions-x86.c patch | blob | history
mono/mini/mini-exceptions.c patch | blob | history

diff --git a/mono/mini/exceptions-amd64.c b/mono/mini/exceptions-amd64.c
index cc883afbfb634a3784206e98312298cd6dde1e03..27ec9ad2b707b2e8cc0fa2aa2692ecf157a7d3a7 100644 (file)
--- a/mono/mini/exceptions-amd64.c
+++ b/mono/mini/exceptions-amd64.c
@@ -556,7 +556,6 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
 
        memset (frame, 0, sizeof (StackFrameInfo));
        frame->ji = ji;
-       frame->managed = FALSE;
 
        *new_ctx = *ctx;
 
@@ -568,9 +567,6 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
 
                frame->type = FRAME_TYPE_MANAGED;
 
-               if (!ji->method->wrapper_type || ji->method->wrapper_type == MONO_WRAPPER_DYNAMIC_METHOD)
-                       frame->managed = TRUE;
-
                if (ji->from_aot)
                        unwind_info = mono_aot_get_unwind_info (ji, &unwind_info_len);
                else
diff --git a/mono/mini/exceptions-arm.c b/mono/mini/exceptions-arm.c
index b2d67c76b0eee7bb9695baa009bbfeea0761c812..971ca11ee91248b7675d4575950e078a904423b2 100644 (file)
--- a/mono/mini/exceptions-arm.c
+++ b/mono/mini/exceptions-arm.c
@@ -376,7 +376,6 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
 
        memset (frame, 0, sizeof (StackFrameInfo));
        frame->ji = ji;
-       frame->managed = FALSE;
 
        *new_ctx = *ctx;
 
@@ -389,9 +388,6 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
 
                frame->type = FRAME_TYPE_MANAGED;
 
-               if (!ji->method->wrapper_type || ji->method->wrapper_type == MONO_WRAPPER_DYNAMIC_METHOD)
-                       frame->managed = TRUE;
-
                if (ji->from_aot)
                        unwind_info = mono_aot_get_unwind_info (ji, &unwind_info_len);
                else
diff --git a/mono/mini/exceptions-ia64.c b/mono/mini/exceptions-ia64.c
index ee5a0fbcd2486234884829cd94e39df4da9cea07..801297675694af2994300c68a3e698e8d3ac402c 100644 (file)
--- a/mono/mini/exceptions-ia64.c
+++ b/mono/mini/exceptions-ia64.c
@@ -507,7 +507,6 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
 
        memset (frame, 0, sizeof (StackFrameInfo));
        frame->ji = ji;
-       frame->managed = FALSE;
 
        *new_ctx = *ctx;
        new_ctx->precise_ip = FALSE;
@@ -547,9 +546,6 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
                frame->type = FRAME_TYPE_MANAGED;
                frame->ji = ji;
 
-               if (!ji->method->wrapper_type || ji->method->wrapper_type == MONO_WRAPPER_DYNAMIC_METHOD)
-                       frame->managed = TRUE;
-
                //print_ctx (new_ctx);
 
                err = unw_step (&new_ctx->cursor);
diff --git a/mono/mini/exceptions-mips.c b/mono/mini/exceptions-mips.c
index 3d35a2cb23159bc89be4dfa7afc9d534a5acebf7..e7d0b661d3f328b35f1d47c2d13cbeaf9b06a819 100644 (file)
--- a/mono/mini/exceptions-mips.c
+++ b/mono/mini/exceptions-mips.c
@@ -438,7 +438,6 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
 
        memset (frame, 0, sizeof (StackFrameInfo));
        frame->ji = ji;
-       frame->managed = FALSE;
 
        *new_ctx = *ctx;
 
@@ -449,9 +448,6 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
 
                frame->type = FRAME_TYPE_MANAGED;
 
-               if (!ji->method->wrapper_type || ji->method->wrapper_type == MONO_WRAPPER_DYNAMIC_METHOD)
-                       frame->managed = TRUE;
-
                if (*lmf && (MONO_CONTEXT_GET_BP (ctx) >= (gpointer)(*lmf)->ebp)) {
                        /* remove any unused lmf */
                        *lmf = (*lmf)->previous_lmf;
diff --git a/mono/mini/exceptions-ppc.c b/mono/mini/exceptions-ppc.c
index 943a7a5be7ef28a65cabe3084fa05209725c8671..9087db93977ad44876dd89a3b58c681e6c4811d7 100644 (file)
--- a/mono/mini/exceptions-ppc.c
+++ b/mono/mini/exceptions-ppc.c
@@ -520,7 +520,6 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
 
        memset (frame, 0, sizeof (StackFrameInfo));
        frame->ji = ji;
-       frame->managed = FALSE;
 
        *new_ctx = *ctx;
        setup_context (new_ctx);
@@ -534,9 +533,6 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
 
                frame->type = FRAME_TYPE_MANAGED;
 
-               if (!ji->method->wrapper_type || ji->method->wrapper_type == MONO_WRAPPER_DYNAMIC_METHOD)
-                       frame->managed = TRUE;
-
                if (ji->from_aot)
                        unwind_info = mono_aot_get_unwind_info (ji, &unwind_info_len);
                else
diff --git a/mono/mini/exceptions-s390.c b/mono/mini/exceptions-s390.c
index 618462658581bbd4e1bf28eca3375a43f9110ccb..9be9cac189a69f24bcdccd16c913f5ad60e42d66 100644 (file)
--- a/mono/mini/exceptions-s390.c
+++ b/mono/mini/exceptions-s390.c
@@ -449,7 +449,6 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
 
        memset (frame, 0, sizeof (StackFrameInfo));
        frame->ji = ji;
-       frame->managed = FALSE;
 
        *new_ctx = *ctx;
 
@@ -458,9 +457,6 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
 
                frame->type = FRAME_TYPE_MANAGED;
 
-               if (!ji->method->wrapper_type || ji->method->wrapper_type == MONO_WRAPPER_DYNAMIC_METHOD)
-                       frame->managed = TRUE;
-
                if (*lmf && (MONO_CONTEXT_GET_SP (ctx) >= (gpointer)(*lmf)->ebp)) {
                        /* remove any unused lmf */
                        *lmf = (*lmf)->previous_lmf;
diff --git a/mono/mini/exceptions-s390x.c b/mono/mini/exceptions-s390x.c
index 23e3aa583d57802316651f4ff934ccef9cf18da1..03d5c81a0b167bf76d190a2799dcc188f2fe752d 100644 (file)
--- a/mono/mini/exceptions-s390x.c
+++ b/mono/mini/exceptions-s390x.c
@@ -444,7 +444,6 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
 
        memset (frame, 0, sizeof (StackFrameInfo));
        frame->ji = ji;
-       frame->managed = FALSE;
 
        *new_ctx = *ctx;
 
@@ -453,9 +452,6 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
 
                frame->type = FRAME_TYPE_MANAGED;
 
-               if (!ji->method->wrapper_type || ji->method->wrapper_type == MONO_WRAPPER_DYNAMIC_METHOD)
-                       frame->managed = TRUE;
-
                if (*lmf && (MONO_CONTEXT_GET_SP (ctx) >= (gpointer)(*lmf)->ebp)) {
                        /* remove any unused lmf */
                        *lmf = (*lmf)->previous_lmf;
diff --git a/mono/mini/exceptions-sparc.c b/mono/mini/exceptions-sparc.c
index d44416b4792b93207325ab2ad0e56456ba8febf4..f9569c7477f7b76a2672ee66a6384668a20b66f1 100644 (file)
--- a/mono/mini/exceptions-sparc.c
+++ b/mono/mini/exceptions-sparc.c
@@ -344,16 +344,12 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
 
        memset (frame, 0, sizeof (StackFrameInfo));
        frame->ji = ji;
-       frame->managed = FALSE;
 
        *new_ctx = *ctx;
 
        if (ji != NULL) {
                frame->type = FRAME_TYPE_MANAGED;
 
-               if (!ji->method->wrapper_type || ji->method->wrapper_type == MONO_WRAPPER_DYNAMIC_METHOD)
-                       frame->managed = TRUE;
-
                if (*lmf && (MONO_CONTEXT_GET_BP (ctx) >= (gpointer)(*lmf)->ebp)) {
                        /* remove any unused lmf */
                        *lmf = (*lmf)->previous_lmf;
diff --git a/mono/mini/exceptions-x86.c b/mono/mini/exceptions-x86.c
index 576a66b3b9641c1626bceba2835dcf3add3d8801..c7ee60a3214c2ffd07e8c6bd58e6647819d2d1c2 100644 (file)
--- a/mono/mini/exceptions-x86.c
+++ b/mono/mini/exceptions-x86.c
@@ -749,7 +749,6 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
 
        memset (frame, 0, sizeof (StackFrameInfo));
        frame->ji = ji;
-       frame->managed = FALSE;
 
        *new_ctx = *ctx;
 
@@ -761,9 +760,6 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
 
                frame->type = FRAME_TYPE_MANAGED;
 
-               if (!ji->method->wrapper_type || ji->method->wrapper_type == MONO_WRAPPER_DYNAMIC_METHOD)
-                       frame->managed = TRUE;
-
                if (ji->from_aot)
                        unwind_info = mono_aot_get_unwind_info (ji, &unwind_info_len);
                else
diff --git a/mono/mini/mini-exceptions.c b/mono/mini/mini-exceptions.c
index 43e77fe2823bb4f563dbe294d2ea6e93d383d55f..73732d55b7b405b8fbfe89d4c2bfc8febdd121f1 100644 (file)
--- a/mono/mini/mini-exceptions.c
+++ b/mono/mini/mini-exceptions.c
@@ -360,6 +360,11 @@ mono_find_jit_info_ext (MonoDomain *domain, MonoJitTlsData *jit_tls,
        if (!err)
                return FALSE;
 
+       if (frame->type == FRAME_TYPE_MANAGED) {
+               if (!ji->method->wrapper_type || ji->method->wrapper_type == MONO_WRAPPER_DYNAMIC_METHOD)
+                       frame->managed = TRUE;
+       }
+
        if (frame->type == FRAME_TYPE_MANAGED_TO_NATIVE) {
                /*
                 * This type of frame is just a marker, the caller should unwind once more to get the
my mono mirror. check out Moved to http://github.com/mono/mono