diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-06-18 10:17:26 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-06-18 15:45:40 -0700 |
| commit | dfc5db6a6deea37c217e29e810e757945dae8586 (patch) | |
| tree | f0ff1f7b67e8681cfa9dda09d5fc44f92872f966 /runtime/arch | |
| parent | bf1fa2ccb5e7409910b99dc46b616e44c66ade68 (diff) | |
| download | art-dfc5db6a6deea37c217e29e810e757945dae8586.tar.gz art-dfc5db6a6deea37c217e29e810e757945dae8586.tar.bz2 art-dfc5db6a6deea37c217e29e810e757945dae8586.zip | |
Fix moving GC bugs in proxy stub for X86/X86_64
Needed to restore the refs.
(cherry picked from commit 9346ff0cfad6344d0bf4eaa69362dbe1987ac054)
Bug: 21907554
Change-Id: I562906dff07dcaa78dfb39646ba9ab35a5f56c6c
Diffstat (limited to 'runtime/arch')
| -rw-r--r-- | runtime/arch/x86/quick_entrypoints_x86.S | 5 | ||||
| -rw-r--r-- | runtime/arch/x86_64/quick_entrypoints_x86_64.S | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/runtime/arch/x86/quick_entrypoints_x86.S b/runtime/arch/x86/quick_entrypoints_x86.S index 9cebb4ed55..17778e9610 100644 --- a/runtime/arch/x86/quick_entrypoints_x86.S +++ b/runtime/arch/x86/quick_entrypoints_x86.S @@ -1384,8 +1384,9 @@ DEFINE_FUNCTION art_quick_proxy_invoke_handler movd %eax, %xmm0 // place return value also into floating point return value movd %edx, %xmm1 punpckldq %xmm1, %xmm0 - addl LITERAL(76), %esp // pop arguments - CFI_ADJUST_CFA_OFFSET(-76) + addl LITERAL(16 + FRAME_SIZE_REFS_AND_ARGS_CALLEE_SAVE - FRAME_SIZE_REFS_ONLY_CALLEE_SAVE), %esp + CFI_ADJUST_CFA_OFFSET(-(16 + FRAME_SIZE_REFS_AND_ARGS_CALLEE_SAVE - FRAME_SIZE_REFS_ONLY_CALLEE_SAVE)) + RESTORE_REFS_ONLY_CALLEE_SAVE_FRAME RETURN_OR_DELIVER_PENDING_EXCEPTION // return or deliver exception END_FUNCTION art_quick_proxy_invoke_handler diff --git a/runtime/arch/x86_64/quick_entrypoints_x86_64.S b/runtime/arch/x86_64/quick_entrypoints_x86_64.S index bd199dbb82..62eebd46e6 100644 --- a/runtime/arch/x86_64/quick_entrypoints_x86_64.S +++ b/runtime/arch/x86_64/quick_entrypoints_x86_64.S @@ -1323,9 +1323,8 @@ DEFINE_FUNCTION art_quick_proxy_invoke_handler movq %gs:THREAD_SELF_OFFSET, %rdx // Pass Thread::Current(). movq %rsp, %rcx // Pass SP. call SYMBOL(artQuickProxyInvokeHandler) // (proxy method, receiver, Thread*, SP) + RESTORE_REFS_AND_ARGS_CALLEE_SAVE_FRAME movq %rax, %xmm0 // Copy return value in case of float returns. - addq LITERAL(168 + 4*8), %rsp // Pop arguments. - CFI_ADJUST_CFA_OFFSET(-168 - 4*8) RETURN_OR_DELIVER_PENDING_EXCEPTION END_FUNCTION art_quick_proxy_invoke_handler |