diff options
| author | Andreas Gampe <agampe@google.com> | 2014-05-13 18:31:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-13 18:31:33 +0000 |
| commit | a47dcbf4bc226b5bbf30618fc052e7c79672af7a (patch) | |
| tree | 265ce7e9532843439ae49b652818150536933763 /runtime/arch/x86_64 | |
| parent | 6fb66a2bc4e1c0b7931101153e58714991237af7 (diff) | |
| parent | 78150c726559f0fe0828bcd4f320ba5c9c3e7cb0 (diff) | |
| download | art-a47dcbf4bc226b5bbf30618fc052e7c79672af7a.tar.gz art-a47dcbf4bc226b5bbf30618fc052e7c79672af7a.tar.bz2 art-a47dcbf4bc226b5bbf30618fc052e7c79672af7a.zip | |
Merge "x86_64: Fix issues in entrypoints"
Diffstat (limited to 'runtime/arch/x86_64')
| -rw-r--r-- | runtime/arch/x86_64/quick_entrypoints_x86_64.S | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/runtime/arch/x86_64/quick_entrypoints_x86_64.S b/runtime/arch/x86_64/quick_entrypoints_x86_64.S index b886fb0f91..18a37096a4 100644 --- a/runtime/arch/x86_64/quick_entrypoints_x86_64.S +++ b/runtime/arch/x86_64/quick_entrypoints_x86_64.S @@ -476,7 +476,6 @@ END_FUNCTION art_quick_invoke_static_stub MACRO3(NO_ARG_DOWNCALL, c_name, cxx_name, return_macro) DEFINE_FUNCTION VAR(c_name, 0) - UNTESTED SETUP_REF_ONLY_CALLEE_SAVE_FRAME // save ref containing registers for GC // Outgoing argument set up movq %rsp, %rsi // pass SP @@ -489,7 +488,6 @@ END_MACRO MACRO3(ONE_ARG_DOWNCALL, c_name, cxx_name, return_macro) DEFINE_FUNCTION VAR(c_name, 0) - UNTESTED SETUP_REF_ONLY_CALLEE_SAVE_FRAME // save ref containing registers for GC // Outgoing argument set up movq %rsp, %rdx // pass SP @@ -995,7 +993,6 @@ DEFINE_FUNCTION art_quick_resolution_trampoline jz 1f jmp *%r10 // Tail call into method. 1: - RESTORE_REF_AND_ARGS_CALLEE_SAVE_FRAME DELIVER_PENDING_EXCEPTION END_FUNCTION art_quick_resolution_trampoline |