commit 17088bbded68e35da8050a40206dfd3cbba9e6d2
author Vladimir Marko <vmarko@google.com> Mon Oct 28 13:55:34 2013 +0000
committer Vladimir Marko <vmarko@google.com> Mon Oct 28 15:25:03 2013 +0000
tree 5aed2063cbc772c05e74decfa90b68ad61c1605c
parent ba150c37d582eeeb8c11ba5245edc281cf31793c

Fix invalid DCHECK for movzx/movsx.

k86Movzx8RM and kMovsx8RM don't have to use eax/ecx/edx/ebx.
The incorrect check could fail for LoadBaseDisp() with
kUnsignedByte or kSignedByte.

Change-Id: I777f14cf372c7b211ad8c595d4a8a47533bdd0fc

compiler/dex/quick/x86/assemble_x86.cc

diff --git a/compiler/dex/quick/x86/assemble_x86.cc b/compiler/dex/quick/x86/assemble_x86.cc
index d66862b..92d58d5 100644
--- a/compiler/dex/quick/x86/assemble_x86.cc
+++ b/compiler/dex/quick/x86/assemble_x86.cc
@@ -596,7 +596,9 @@
     reg = reg & X86_FP_REG_MASK;
   }
   if (reg >= 4) {
-    DCHECK(strchr(entry->name, '8') == NULL) << entry->name << " " << static_cast<int>(reg)
+    DCHECK(strchr(entry->name, '8') == NULL ||
+           entry->opcode == kX86Movzx8RM || entry->opcode == kX86Movsx8RM)
+        << entry->name << " " << static_cast<int>(reg)
         << " in " << PrettyMethod(cu_->method_idx, *cu_->dex_file);
   }
   DCHECK_LT(reg, 8);