From: Dmitry Petrochenko Date: Wed, 27 Aug 2014 11:45:56 +0000 (+0700) Subject: x86: Fix art_quick_instrumentation_exit X-Git-Tag: android-x86-7.1-r1~889^2~3164^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5324dc896b69fc14a24334f52169e2319b9b3842;p=android-x86%2Fart.git x86: Fix art_quick_instrumentation_exit Make sure that we use a move-immediate instead of a move-from-address (previously this was a load, whereas now we are interested in the address as a value). Change-Id: I4048c4a97abcc6524fe976bdc35b834d8f3bc592 Signed-off-by: Dmitry Petrochenko --- diff --git a/runtime/arch/x86/quick_entrypoints_x86.S b/runtime/arch/x86/quick_entrypoints_x86.S index 337e5fe89..24dc31848 100644 --- a/runtime/arch/x86/quick_entrypoints_x86.S +++ b/runtime/arch/x86/quick_entrypoints_x86.S @@ -1258,7 +1258,7 @@ DEFINE_FUNCTION art_quick_instrumentation_entry addl LITERAL(28), %esp // Pop arguments upto saved Method*. movl 28(%esp), %edi // Restore edi. movl %eax, 28(%esp) // Place code* over edi, just under return pc. - movl SYMBOL(art_quick_instrumentation_exit)@GOT(%ebx), %ebx + movl $SYMBOL(art_quick_instrumentation_exit), %ebx movl %ebx, 32(%esp) // Place instrumentation exit as return pc. movl (%esp), %eax // Restore eax.