[x64] Recognize MOVSXBL.

TEST=mjsunit/asm
R=svenpanne@chromium.org

Review URL: https://codereview.chromium.org/728103007

Cr-Commit-Position: refs/heads/master@{#25386}

diff --git a/src/compiler/x64/code-generator-x64.cc b/src/compiler/x64/code-generator-x64.cc
index 8a61d371bffed90e013b224aa674927407e9b63a..e1eb92f12bb09436d57d519a771e40ffabacad46 100644 (file)
--- a/src/compiler/x64/code-generator-x64.cc
+++ b/src/compiler/x64/code-generator-x64.cc
@@ -483,7 +483,13 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) {
       __ cvtqsi2sd(i.OutputDoubleRegister(), kScratchRegister);
       break;
     case kX64Movsxbl:
-      __ movsxbl(i.OutputRegister(), i.MemoryOperand());
+      if (instr->addressing_mode() != kMode_None) {
+        __ movsxbl(i.OutputRegister(), i.MemoryOperand());
+      } else if (instr->InputAt(0)->IsRegister()) {
+        __ movsxbl(i.OutputRegister(), i.InputRegister(0));
+      } else {
+        __ movsxbl(i.OutputRegister(), i.InputOperand(0));
+      }
       __ AssertZeroExtended(i.OutputRegister());
       break;
     case kX64Movzxbl:

diff --git a/src/compiler/x64/instruction-selector-x64.cc b/src/compiler/x64/instruction-selector-x64.cc
index d89daf25306a89882a8c1c8a961f7509ceea3b10..ce7ce56616522b995dc51ce5ce3a1091556ad33c 100644 (file)
--- a/src/compiler/x64/instruction-selector-x64.cc
+++ b/src/compiler/x64/instruction-selector-x64.cc
@@ -353,6 +353,9 @@ void InstructionSelector::VisitWord32Sar(Node* node) {
     if (mleft.right().Is(16) && m.right().Is(16)) {
       Emit(kX64Movsxwl, g.DefineAsRegister(node), g.Use(mleft.left().node()));
       return;
+    } else if (mleft.right().Is(24) && m.right().Is(24)) {
+      Emit(kX64Movsxbl, g.DefineAsRegister(node), g.Use(mleft.left().node()));
+      return;
     }
   }
   VisitWord32Shift(this, node, kX64Sar32);

diff --git a/src/x64/assembler-x64.cc b/src/x64/assembler-x64.cc
index 0bcdf24d6f0f236900ca9be05b9ddacfba2e082d..13cbf8ca343c7e0d0bbb92aa5d3fc03cce2db273 100644 (file)
--- a/src/x64/assembler-x64.cc
+++ b/src/x64/assembler-x64.cc
@@ -1383,6 +1383,20 @@ void Assembler::movl(const Operand& dst, Label* src) {
 }
 
 
+void Assembler::movsxbl(Register dst, Register src) {
+  EnsureSpace ensure_space(this);
+  if (!src.is_byte_register()) {
+    // Register is not one of al, bl, cl, dl.  Its encoding needs REX.
+    emit_rex_32(dst, src);
+  } else {
+    emit_optional_rex_32(dst, src);
+  }
+  emit(0x0F);
+  emit(0xBE);
+  emit_modrm(dst, src);
+}
+
+
 void Assembler::movsxbl(Register dst, const Operand& src) {
   EnsureSpace ensure_space(this);
   emit_optional_rex_32(dst, src);

diff --git a/src/x64/assembler-x64.h b/src/x64/assembler-x64.h
index 8a070a656cd02304a7fc3ccdc38669ca8168ffcd..c9e319b9f16b70d057f13a461fb052d7bda127fe 100644 (file)
--- a/src/x64/assembler-x64.h
+++ b/src/x64/assembler-x64.h
@@ -731,6 +731,7 @@ class Assembler : public AssemblerBase {
   void movq(Register dst, int64_t value);
   void movq(Register dst, uint64_t value);
 
+  void movsxbl(Register dst, Register src);
   void movsxbl(Register dst, const Operand& src);
   void movsxbq(Register dst, const Operand& src);
   void movsxwl(Register dst, Register src);