Index: src/arm/lithium-codegen-arm.cc |
diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc |
index 47be6cdf613dd15449a93095ebe34af3abd9de50..267ce38a749edf100ca2e9ea4d57b198293fc765 100644 |
--- a/src/arm/lithium-codegen-arm.cc |
+++ b/src/arm/lithium-codegen-arm.cc |
@@ -3213,9 +3213,9 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) { |
: 0; |
- if (elements_kind == EXTERNAL_FLOAT_ELEMENTS || |
+ if (elements_kind == EXTERNAL_FLOAT32_ELEMENTS || |
elements_kind == FLOAT32_ELEMENTS || |
- elements_kind == EXTERNAL_DOUBLE_ELEMENTS || |
+ elements_kind == EXTERNAL_FLOAT64_ELEMENTS || |
elements_kind == FLOAT64_ELEMENTS) { |
int base_offset = |
(instr->additional_index() << element_size_shift) + additional_offset; |
@@ -3224,7 +3224,7 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) { |
? Operand(constant_key << element_size_shift) |
: Operand(key, LSL, shift_size); |
__ add(scratch0(), external_pointer, operand); |
- if (elements_kind == EXTERNAL_FLOAT_ELEMENTS || |
+ if (elements_kind == EXTERNAL_FLOAT32_ELEMENTS || |
elements_kind == FLOAT32_ELEMENTS) { |
__ vldr(double_scratch0().low(), scratch0(), base_offset); |
__ vcvt_f64_f32(result, double_scratch0().low()); |
@@ -3238,29 +3238,29 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) { |
element_size_shift, shift_size, |
instr->additional_index(), additional_offset); |
switch (elements_kind) { |
- case EXTERNAL_BYTE_ELEMENTS: |
+ case EXTERNAL_INT8_ELEMENTS: |
case INT8_ELEMENTS: |
__ ldrsb(result, mem_operand); |
break; |
- case EXTERNAL_PIXEL_ELEMENTS: |
- case EXTERNAL_UNSIGNED_BYTE_ELEMENTS: |
+ case EXTERNAL_UINT8_CLAMPED_ELEMENTS: |
+ case EXTERNAL_UINT8_ELEMENTS: |
case UINT8_ELEMENTS: |
case UINT8_CLAMPED_ELEMENTS: |
__ ldrb(result, mem_operand); |
break; |
- case EXTERNAL_SHORT_ELEMENTS: |
+ case EXTERNAL_INT16_ELEMENTS: |
case INT16_ELEMENTS: |
__ ldrsh(result, mem_operand); |
break; |
- case EXTERNAL_UNSIGNED_SHORT_ELEMENTS: |
+ case EXTERNAL_UINT16_ELEMENTS: |
case UINT16_ELEMENTS: |
__ ldrh(result, mem_operand); |
break; |
- case EXTERNAL_INT_ELEMENTS: |
+ case EXTERNAL_INT32_ELEMENTS: |
case INT32_ELEMENTS: |
__ ldr(result, mem_operand); |
break; |
- case EXTERNAL_UNSIGNED_INT_ELEMENTS: |
+ case EXTERNAL_UINT32_ELEMENTS: |
case UINT32_ELEMENTS: |
__ ldr(result, mem_operand); |
if (!instr->hydrogen()->CheckFlag(HInstruction::kUint32)) { |
@@ -3270,8 +3270,8 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) { |
break; |
case FLOAT32_ELEMENTS: |
case FLOAT64_ELEMENTS: |
- case EXTERNAL_FLOAT_ELEMENTS: |
- case EXTERNAL_DOUBLE_ELEMENTS: |
+ case EXTERNAL_FLOAT32_ELEMENTS: |
+ case EXTERNAL_FLOAT64_ELEMENTS: |
case FAST_HOLEY_DOUBLE_ELEMENTS: |
case FAST_HOLEY_ELEMENTS: |
case FAST_HOLEY_SMI_ELEMENTS: |
@@ -4275,9 +4275,9 @@ void LCodeGen::DoStoreKeyedExternalArray(LStoreKeyed* instr) { |
? FixedTypedArrayBase::kDataOffset - kHeapObjectTag |
: 0; |
- if (elements_kind == EXTERNAL_FLOAT_ELEMENTS || |
+ if (elements_kind == EXTERNAL_FLOAT32_ELEMENTS || |
elements_kind == FLOAT32_ELEMENTS || |
- elements_kind == EXTERNAL_DOUBLE_ELEMENTS || |
+ elements_kind == EXTERNAL_FLOAT64_ELEMENTS || |
elements_kind == FLOAT64_ELEMENTS) { |
int base_offset = |
(instr->additional_index() << element_size_shift) + additional_offset; |
@@ -4293,7 +4293,7 @@ void LCodeGen::DoStoreKeyedExternalArray(LStoreKeyed* instr) { |
} else { |
__ add(address, external_pointer, Operand(key, LSL, shift_size)); |
} |
- if (elements_kind == EXTERNAL_FLOAT_ELEMENTS || |
+ if (elements_kind == EXTERNAL_FLOAT32_ELEMENTS || |
elements_kind == FLOAT32_ELEMENTS) { |
__ vcvt_f32_f64(double_scratch0().low(), value); |
__ vstr(double_scratch0().low(), address, base_offset); |
@@ -4307,30 +4307,30 @@ void LCodeGen::DoStoreKeyedExternalArray(LStoreKeyed* instr) { |
element_size_shift, shift_size, |
instr->additional_index(), additional_offset); |
switch (elements_kind) { |
- case EXTERNAL_PIXEL_ELEMENTS: |
- case EXTERNAL_BYTE_ELEMENTS: |
- case EXTERNAL_UNSIGNED_BYTE_ELEMENTS: |
+ case EXTERNAL_UINT8_CLAMPED_ELEMENTS: |
+ case EXTERNAL_INT8_ELEMENTS: |
+ case EXTERNAL_UINT8_ELEMENTS: |
case UINT8_ELEMENTS: |
case UINT8_CLAMPED_ELEMENTS: |
case INT8_ELEMENTS: |
__ strb(value, mem_operand); |
break; |
- case EXTERNAL_SHORT_ELEMENTS: |
- case EXTERNAL_UNSIGNED_SHORT_ELEMENTS: |
+ case EXTERNAL_INT16_ELEMENTS: |
+ case EXTERNAL_UINT16_ELEMENTS: |
case INT16_ELEMENTS: |
case UINT16_ELEMENTS: |
__ strh(value, mem_operand); |
break; |
- case EXTERNAL_INT_ELEMENTS: |
- case EXTERNAL_UNSIGNED_INT_ELEMENTS: |
+ case EXTERNAL_INT32_ELEMENTS: |
+ case EXTERNAL_UINT32_ELEMENTS: |
case INT32_ELEMENTS: |
case UINT32_ELEMENTS: |
__ str(value, mem_operand); |
break; |
case FLOAT32_ELEMENTS: |
case FLOAT64_ELEMENTS: |
- case EXTERNAL_FLOAT_ELEMENTS: |
- case EXTERNAL_DOUBLE_ELEMENTS: |
+ case EXTERNAL_FLOAT32_ELEMENTS: |
+ case EXTERNAL_FLOAT64_ELEMENTS: |
case FAST_DOUBLE_ELEMENTS: |
case FAST_ELEMENTS: |
case FAST_SMI_ELEMENTS: |