| Newsgroups |
gmane.comp.gnome.mono.patches |
| Message-ID |
<0000014270c0c8b9-45074963-1ab2-444d-884e-74df1733d84f-000000@email.amazonses.com> |
Branch: refs/heads/master
Home: https://github.com/mono/mono
Compare: https://github.com/mono/mono/compare/f4dfcba64c4a...b4f562d82cba
Commit: b4f562d82cbab8485391f1e5b5294935b13559e0
Author: Zoltan Varga <[email protected]> (vargaz)
Date: 2013-11-19 14:24:46 GMT
URL: https://github.com/mono/mono/commit/b4f562d82cbab8485391f1e5b5294935b13559e0
[amd64] Remove the unused 'method' field from MonoLMF.
Changed paths:
M mono/mini/mini-amd64.c
M mono/mini/mini-amd64.h
M mono/mini/tramp-amd64.c
Modified: mono/mini/mini-amd64.c
===================================================================
@@ -3742,7 +3742,6 @@
/* These can't contain refs */
mini_gc_set_slot_type_from_fp (cfg, lmf_offset + G_STRUCT_OFFSET (MonoLMF, previous_lmf), SLOT_NOREF);
mini_gc_set_slot_type_from_fp (cfg, lmf_offset + G_STRUCT_OFFSET (MonoLMF, lmf_addr), SLOT_NOREF);
- mini_gc_set_slot_type_from_fp (cfg, lmf_offset + G_STRUCT_OFFSET (MonoLMF, method), SLOT_NOREF);
mini_gc_set_slot_type_from_fp (cfg, lmf_offset + G_STRUCT_OFFSET (MonoLMF, rip), SLOT_NOREF);
mini_gc_set_slot_type_from_fp (cfg, lmf_offset + G_STRUCT_OFFSET (MonoLMF, rsp), SLOT_NOREF);
Modified: mono/mini/mini-amd64.h
===================================================================
@@ -167,8 +167,6 @@ struct MonoLMF {
*/
gpointer previous_lmf;
gpointer lmf_addr;
- /* This is only set in trampoline LMF frames */
- MonoMethod *method;
#if defined(__default_codegen__) || defined(HOST_WIN32)
guint64 rip;
#elif defined(__native_client_codegen__)
Modified: mono/mini/tramp-amd64.c
===================================================================
@@ -599,13 +599,6 @@
amd64_mov_reg_reg (code, AMD64_R11, AMD64_RSP, sizeof(mgreg_t));
amd64_alu_reg_imm (code, X86_ADD, AMD64_R11, framesize + 16);
amd64_mov_membase_reg (code, AMD64_RBP, lmf_offset + G_STRUCT_OFFSET (MonoLMF, rsp), AMD64_R11, sizeof(mgreg_t));
- /* Save method */
- if (tramp_type == MONO_TRAMPOLINE_JIT || tramp_type == MONO_TRAMPOLINE_JUMP) {
- amd64_mov_reg_membase (code, AMD64_R11, AMD64_RBP, arg_offset, sizeof(gpointer));
- amd64_mov_membase_reg (code, AMD64_RBP, lmf_offset + G_STRUCT_OFFSET (MonoLMF, method), AMD64_R11, sizeof(gpointer));
- } else {
- amd64_mov_membase_imm (code, AMD64_RBP, lmf_offset + G_STRUCT_OFFSET (MonoLMF, method), 0, sizeof(gpointer));
- }
/* Save callee saved regs */
#ifdef TARGET_WIN32
amd64_mov_membase_reg (code, AMD64_RBP, lmf_offset + G_STRUCT_OFFSET (MonoLMF, rdi), AMD64_RDI, sizeof(mgreg_t));
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches