commit 78150c726559f0fe0828bcd4f320ba5c9c3e7cb0
author Dmitry Petrochenko <dmitry.petrochenko@intel.com> Mon May 05 20:21:51 2014 +0700
committer Dmitry Petrochenko <dmitry.petrochenko@intel.com> Wed May 14 01:29:59 2014 +0700
tree 5064923d9be2e721a2d3a423cf3633a1bf3412d8
parent cd6e04f738ee17b3e8ec51c1f14d636fa2a89a55

x86_64: Fix issues in entrypoints

Minor fixes, also avoiding duplicate restore
in art_quick_resolution_trampoline (084-class-init issue)

Change-Id: I9991accb286c3ea231054d5eeb6eefc229df80f6
Signed-off-by: Dmitry Petrochenko <dmitry.petrochenko@intel.com>

runtime/arch/x86_64/quick_entrypoints_x86_64.S

diff --git a/runtime/arch/x86_64/quick_entrypoints_x86_64.S b/runtime/arch/x86_64/quick_entrypoints_x86_64.S
index b886fb0..18a3709 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 @@
 
 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 @@
 
 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 @@
     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