| Index: src/mips/lithium-codegen-mips.cc
|
| diff --git a/src/mips/lithium-codegen-mips.cc b/src/mips/lithium-codegen-mips.cc
|
| index 2703bdbe1999c9dc6df06eff856571e805f02615..bc10164cc8905d0f9088320bb3e704be02fd0eed 100644
|
| --- a/src/mips/lithium-codegen-mips.cc
|
| +++ b/src/mips/lithium-codegen-mips.cc
|
| @@ -3109,10 +3109,7 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) {
|
| ? (element_size_shift - kSmiTagSize) : element_size_shift;
|
| int base_offset = instr->base_offset();
|
|
|
| - if (elements_kind == EXTERNAL_FLOAT32_ELEMENTS ||
|
| - elements_kind == FLOAT32_ELEMENTS ||
|
| - elements_kind == EXTERNAL_FLOAT64_ELEMENTS ||
|
| - elements_kind == FLOAT64_ELEMENTS) {
|
| + if (elements_kind == FLOAT32_ELEMENTS || elements_kind == FLOAT64_ELEMENTS) {
|
| FPURegister result = ToDoubleRegister(instr->result());
|
| if (key_is_constant) {
|
| __ Addu(scratch0(), external_pointer, constant_key << element_size_shift);
|
| @@ -3120,8 +3117,7 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) {
|
| __ sll(scratch0(), key, shift_size);
|
| __ Addu(scratch0(), scratch0(), external_pointer);
|
| }
|
| - if (elements_kind == EXTERNAL_FLOAT32_ELEMENTS ||
|
| - elements_kind == FLOAT32_ELEMENTS) {
|
| + if (elements_kind == FLOAT32_ELEMENTS) {
|
| __ lwc1(result, MemOperand(scratch0(), base_offset));
|
| __ cvt_d_s(result, result);
|
| } else { // i.e. elements_kind == EXTERNAL_DOUBLE_ELEMENTS
|
| @@ -3133,29 +3129,22 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) {
|
| key, external_pointer, key_is_constant, constant_key,
|
| element_size_shift, shift_size, base_offset);
|
| switch (elements_kind) {
|
| - case EXTERNAL_INT8_ELEMENTS:
|
| case INT8_ELEMENTS:
|
| __ lb(result, mem_operand);
|
| break;
|
| - case EXTERNAL_UINT8_CLAMPED_ELEMENTS:
|
| - case EXTERNAL_UINT8_ELEMENTS:
|
| case UINT8_ELEMENTS:
|
| case UINT8_CLAMPED_ELEMENTS:
|
| __ lbu(result, mem_operand);
|
| break;
|
| - case EXTERNAL_INT16_ELEMENTS:
|
| case INT16_ELEMENTS:
|
| __ lh(result, mem_operand);
|
| break;
|
| - case EXTERNAL_UINT16_ELEMENTS:
|
| case UINT16_ELEMENTS:
|
| __ lhu(result, mem_operand);
|
| break;
|
| - case EXTERNAL_INT32_ELEMENTS:
|
| case INT32_ELEMENTS:
|
| __ lw(result, mem_operand);
|
| break;
|
| - case EXTERNAL_UINT32_ELEMENTS:
|
| case UINT32_ELEMENTS:
|
| __ lw(result, mem_operand);
|
| if (!instr->hydrogen()->CheckFlag(HInstruction::kUint32)) {
|
| @@ -3165,8 +3154,6 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) {
|
| break;
|
| case FLOAT32_ELEMENTS:
|
| case FLOAT64_ELEMENTS:
|
| - case EXTERNAL_FLOAT32_ELEMENTS:
|
| - case EXTERNAL_FLOAT64_ELEMENTS:
|
| case FAST_DOUBLE_ELEMENTS:
|
| case FAST_ELEMENTS:
|
| case FAST_SMI_ELEMENTS:
|
| @@ -3278,7 +3265,7 @@ void LCodeGen::DoLoadKeyedFixedArray(LLoadKeyed* instr) {
|
|
|
|
|
| void LCodeGen::DoLoadKeyed(LLoadKeyed* instr) {
|
| - if (instr->is_typed_elements()) {
|
| + if (instr->is_fixed_typed_array()) {
|
| DoLoadKeyedExternalArray(instr);
|
| } else if (instr->hydrogen()->representation().IsDouble()) {
|
| DoLoadKeyedFixedDoubleArray(instr);
|
| @@ -4265,10 +4252,7 @@ void LCodeGen::DoStoreKeyedExternalArray(LStoreKeyed* instr) {
|
| ? (element_size_shift - kSmiTagSize) : element_size_shift;
|
| int base_offset = instr->base_offset();
|
|
|
| - if (elements_kind == EXTERNAL_FLOAT32_ELEMENTS ||
|
| - elements_kind == FLOAT32_ELEMENTS ||
|
| - elements_kind == EXTERNAL_FLOAT64_ELEMENTS ||
|
| - elements_kind == FLOAT64_ELEMENTS) {
|
| + if (elements_kind == FLOAT32_ELEMENTS || elements_kind == FLOAT64_ELEMENTS) {
|
| Register address = scratch0();
|
| FPURegister value(ToDoubleRegister(instr->value()));
|
| if (key_is_constant) {
|
| @@ -4283,8 +4267,7 @@ void LCodeGen::DoStoreKeyedExternalArray(LStoreKeyed* instr) {
|
| __ Addu(address, external_pointer, address);
|
| }
|
|
|
| - if (elements_kind == EXTERNAL_FLOAT32_ELEMENTS ||
|
| - elements_kind == FLOAT32_ELEMENTS) {
|
| + if (elements_kind == FLOAT32_ELEMENTS) {
|
| __ cvt_s_d(double_scratch0(), value);
|
| __ swc1(double_scratch0(), MemOperand(address, base_offset));
|
| } else { // Storing doubles, not floats.
|
| @@ -4297,30 +4280,21 @@ void LCodeGen::DoStoreKeyedExternalArray(LStoreKeyed* instr) {
|
| element_size_shift, shift_size,
|
| base_offset);
|
| switch (elements_kind) {
|
| - 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_INT16_ELEMENTS:
|
| - case EXTERNAL_UINT16_ELEMENTS:
|
| case INT16_ELEMENTS:
|
| case UINT16_ELEMENTS:
|
| __ sh(value, mem_operand);
|
| break;
|
| - 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_FLOAT32_ELEMENTS:
|
| - case EXTERNAL_FLOAT64_ELEMENTS:
|
| case FAST_DOUBLE_ELEMENTS:
|
| case FAST_ELEMENTS:
|
| case FAST_SMI_ELEMENTS:
|
| @@ -4434,7 +4408,7 @@ void LCodeGen::DoStoreKeyedFixedArray(LStoreKeyed* instr) {
|
|
|
| void LCodeGen::DoStoreKeyed(LStoreKeyed* instr) {
|
| // By cases: external, fast double
|
| - if (instr->is_typed_elements()) {
|
| + if (instr->is_fixed_typed_array()) {
|
| DoStoreKeyedExternalArray(instr);
|
| } else if (instr->hydrogen()->value()->representation().IsDouble()) {
|
| DoStoreKeyedFixedDoubleArray(instr);
|
|
|