Consolidated all the key store/load classes in the Hydrogen and Lithium

src/x64/lithium-codegen-x64.cc

Index: src/x64/lithium-codegen-x64.cc
diff --git a/src/x64/lithium-codegen-x64.cc b/src/x64/lithium-codegen-x64.cc
index b461e6290376d4b842640115cea9ec1bd7da2d90..42edf04845f4eee668f5eaf881188190d7262a70 100644
--- a/src/x64/lithium-codegen-x64.cc
+++ b/src/x64/lithium-codegen-x64.cc
@@ -2612,123 +2612,16 @@ void LCodeGen::DoAccessArgumentsAt(LAccessArgumentsAt* instr) {
 }
 
 
-void LCodeGen::DoLoadKeyedFastElement(LLoadKeyedFastElement* instr) {
-  Register result = ToRegister(instr->result());
-  LOperand* key = instr->key();
-  if (!key->IsConstantOperand()) {
-    Register key_reg = ToRegister(key);
-    // Even though the HLoad/StoreKeyedFastElement instructions force the input
-    // representation for the key to be an integer, the input gets replaced
-    // during bound check elimination with the index argument to the bounds
-    // check, which can be tagged, so that case must be handled here, too.
-    if (instr->hydrogen()->key()->representation().IsTagged()) {
-      __ SmiToInteger64(key_reg, key_reg);
-    } else if (instr->hydrogen()->IsDehoisted()) {
-      // Sign extend key because it could be a 32 bit negative value
-      // and the dehoisted address computation happens in 64 bits
-      __ movsxlq(key_reg, key_reg);
-    }
-  }
-
-  // Load the result.
-  __ movq(result,
-          BuildFastArrayOperand(instr->elements(),
-                                key,
-                                FAST_ELEMENTS,
-                                FixedArray::kHeaderSize - kHeapObjectTag,
-                                instr->additional_index()));
-
-  // Check for the hole value.
-  if (instr->hydrogen()->RequiresHoleCheck()) {
-    if (IsFastSmiElementsKind(instr->hydrogen()->elements_kind())) {
-      Condition smi = __ CheckSmi(result);
-      DeoptimizeIf(NegateCondition(smi), instr->environment());
-    } else {
-      __ CompareRoot(result, Heap::kTheHoleValueRootIndex);
-      DeoptimizeIf(equal, instr->environment());
-    }
-  }
-}
-
-
-void LCodeGen::DoLoadKeyedFastDoubleElement(
-    LLoadKeyedFastDoubleElement* instr) {
-  XMMRegister result(ToDoubleRegister(instr->result()));
-  LOperand* key = instr->key();
-  if (!key->IsConstantOperand()) {
-    Register key_reg = ToRegister(key);
-    // Even though the HLoad/StoreKeyedFastElement instructions force the input
-    // representation for the key to be an integer, the input gets replaced
-    // during bound check elimination with the index argument to the bounds
-    // check, which can be tagged, so that case must be handled here, too.
-    if (instr->hydrogen()->key()->representation().IsTagged()) {
-      __ SmiToInteger64(key_reg, key_reg);
-    } else if (instr->hydrogen()->IsDehoisted()) {
-      // Sign extend key because it could be a 32 bit negative value
-      // and the dehoisted address computation happens in 64 bits
-      __ movsxlq(key_reg, key_reg);
-    }
-  }
-
-  if (instr->hydrogen()->RequiresHoleCheck()) {
-    int offset = FixedDoubleArray::kHeaderSize - kHeapObjectTag +
-        sizeof(kHoleNanLower32);
-    Operand hole_check_operand = BuildFastArrayOperand(
-        instr->elements(),
-        key,
-        FAST_DOUBLE_ELEMENTS,
-        offset,
-        instr->additional_index());
-    __ cmpl(hole_check_operand, Immediate(kHoleNanUpper32));
-    DeoptimizeIf(equal, instr->environment());
-  }
-
-  Operand double_load_operand = BuildFastArrayOperand(
-      instr->elements(),
-      key,
-      FAST_DOUBLE_ELEMENTS,
-      FixedDoubleArray::kHeaderSize - kHeapObjectTag,
-      instr->additional_index());
-  __ movsd(result, double_load_operand);
-}
-
-
-Operand LCodeGen::BuildFastArrayOperand(
-    LOperand* elements_pointer,
-    LOperand* key,
-    ElementsKind elements_kind,
-    uint32_t offset,
-    uint32_t additional_index) {
-  Register elements_pointer_reg = ToRegister(elements_pointer);
-  int shift_size = ElementsKindToShiftSize(elements_kind);
-  if (key->IsConstantOperand()) {
-    int constant_value = ToInteger32(LConstantOperand::cast(key));
-    if (constant_value & 0xF0000000) {
-      Abort("array index constant value too big");
-    }
-    return Operand(elements_pointer_reg,
-                   ((constant_value + additional_index) << shift_size)
-                       + offset);
-  } else {
-    ScaleFactor scale_factor = static_cast<ScaleFactor>(shift_size);
-    return Operand(elements_pointer_reg,
-                   ToRegister(key),
-                   scale_factor,
-                   offset + (additional_index << shift_size));
-  }
-}
-
-
-void LCodeGen::DoLoadKeyedSpecializedArrayElement(
-    LLoadKeyedSpecializedArrayElement* instr) {
+void LCodeGen::DoLoadKeyedExternal(LLoadKeyed* instr) {
   ElementsKind elements_kind = instr->elements_kind();
   LOperand* key = instr->key();
   if (!key->IsConstantOperand()) {
     Register key_reg = ToRegister(key);
-    // Even though the HLoad/StoreKeyedFastElement instructions force the input
-    // representation for the key to be an integer, the input gets replaced
-    // during bound check elimination with the index argument to the bounds
-    // check, which can be tagged, so that case must be handled here, too.
+    // Even though the HLoad/StoreKeyed (in this case) instructions force
+    // the input representation for the key to be an integer, the input
+    // gets replaced during bound check elimination with the index argument
+    // to the bounds check, which can be tagged, so that case must be
+    // handled here, too.
     if (instr->hydrogen()->key()->representation().IsTagged()) {
       __ SmiToInteger64(key_reg, key_reg);
     } else if (instr->hydrogen()->IsDehoisted()) {
@@ -2790,6 +2683,114 @@ void LCodeGen::DoLoadKeyedSpecializedArrayElement(
         break;
     }
   }
+
+}
+
+void LCodeGen::DoLoadKeyed(LLoadKeyed* instr) {
+  if (instr->is_external()) {
+    DoLoadKeyedExternal(instr);
+  } else if (instr->hydrogen()->representation().IsDouble()) {
+    XMMRegister result(ToDoubleRegister(instr->result()));
+    LOperand* key = instr->key();
+    if (!key->IsConstantOperand()) {
+      Register key_reg = ToRegister(key);
+      // Even though the HLoad/StoreKeyed instructions force the input
+      // representation for the key to be an integer, the input gets replaced
+      // during bound check elimination with the index argument to the bounds
+      // check, which can be tagged, so that case must be handled here, too.
+      if (instr->hydrogen()->key()->representation().IsTagged()) {
+        __ SmiToInteger64(key_reg, key_reg);
+      } else if (instr->hydrogen()->IsDehoisted()) {
+        // Sign extend key because it could be a 32 bit negative value
+        // and the dehoisted address computation happens in 64 bits
+        __ movsxlq(key_reg, key_reg);
+      }
+    }
+
+    if (instr->hydrogen()->RequiresHoleCheck()) {
+      int offset = FixedDoubleArray::kHeaderSize - kHeapObjectTag +
+          sizeof(kHoleNanLower32);
+      Operand hole_check_operand = BuildFastArrayOperand(
+          instr->elements(),
+          key,
+          FAST_DOUBLE_ELEMENTS,
+          offset,
+          instr->additional_index());
+      __ cmpl(hole_check_operand, Immediate(kHoleNanUpper32));
+      DeoptimizeIf(equal, instr->environment());
+    }
+
+    Operand double_load_operand = BuildFastArrayOperand(
+        instr->elements(),
+        key,
+        FAST_DOUBLE_ELEMENTS,
+        FixedDoubleArray::kHeaderSize - kHeapObjectTag,
+        instr->additional_index());
+    __ movsd(result, double_load_operand);
+  } else {
+    Register result = ToRegister(instr->result());
+    LOperand* key = instr->key();
+    if (!key->IsConstantOperand()) {
+      Register key_reg = ToRegister(key);
+      // Even though the HLoad/StoreKeyedFastElement instructions force
+      // the input representation for the key to be an integer, the input
+      // gets replaced during bound check elimination with the index
+      // argument to the bounds check, which can be tagged, so that
+      // case must be handled here, too.
+      if (instr->hydrogen()->key()->representation().IsTagged()) {
+        __ SmiToInteger64(key_reg, key_reg);
+      } else if (instr->hydrogen()->IsDehoisted()) {
+        // Sign extend key because it could be a 32 bit negative value
+        // and the dehoisted address computation happens in 64 bits
+        __ movsxlq(key_reg, key_reg);
+      }
+    }
+
+    // Load the result.
+    __ movq(result,
+            BuildFastArrayOperand(instr->elements(),
+                                  key,
+                                  FAST_ELEMENTS,
+                                  FixedArray::kHeaderSize - kHeapObjectTag,
+                                  instr->additional_index()));
+
+    // Check for the hole value.
+    if (instr->hydrogen()->RequiresHoleCheck()) {
+      if (IsFastSmiElementsKind(instr->hydrogen()->elements_kind())) {
+        Condition smi = __ CheckSmi(result);
+        DeoptimizeIf(NegateCondition(smi), instr->environment());
+      } else {
+        __ CompareRoot(result, Heap::kTheHoleValueRootIndex);
+        DeoptimizeIf(equal, instr->environment());
+      }
+    }
+  }
+}
+
+
+Operand LCodeGen::BuildFastArrayOperand(
+    LOperand* elements_pointer,
+    LOperand* key,
+    ElementsKind elements_kind,
+    uint32_t offset,
+    uint32_t additional_index) {
+  Register elements_pointer_reg = ToRegister(elements_pointer);
+  int shift_size = ElementsKindToShiftSize(elements_kind);
+  if (key->IsConstantOperand()) {
+    int constant_value = ToInteger32(LConstantOperand::cast(key));
+    if (constant_value & 0xF0000000) {
+      Abort("array index constant value too big");
+    }
+    return Operand(elements_pointer_reg,
+                   ((constant_value + additional_index) << shift_size)
+                       + offset);
+  } else {
+    ScaleFactor scale_factor = static_cast<ScaleFactor>(shift_size);
+    return Operand(elements_pointer_reg,
+                   ToRegister(key),
+                   scale_factor,
+                   offset + (additional_index << shift_size));
+  }
 }
 
 
@@ -3665,70 +3666,6 @@ void LCodeGen::DoStoreNamedGeneric(LStoreNamedGeneric* instr) {
 }
 
 
-void LCodeGen::DoStoreKeyedSpecializedArrayElement(
-    LStoreKeyedSpecializedArrayElement* instr) {
-  ElementsKind elements_kind = instr->elements_kind();
-  LOperand* key = instr->key();
-  if (!key->IsConstantOperand()) {
-    Register key_reg = ToRegister(key);
-    // Even though the HLoad/StoreKeyedFastElement instructions force the input
-    // representation for the key to be an integer, the input gets replaced
-    // during bound check elimination with the index argument to the bounds
-    // check, which can be tagged, so that case must be handled here, too.
-    if (instr->hydrogen()->key()->representation().IsTagged()) {
-      __ SmiToInteger64(key_reg, key_reg);
-    } else if (instr->hydrogen()->IsDehoisted()) {
-      // Sign extend key because it could be a 32 bit negative value
-      // and the dehoisted address computation happens in 64 bits
-      __ movsxlq(key_reg, key_reg);
-    }
-  }
-  Operand operand(BuildFastArrayOperand(
-      instr->external_pointer(),
-      key,
-      elements_kind,
-      0,
-      instr->additional_index()));
-
-  if (elements_kind == EXTERNAL_FLOAT_ELEMENTS) {
-    XMMRegister value(ToDoubleRegister(instr->value()));
-    __ cvtsd2ss(value, value);
-    __ movss(operand, value);
-  } else if (elements_kind == EXTERNAL_DOUBLE_ELEMENTS) {
-    __ movsd(operand, ToDoubleRegister(instr->value()));
-  } else {
-    Register value(ToRegister(instr->value()));
-    switch (elements_kind) {
-      case EXTERNAL_PIXEL_ELEMENTS:
-      case EXTERNAL_BYTE_ELEMENTS:
-      case EXTERNAL_UNSIGNED_BYTE_ELEMENTS:
-        __ movb(operand, value);
-        break;
-      case EXTERNAL_SHORT_ELEMENTS:
-      case EXTERNAL_UNSIGNED_SHORT_ELEMENTS:
-        __ movw(operand, value);
-        break;
-      case EXTERNAL_INT_ELEMENTS:
-      case EXTERNAL_UNSIGNED_INT_ELEMENTS:
-        __ movl(operand, value);
-        break;
-      case EXTERNAL_FLOAT_ELEMENTS:
-      case EXTERNAL_DOUBLE_ELEMENTS:
-      case FAST_ELEMENTS:
-      case FAST_SMI_ELEMENTS:
-      case FAST_DOUBLE_ELEMENTS:
-      case FAST_HOLEY_ELEMENTS:
-      case FAST_HOLEY_SMI_ELEMENTS:
-      case FAST_HOLEY_DOUBLE_ELEMENTS:
-      case DICTIONARY_ELEMENTS:
-      case NON_STRICT_ARGUMENTS_ELEMENTS:
-        UNREACHABLE();
-        break;
-    }
-  }
-}
-
-
 void LCodeGen::DeoptIfTaggedButNotSmi(LEnvironment* environment,
                                       HValue* value,
                                       LOperand* operand) {
@@ -3789,16 +3726,16 @@ void LCodeGen::DoBoundsCheck(LBoundsCheck* instr) {
 }
 
 
-void LCodeGen::DoStoreKeyedFastElement(LStoreKeyedFastElement* instr) {
-  Register value = ToRegister(instr->value());
-  Register elements = ToRegister(instr->object());
+void LCodeGen::DoStoreKeyedExternal(LStoreKeyed* instr) {
+  ElementsKind elements_kind = instr->elements_kind();
   LOperand* key = instr->key();
   if (!key->IsConstantOperand()) {
     Register key_reg = ToRegister(key);
-    // Even though the HLoad/StoreKeyedFastElement instructions force the input
-    // representation for the key to be an integer, the input gets replaced
-    // during bound check elimination with the index argument to the bounds
-    // check, which can be tagged, so that case must be handled here, too.
+    // Even though the HLoad/StoreKeyedFastElement instructions force
+    // the input representation for the key to be an integer, the input
+    // gets replaced during bound check elimination with the index
+    // argument to the bounds check, which can be tagged, so that case
+    // must be handled here, too.
     if (instr->hydrogen()->key()->representation().IsTagged()) {
       __ SmiToInteger64(key_reg, key_reg);
     } else if (instr->hydrogen()->IsDehoisted()) {
@@ -3807,77 +3744,144 @@ void LCodeGen::DoStoreKeyedFastElement(LStoreKeyedFastElement* instr) {
       __ movsxlq(key_reg, key_reg);
     }
   }
+  Operand operand(BuildFastArrayOperand(
+      instr->external_pointer(),
+      key,
+      elements_kind,
+      0,
+      instr->additional_index()));
 
-  Operand operand =
-      BuildFastArrayOperand(instr->object(),
-                            key,
-                            FAST_ELEMENTS,
-                            FixedArray::kHeaderSize - kHeapObjectTag,
-                            instr->additional_index());
-
-  if (instr->hydrogen()->NeedsWriteBarrier()) {
-    ASSERT(!instr->key()->IsConstantOperand());
-    HType type = instr->hydrogen()->value()->type();
-    SmiCheck check_needed =
-        type.IsHeapObject() ? OMIT_SMI_CHECK : INLINE_SMI_CHECK;
-    // Compute address of modified element and store it into key register.
-    Register key_reg(ToRegister(key));
-    __ lea(key_reg, operand);
-    __ movq(Operand(key_reg, 0), value);
-    __ RecordWrite(elements,
-                   key_reg,
-                   value,
-                   kSaveFPRegs,
-                   EMIT_REMEMBERED_SET,
-                   check_needed);
+  if (elements_kind == EXTERNAL_FLOAT_ELEMENTS) {
+    XMMRegister value(ToDoubleRegister(instr->value()));
+    __ cvtsd2ss(value, value);
+    __ movss(operand, value);
+  } else if (elements_kind == EXTERNAL_DOUBLE_ELEMENTS) {
+    __ movsd(operand, ToDoubleRegister(instr->value()));
   } else {
-    __ movq(operand, value);
+    Register value(ToRegister(instr->value()));
+    switch (elements_kind) {
+      case EXTERNAL_PIXEL_ELEMENTS:
+      case EXTERNAL_BYTE_ELEMENTS:
+      case EXTERNAL_UNSIGNED_BYTE_ELEMENTS:
+        __ movb(operand, value);
+        break;
+      case EXTERNAL_SHORT_ELEMENTS:
+      case EXTERNAL_UNSIGNED_SHORT_ELEMENTS:
+        __ movw(operand, value);
+        break;
+      case EXTERNAL_INT_ELEMENTS:
+      case EXTERNAL_UNSIGNED_INT_ELEMENTS:
+        __ movl(operand, value);
+        break;
+      case EXTERNAL_FLOAT_ELEMENTS:
+      case EXTERNAL_DOUBLE_ELEMENTS:
+      case FAST_ELEMENTS:
+      case FAST_SMI_ELEMENTS:
+      case FAST_DOUBLE_ELEMENTS:
+      case FAST_HOLEY_ELEMENTS:
+      case FAST_HOLEY_SMI_ELEMENTS:
+      case FAST_HOLEY_DOUBLE_ELEMENTS:
+      case DICTIONARY_ELEMENTS:
+      case NON_STRICT_ARGUMENTS_ELEMENTS:
+        UNREACHABLE();
+        break;
+    }
   }
 }
 
 
-void LCodeGen::DoStoreKeyedFastDoubleElement(
-    LStoreKeyedFastDoubleElement* instr) {
-  XMMRegister value = ToDoubleRegister(instr->value());
-  LOperand* key = instr->key();
-  if (!key->IsConstantOperand()) {
-    Register key_reg = ToRegister(key);
-    // Even though the HLoad/StoreKeyedFastElement instructions force the input
-    // representation for the key to be an integer, the input gets replaced
-    // during bound check elimination with the index argument to the bounds
-    // check, which can be tagged, so that case must be handled here, too.
-    if (instr->hydrogen()->key()->representation().IsTagged()) {
-      __ SmiToInteger64(key_reg, key_reg);
-    } else if (instr->hydrogen()->IsDehoisted()) {
-      // Sign extend key because it could be a 32 bit negative value
-      // and the dehoisted address computation happens in 64 bits
-      __ movsxlq(key_reg, key_reg);
+void LCodeGen::DoStoreKeyed(LStoreKeyed* instr) {
+  if (instr->is_external()) {
+    DoStoreKeyedExternal(instr);
+  } else if (instr->hydrogen()->value()->representation().IsDouble()) {
+    XMMRegister value = ToDoubleRegister(instr->value());
+    LOperand* key = instr->key();
+    if (!key->IsConstantOperand()) {
+      Register key_reg = ToRegister(key);
+      // Even though the HLoad/StoreKeyedFastElement instructions force
+      // the input representation for the key to be an integer, the
+      // input gets replaced during bound check elimination with the index
+      // argument to the bounds check, which can be tagged, so that case
+      // must be handled here, too.
+      if (instr->hydrogen()->key()->representation().IsTagged()) {
+        __ SmiToInteger64(key_reg, key_reg);
+      } else if (instr->hydrogen()->IsDehoisted()) {
+        // Sign extend key because it could be a 32 bit negative value
+        // and the dehoisted address computation happens in 64 bits
+        __ movsxlq(key_reg, key_reg);
+      }
     }
-  }
 
-  if (instr->NeedsCanonicalization()) {
-    Label have_value;
+    if (instr->NeedsCanonicalization()) {
+      Label have_value;
 
-    __ ucomisd(value, value);
-    __ j(parity_odd, &have_value);  // NaN.
+      __ ucomisd(value, value);
+      __ j(parity_odd, &have_value);  // NaN.
 
-    __ Set(kScratchRegister, BitCast<uint64_t>(
-        FixedDoubleArray::canonical_not_the_hole_nan_as_double()));
-    __ movq(value, kScratchRegister);
+      __ Set(kScratchRegister, BitCast<uint64_t>(
+          FixedDoubleArray::canonical_not_the_hole_nan_as_double()));
+      __ movq(value, kScratchRegister);
 
-    __ bind(&have_value);
-  }
+      __ bind(&have_value);
+    }
 
-  Operand double_store_operand = BuildFastArrayOperand(
-      instr->elements(),
-      key,
-      FAST_DOUBLE_ELEMENTS,
-      FixedDoubleArray::kHeaderSize - kHeapObjectTag,
-      instr->additional_index());
+    Operand double_store_operand = BuildFastArrayOperand(
+        instr->object(),
+        key,
+        FAST_DOUBLE_ELEMENTS,
+        FixedDoubleArray::kHeaderSize - kHeapObjectTag,
+        instr->additional_index());
+
+    __ movsd(double_store_operand, value);
+  } else {
+    Register value = ToRegister(instr->value());
+    Register elements = ToRegister(instr->object());
+    LOperand* key = instr->key();
+    if (!key->IsConstantOperand()) {
+      Register key_reg = ToRegister(key);
+      // Even though the HLoad/StoreKeyedFastElement instructions force
+      // the input representation for the key to be an integer, the
+      // input gets replaced during bound check elimination with the index
+      // argument to the bounds check, which can be tagged, so that case
+      // must be handled here, too.
+      if (instr->hydrogen()->key()->representation().IsTagged()) {
+        __ SmiToInteger64(key_reg, key_reg);
+      } else if (instr->hydrogen()->IsDehoisted()) {
+        // Sign extend key because it could be a 32 bit negative value
+        // and the dehoisted address computation happens in 64 bits
+        __ movsxlq(key_reg, key_reg);
+      }
+    }
 
-  __ movsd(double_store_operand, value);
+    Operand operand =
+        BuildFastArrayOperand(instr->object(),
+                              key,
+                              FAST_ELEMENTS,
+                              FixedArray::kHeaderSize - kHeapObjectTag,
+                              instr->additional_index());
+
+    if (instr->hydrogen()->NeedsWriteBarrier()) {
+      ASSERT(!instr->key()->IsConstantOperand());
+      HType type = instr->hydrogen()->value()->type();
+      SmiCheck check_needed =
+          type.IsHeapObject() ? OMIT_SMI_CHECK : INLINE_SMI_CHECK;
+      // Compute address of modified element and store it into key register.
+      Register key_reg(ToRegister(key));
+      __ lea(key_reg, operand);
+      __ movq(Operand(key_reg, 0), value);
+      __ RecordWrite(elements,
+                     key_reg,
+                     value,
+                     kSaveFPRegs,
+                     EMIT_REMEMBERED_SET,
+                     check_needed);
+    } else {
+      __ movq(operand, value);
+    }
+  }
 }
 
+
 void LCodeGen::DoStoreKeyedGeneric(LStoreKeyedGeneric* instr) {
   ASSERT(ToRegister(instr->object()).is(rdx));
   ASSERT(ToRegister(instr->key()).is(rcx));