commit 2150d94b5a399dd7d52e1309da2e3bf80d1a5517
author Vladimir Marko <vmarko@google.com> Tue Jun 21 14:21:08 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 21 14:21:08 2016 +0000
tree 63ed6e7281cf5d0c00eec3393cc6e1554ab58e5a
parent b94b5706f0b8e2e1c7e1db22274f9f4bae0c4b5a
parent 2ebef63b07a13f6bddf8ce93cdd2271b2eafbfad

Merge "x86: Fix CFI info for FOUR_ARG_DOWNCALL."

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 2d7f664..0b6ddc1 100644
--- a/runtime/arch/x86/quick_entrypoints_x86.S
+++ b/runtime/arch/x86/quick_entrypoints_x86.S
@@ -82,7 +82,7 @@
     PUSH edi  // Save callee saves (ebx is saved/restored by the upcall)
     PUSH esi
     PUSH ebp
-    pushl REG_VAR(got_reg)  // Save got_reg
+    PUSH RAW_VAR(got_reg)  // Save got_reg
     subl MACRO_LITERAL(8), %esp  // Grow stack by 2 words.
     CFI_ADJUST_CFA_OFFSET(8)
 
@@ -97,6 +97,7 @@
     movl %esp, %fs:THREAD_TOP_QUICK_FRAME_OFFSET
     // Restore got_reg.
     movl 12(%esp), REG_VAR(got_reg)
+    CFI_RESTORE(RAW_VAR(got_reg))
 
     // Ugly compile-time check, but we only have the preprocessor.
     // Last +4: implicit return address pushed on stack when caller made call.