Author: zoltan
Date: 2007-12-21 15:17:42 -0500 (Fri, 21 Dec 2007)
New Revision: 91788

Modified:
   trunk/mono/mono/mini/ChangeLog
   trunk/mono/mono/mini/exceptions-amd64.c
   trunk/mono/mono/mini/mini-amd64.c
   trunk/mono/mono/mini/mini-amd64.h
   trunk/mono/mono/mini/mini.c
   trunk/mono/mono/mini/tramp-amd64.c
Log:
2007-12-21  Zoltan Varga  <[EMAIL PROTECTED]>

        * mini.c (setup_jit_tls_data): Use the MONO_ARCH_INIT_TOP_LMF_ENTRY 
macro if
        defined.

        * mini-amd64.h mini-amd64.c exceptions-amd64.c tramp-amd64.c: Rename 
lmf->ebp to 
        lmf->rbp.


Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog      2007-12-21 20:08:02 UTC (rev 91787)
+++ trunk/mono/mono/mini/ChangeLog      2007-12-21 20:17:42 UTC (rev 91788)
@@ -1,5 +1,11 @@
 2007-12-21  Zoltan Varga  <[EMAIL PROTECTED]>
 
+       * mini.c (setup_jit_tls_data): Use the MONO_ARCH_INIT_TOP_LMF_ENTRY 
macro if
+       defined.
+
+       * mini-amd64.h mini-amd64.c exceptions-amd64.c tramp-amd64.c: Rename 
lmf->ebp to 
+       lmf->rbp.
+
        * exceptions-amd64.c (mono_arch_find_jit_info): Fix the detection of 
whenever
        the top LMF entry belongs to the current method.
 

Modified: trunk/mono/mono/mini/exceptions-amd64.c
===================================================================
--- trunk/mono/mono/mini/exceptions-amd64.c     2007-12-21 20:08:02 UTC (rev 
91787)
+++ trunk/mono/mono/mini/exceptions-amd64.c     2007-12-21 20:17:42 UTC (rev 
91788)
@@ -553,13 +553,13 @@
                        if (omit_fp)
                                lmf_match = (*lmf) && (*lmf)->rsp == ctx->rsp;
                        else
-                               lmf_match = (*lmf) && (*lmf)->ebp == ctx->rbp;
+                               lmf_match = (*lmf) && (*lmf)->rbp == ctx->rbp;
 
