commit f551d1bd8da75d14fd858e4a7c9b60612aec5430
author Sebastien Hertz <shertz@google.com> Thu Feb 19 10:30:48 2015 +0100
committer Sebastien Hertz <shertz@google.com> Thu Feb 19 10:31:45 2015 +0100
tree 2ac3a2eb39614931e1d1534e8f14b8452cf09b84
parent de7402182c1b020dec43aa38d62fa369a4ef52b8

Fix art_quick_instrumentation_entry for x86

Fixes the stack offset used to restore edx.

Bug: 19402798
Change-Id: Ic3636cd362684564196997c4a3b3bebdc1be9a4e

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 beacd49..c2acdd1 100644
--- a/runtime/arch/x86/quick_entrypoints_x86.S
+++ b/runtime/arch/x86/quick_entrypoints_x86.S
@@ -1462,7 +1462,7 @@
 
     // Restore GPRs.
     movl 40(%esp), %ecx           // Restore ecx.
-    movl 48(%esp), %edx           // Restore edx.
+    movl 44(%esp), %edx           // Restore edx.
     movl 48(%esp), %ebx           // Restore ebx.
     movl 52(%esp), %ebp           // Restore ebp.
     movl 56(%esp), %esi           // Restore esi.