commit e78d4e1a7066d2bc60d265eb27e78b336df941dd
author Serguei Katkov <serguei.i.katkov@intel.com> Mon Apr 07 10:14:08 2014 +0700
committer Serguei Katkov <serguei.i.katkov@intel.com> Thu Apr 10 16:40:07 2014 +0700
tree 14cfb5235f1c2c84d0d852622516cc6bc67456cb
parent 22839a631bb3591a1c0037c388d51a4f18b5fb5e

art_quick_unlock_object uses comparison incorrectly

art_quick_unlock_object incrrectly checks the thin lock condition.
The patch fixes this issue.

Change-Id: I9e2fcf89c9e9cb34aca72ed001672fd83cd53377
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>

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 336a0cc..fd2cfeb 100644
--- a/runtime/arch/x86/quick_entrypoints_x86.S
+++ b/runtime/arch/x86/quick_entrypoints_x86.S
@@ -561,8 +561,8 @@
     jz   .Lslow_unlock
     movl LOCK_WORD_OFFSET(%eax), %ecx     // ecx := lock word
     movl %fs:THREAD_ID_OFFSET, %edx       // edx := thread id
-    test %ecx, %ecx
-    jb   .Lslow_unlock                    // lock word contains a monitor
+    test LITERAL(0xC0000000), %ecx
+    jnz  .Lslow_unlock                    // lock word contains a monitor
     cmpw %cx, %dx                         // does the thread id match?
     jne  .Lslow_unlock
     cmpl LITERAL(65536), %ecx