-                       if (*lmf && ((*lmf) != jit_tls->first_lmf) && 
lmf_match) {
+                       if (*lmf && lmf_match) {
                                /* Make sure the LMF belongs to this method */
                                g_assert ((*lmf)->rip >= 
(guint64)ji->code_start && (*lmf)->rip <= ((guint64)((guint8*)ji->code_start + 
ji->code_size)));
 
-                               new_ctx->rbp = (*lmf)->ebp;
+                               new_ctx->rbp = (*lmf)->rbp;
                                new_ctx->rbx = (*lmf)->rbx;
                                new_ctx->rsp = (*lmf)->rsp;
                                new_ctx->r12 = (*lmf)->r12;
@@ -655,7 +655,7 @@
                }
 
                new_ctx->rip = (*lmf)->rip;
-               new_ctx->rbp = (*lmf)->ebp;
+               new_ctx->rbp = (*lmf)->rbp;
                new_ctx->rsp = (*lmf)->rsp;
 
                new_ctx->rbx = (*lmf)->rbx;

Modified: trunk/mono/mono/mini/mini-amd64.c
===================================================================
--- trunk/mono/mono/mini/mini-amd64.c   2007-12-21 20:08:02 UTC (rev 91787)
+++ trunk/mono/mono/mini/mini-amd64.c   2007-12-21 20:17:42 UTC (rev 91788)
@@ -4527,7 +4527,7 @@
                amd64_lea_membase (code, AMD64_R11, AMD64_RIP, 0);
                amd64_mov_membase_reg (code, cfg->frame_reg, lmf_offset + 
G_STRUCT_OFFSET (MonoLMF, rip), AMD64_R11, 8);
                /* Save fp */
-               amd64_mov_membase_reg (code, cfg->frame_reg, lmf_offset + 
G_STRUCT_OFFSET (MonoLMF, ebp), AMD64_RBP, 8);
+               amd64_mov_membase_reg (code, cfg->frame_reg, lmf_offset + 
G_STRUCT_OFFSET (MonoLMF, rbp), AMD64_RBP, 8);
                /* Save sp */
                amd64_mov_membase_reg (code, cfg->frame_reg, lmf_offset + 
G_STRUCT_OFFSET (MonoLMF, rsp), AMD64_RSP, 8);
                /* Skip method (only needed for trampoline LMF frames) */
@@ -4809,7 +4809,7 @@
 
                /* Restore caller saved regs */
                if (cfg->used_int_regs & (1 << AMD64_RBP)) {
-                       amd64_mov_reg_membase (code, AMD64_RBP, cfg->frame_reg, 
lmf_offset + G_STRUCT_OFFSET (MonoLMF, ebp), 8);
+                       amd64_mov_reg_membase (code, AMD64_RBP, cfg->frame_reg, 
lmf_offset + G_STRUCT_OFFSET (MonoLMF, rbp), 8);
                }
                if (cfg->used_int_regs & (1 << AMD64_RBX)) {
                        amd64_mov_reg_membase (code, AMD64_RBX, cfg->frame_reg, 
lmf_offset + G_STRUCT_OFFSET (MonoLMF, rbx), 8);

Modified: trunk/mono/mono/mini/mini-amd64.h
===================================================================
--- trunk/mono/mono/mini/mini-amd64.h   2007-12-21 20:08:02 UTC (rev 91787)
+++ trunk/mono/mono/mini/mini-amd64.h   2007-12-21 20:17:42 UTC (rev 91788)
@@ -128,7 +128,7 @@
        MonoMethod *method;
        guint64     rip;
        guint64     rbx;
-       guint64     ebp;
+       guint64     rbp;
        guint64     rsp;
        guint64     r12;
        guint64     r13;
@@ -174,6 +174,8 @@
 #define MONO_CONTEXT_GET_BP(ctx) ((gpointer)((ctx)->rbp))
 #define MONO_CONTEXT_GET_SP(ctx) ((gpointer)((ctx)->rsp))
 
+#define MONO_ARCH_INIT_TOP_LMF_ENTRY(lmf)
+
 #ifdef _MSC_VER
 
 #define MONO_INIT_CONTEXT_FROM_FUNC(ctx, start_func) do { \

Modified: trunk/mono/mono/mini/mini.c
===================================================================
--- trunk/mono/mono/mini/mini.c 2007-12-21 20:08:02 UTC (rev 91787)
+++ trunk/mono/mono/mini/mini.c 2007-12-21 20:17:42 UTC (rev 91788)
@@ -9603,7 +9603,11 @@
        jit_tls->end_of_stack = stack_start;
 
        lmf = g_new0 (MonoLMF, 1);
+#ifdef MONO_ARCH_INIT_TOP_LMF_ENTRY
+       MONO_ARCH_INIT_TOP_LMF_ENTRY (lmf);
+#else
        lmf->ebp = -1;
+#endif
 
        jit_tls->first_lmf = lmf;
 

Modified: trunk/mono/mono/mini/tramp-amd64.c
===================================================================
--- trunk/mono/mono/mini/tramp-amd64.c  2007-12-21 20:08:02 UTC (rev 91787)
+++ trunk/mono/mono/mini/tramp-amd64.c  2007-12-21 20:17:42 UTC (rev 91788)
@@ -269,7 +269,7 @@
        amd64_mov_membase_reg (code, AMD64_RBP, lmf_offset + G_STRUCT_OFFSET 
(MonoLMF, rip), AMD64_R11, 8);
        /* Save fp */
        amd64_mov_reg_membase (code, AMD64_R11, AMD64_RSP, framesize, 8);
-       amd64_mov_membase_reg (code, AMD64_RBP, lmf_offset + G_STRUCT_OFFSET 
(MonoLMF, ebp), AMD64_R11, 8);
+       amd64_mov_membase_reg (code, AMD64_RBP, lmf_offset + G_STRUCT_OFFSET 
(MonoLMF, rbp), AMD64_R11, 8);
        /* Save sp */
        amd64_mov_reg_reg (code, AMD64_R11, AMD64_RSP, 8);
        amd64_alu_reg_imm (code, X86_ADD, AMD64_R11, framesize + 16);

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to