diff options
| author | Sebastien Hertz <shertz@google.com> | 2015-02-19 09:59:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-19 09:59:55 +0000 |
| commit | cf3fb94a90d74361b13e7bae5aa6e0e4ae58479d (patch) | |
| tree | 6c4572cfe287e507755125298306fe997053d69b | |
| parent | 1b472546657d31d38883373d8340d1441281a6a5 (diff) | |
| parent | f551d1bd8da75d14fd858e4a7c9b60612aec5430 (diff) | |
| download | android_art-cf3fb94a90d74361b13e7bae5aa6e0e4ae58479d.tar.gz android_art-cf3fb94a90d74361b13e7bae5aa6e0e4ae58479d.tar.bz2 android_art-cf3fb94a90d74361b13e7bae5aa6e0e4ae58479d.zip | |
Merge "Fix art_quick_instrumentation_entry for x86"
| -rw-r--r-- | runtime/arch/x86/quick_entrypoints_x86.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/arch/x86/quick_entrypoints_x86.S b/runtime/arch/x86/quick_entrypoints_x86.S index beacd494ca..c2acdd1668 100644 --- a/runtime/arch/x86/quick_entrypoints_x86.S +++ b/runtime/arch/x86/quick_entrypoints_x86.S @@ -1462,7 +1462,7 @@ DEFINE_FUNCTION art_quick_instrumentation_entry // 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. |