Index: src/mips/lithium-codegen-mips.cc |
diff --git a/src/mips/lithium-codegen-mips.cc b/src/mips/lithium-codegen-mips.cc |
index dc1cd51c70a7ff3c84ae62eea6a34267f9cff66f..6885a9907995ef15c6361641727d5eec8db66c8c 100644 |
--- a/src/mips/lithium-codegen-mips.cc |
+++ b/src/mips/lithium-codegen-mips.cc |
@@ -3075,9 +3075,9 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* 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; |
@@ -3088,7 +3088,7 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) { |
__ sll(scratch0(), key, shift_size); |
__ Addu(scratch0(), scratch0(), external_pointer); |
} |
- if (elements_kind == EXTERNAL_FLOAT_ELEMENTS || |
+ if (elements_kind == EXTERNAL_FLOAT32_ELEMENTS || |
elements_kind == FLOAT32_ELEMENTS) { |
__ lwc1(result, MemOperand(scratch0(), base_offset)); |
__ cvt_d_s(result, result); |
@@ -3102,29 +3102,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: |
__ lb(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: |
__ lbu(result, mem_operand); |
break; |
- case EXTERNAL_SHORT_ELEMENTS: |
+ case EXTERNAL_INT16_ELEMENTS: |
case INT16_ELEMENTS: |
__ lh(result, mem_operand); |
break; |
- case EXTERNAL_UNSIGNED_SHORT_ELEMENTS: |
+ case EXTERNAL_UINT16_ELEMENTS: |
case UINT16_ELEMENTS: |
__ lhu(result, mem_operand); |
break; |
- case EXTERNAL_INT_ELEMENTS: |
+ case EXTERNAL_INT32_ELEMENTS: |
case INT32_ELEMENTS: |
__ lw(result, mem_operand); |
break; |
- case EXTERNAL_UNSIGNED_INT_ELEMENTS: |
+ case EXTERNAL_UINT32_ELEMENTS: |
case UINT32_ELEMENTS: |
__ lw(result, mem_operand); |
if (!instr->hydrogen()->CheckFlag(HInstruction::kUint32)) { |
@@ -3134,8 +3134,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_DOUBLE_ELEMENTS: |
case FAST_ELEMENTS: |
case FAST_SMI_ELEMENTS: |
@@ -4200,9 +4200,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; |
@@ -4220,7 +4220,7 @@ void LCodeGen::DoStoreKeyedExternalArray(LStoreKeyed* instr) { |
__ Addu(address, external_pointer, address); |
} |
- if (elements_kind == EXTERNAL_FLOAT_ELEMENTS || |
+ if (elements_kind == EXTERNAL_FLOAT32_ELEMENTS || |
elements_kind == FLOAT32_ELEMENTS) { |
__ cvt_s_d(double_scratch0(), value); |
__ swc1(double_scratch0(), MemOperand(address, base_offset)); |
@@ -4234,30 +4234,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: |
__ sb(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: |
__ sh(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: |
__ sw(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: |