commit bf6b92a158053c98b15f4393abb3b86344ec9a20
author Andreas Gampe <agampe@google.com> Wed Mar 05 16:11:04 2014 -0800
committer Ian Rogers <irogers@google.com> Wed Mar 05 22:32:53 2014 -0800
tree 93a28d1e01b045a8df23fe5279601496b62af3dd
parent 359597ee8c0667a7d2c0b74dcbb0f90bb6059bae

Generic JNI implementation for x86_64

Starting implementation for generic JNI on x86_64. Frames are of
large static size (>4K) right now, should be compacted later. Passes
the whole of jni_compiler_test.

Change-Id: I88ac3e13a534afe7568d62a1ef97cb766e8260e4

runtime/arch/x86/quick_entrypoints_x86.S

diff --git a/runtime/arch/x86/quick_entrypoints_x86.S b/runtime/arch/x86/quick_entrypoints_x86.S
index b24bfd5..4bde8b7 100644
--- a/runtime/arch/x86/quick_entrypoints_x86.S
+++ b/runtime/arch/x86/quick_entrypoints_x86.S
@@ -44,10 +44,10 @@
 
 MACRO0(RESTORE_REF_ONLY_CALLEE_SAVE_FRAME)
     addl MACRO_LITERAL(16), %esp  // Unwind stack up to return address
+    CFI_ADJUST_CFA_OFFSET(-16)
     POP ebp  // Restore callee saves (ebx is saved/restored by the upcall)
     POP esi
     POP edi
-    CFI_ADJUST_CFA_OFFSET(-28)
 END_MACRO
 
     /*