| Index: src/ppc/lithium-codegen-ppc.cc
|
| diff --git a/src/ppc/lithium-codegen-ppc.cc b/src/ppc/lithium-codegen-ppc.cc
|
| index 8968f2fc09de4adfd3ab3363e5db9c18295844d7..7bc4d00237d88ff96af4937c9bd145f5d09bd4a8 100644
|
| --- a/src/ppc/lithium-codegen-ppc.cc
|
| +++ b/src/ppc/lithium-codegen-ppc.cc
|
| @@ -3293,10 +3293,7 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) {
|
| bool key_is_smi = instr->hydrogen()->key()->representation().IsSmi();
|
| 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) {
|
| DoubleRegister result = ToDoubleRegister(instr->result());
|
| if (key_is_constant) {
|
| __ Add(scratch0(), external_pointer, constant_key << element_size_shift,
|
| @@ -3305,8 +3302,7 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) {
|
| __ IndexToArrayOffset(r0, key, element_size_shift, key_is_smi);
|
| __ add(scratch0(), external_pointer, r0);
|
| }
|
| - if (elements_kind == EXTERNAL_FLOAT32_ELEMENTS ||
|
| - elements_kind == FLOAT32_ELEMENTS) {
|
| + if (elements_kind == FLOAT32_ELEMENTS) {
|
| __ lfs(result, MemOperand(scratch0(), base_offset));
|
| } else { // i.e. elements_kind == EXTERNAL_DOUBLE_ELEMENTS
|
| __ lfd(result, MemOperand(scratch0(), base_offset));
|
| @@ -3317,7 +3313,6 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) {
|
| PrepareKeyedOperand(key, external_pointer, key_is_constant, key_is_smi,
|
| constant_key, element_size_shift, base_offset);
|
| switch (elements_kind) {
|
| - case EXTERNAL_INT8_ELEMENTS:
|
| case INT8_ELEMENTS:
|
| if (key_is_constant) {
|
| __ LoadByte(result, mem_operand, r0);
|
| @@ -3326,8 +3321,6 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) {
|
| }
|
| __ extsb(result, result);
|
| break;
|
| - case EXTERNAL_UINT8_CLAMPED_ELEMENTS:
|
| - case EXTERNAL_UINT8_ELEMENTS:
|
| case UINT8_ELEMENTS:
|
| case UINT8_CLAMPED_ELEMENTS:
|
| if (key_is_constant) {
|
| @@ -3336,7 +3329,6 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) {
|
| __ lbzx(result, mem_operand);
|
| }
|
| break;
|
| - case EXTERNAL_INT16_ELEMENTS:
|
| case INT16_ELEMENTS:
|
| if (key_is_constant) {
|
| __ LoadHalfWordArith(result, mem_operand, r0);
|
| @@ -3344,7 +3336,6 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) {
|
| __ lhax(result, mem_operand);
|
| }
|
| break;
|
| - case EXTERNAL_UINT16_ELEMENTS:
|
| case UINT16_ELEMENTS:
|
| if (key_is_constant) {
|
| __ LoadHalfWord(result, mem_operand, r0);
|
| @@ -3352,7 +3343,6 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) {
|
| __ lhzx(result, mem_operand);
|
| }
|
| break;
|
| - case EXTERNAL_INT32_ELEMENTS:
|
| case INT32_ELEMENTS:
|
| if (key_is_constant) {
|
| __ LoadWordArith(result, mem_operand, r0);
|
| @@ -3360,7 +3350,6 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) {
|
| __ lwax(result, mem_operand);
|
| }
|
| break;
|
| - case EXTERNAL_UINT32_ELEMENTS:
|
| case UINT32_ELEMENTS:
|
| if (key_is_constant) {
|
| __ LoadWord(result, mem_operand, r0);
|
| @@ -3375,8 +3364,6 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) {
|
| break;
|
| case FLOAT32_ELEMENTS:
|
| case FLOAT64_ELEMENTS:
|
| - case EXTERNAL_FLOAT32_ELEMENTS:
|
| - case EXTERNAL_FLOAT64_ELEMENTS:
|
| case FAST_HOLEY_DOUBLE_ELEMENTS:
|
| case FAST_HOLEY_ELEMENTS:
|
| case FAST_HOLEY_SMI_ELEMENTS:
|
| @@ -3513,7 +3500,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);
|
| @@ -4560,10 +4547,7 @@ void LCodeGen::DoStoreKeyedExternalArray(LStoreKeyed* instr) {
|
| bool key_is_smi = instr->hydrogen()->key()->representation().IsSmi();
|
| 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();
|
| DoubleRegister value(ToDoubleRegister(instr->value()));
|
| if (key_is_constant) {
|
| @@ -4577,8 +4561,7 @@ void LCodeGen::DoStoreKeyedExternalArray(LStoreKeyed* instr) {
|
| __ IndexToArrayOffset(r0, key, element_size_shift, key_is_smi);
|
| __ add(address, external_pointer, r0);
|
| }
|
| - if (elements_kind == EXTERNAL_FLOAT32_ELEMENTS ||
|
| - elements_kind == FLOAT32_ELEMENTS) {
|
| + if (elements_kind == FLOAT32_ELEMENTS) {
|
| __ frsp(double_scratch0(), value);
|
| __ stfs(double_scratch0(), MemOperand(address, base_offset));
|
| } else { // Storing doubles, not floats.
|
| @@ -4590,9 +4573,6 @@ void LCodeGen::DoStoreKeyedExternalArray(LStoreKeyed* instr) {
|
| PrepareKeyedOperand(key, external_pointer, key_is_constant, key_is_smi,
|
| constant_key, element_size_shift, 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:
|
| @@ -4602,8 +4582,6 @@ void LCodeGen::DoStoreKeyedExternalArray(LStoreKeyed* instr) {
|
| __ stbx(value, mem_operand);
|
| }
|
| break;
|
| - case EXTERNAL_INT16_ELEMENTS:
|
| - case EXTERNAL_UINT16_ELEMENTS:
|
| case INT16_ELEMENTS:
|
| case UINT16_ELEMENTS:
|
| if (key_is_constant) {
|
| @@ -4612,8 +4590,6 @@ void LCodeGen::DoStoreKeyedExternalArray(LStoreKeyed* instr) {
|
| __ sthx(value, mem_operand);
|
| }
|
| break;
|
| - case EXTERNAL_INT32_ELEMENTS:
|
| - case EXTERNAL_UINT32_ELEMENTS:
|
| case INT32_ELEMENTS:
|
| case UINT32_ELEMENTS:
|
| if (key_is_constant) {
|
| @@ -4624,8 +4600,6 @@ void LCodeGen::DoStoreKeyedExternalArray(LStoreKeyed* 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:
|
| @@ -4743,7 +4717,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);
|
|
|