| Index: src/arm/lithium-codegen-arm.cc
|
| diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc
|
| index 5fe81d25538ee2ec13ceb15d6342cd3c4083943d..97881ba1a2d3c7dca6b9c4b15cc456dbecbf414a 100644
|
| --- a/src/arm/lithium-codegen-arm.cc
|
| +++ b/src/arm/lithium-codegen-arm.cc
|
| @@ -3190,13 +3190,17 @@
|
| ? (element_size_shift - kSmiTagSize) : element_size_shift;
|
| int base_offset = instr->base_offset();
|
|
|
| - if (elements_kind == FLOAT32_ELEMENTS || elements_kind == FLOAT64_ELEMENTS) {
|
| + if (elements_kind == EXTERNAL_FLOAT32_ELEMENTS ||
|
| + elements_kind == FLOAT32_ELEMENTS ||
|
| + elements_kind == EXTERNAL_FLOAT64_ELEMENTS ||
|
| + elements_kind == FLOAT64_ELEMENTS) {
|
| DwVfpRegister result = ToDoubleRegister(instr->result());
|
| Operand operand = key_is_constant
|
| ? Operand(constant_key << element_size_shift)
|
| : Operand(key, LSL, shift_size);
|
| __ add(scratch0(), external_pointer, operand);
|
| - if (elements_kind == FLOAT32_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());
|
| } else { // i.e. elements_kind == EXTERNAL_DOUBLE_ELEMENTS
|
| @@ -3208,22 +3212,29 @@
|
| 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:
|
| __ ldrsb(result, mem_operand);
|
| break;
|
| + case EXTERNAL_UINT8_CLAMPED_ELEMENTS:
|
| + case EXTERNAL_UINT8_ELEMENTS:
|
| case UINT8_ELEMENTS:
|
| case UINT8_CLAMPED_ELEMENTS:
|
| __ ldrb(result, mem_operand);
|
| break;
|
| + case EXTERNAL_INT16_ELEMENTS:
|
| case INT16_ELEMENTS:
|
| __ ldrsh(result, mem_operand);
|
| break;
|
| + case EXTERNAL_UINT16_ELEMENTS:
|
| case UINT16_ELEMENTS:
|
| __ ldrh(result, mem_operand);
|
| break;
|
| + case EXTERNAL_INT32_ELEMENTS:
|
| case INT32_ELEMENTS:
|
| __ ldr(result, mem_operand);
|
| break;
|
| + case EXTERNAL_UINT32_ELEMENTS:
|
| case UINT32_ELEMENTS:
|
| __ ldr(result, mem_operand);
|
| if (!instr->hydrogen()->CheckFlag(HInstruction::kUint32)) {
|
| @@ -3233,6 +3244,8 @@
|
| 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:
|
| @@ -3342,7 +3355,7 @@
|
|
|
|
|
| void LCodeGen::DoLoadKeyed(LLoadKeyed* instr) {
|
| - if (instr->is_fixed_typed_array()) {
|
| + if (instr->is_typed_elements()) {
|
| DoLoadKeyedExternalArray(instr);
|
| } else if (instr->hydrogen()->representation().IsDouble()) {
|
| DoLoadKeyedFixedDoubleArray(instr);
|
| @@ -4304,7 +4317,10 @@
|
| ? (element_size_shift - kSmiTagSize) : element_size_shift;
|
| int base_offset = instr->base_offset();
|
|
|
| - if (elements_kind == FLOAT32_ELEMENTS || elements_kind == FLOAT64_ELEMENTS) {
|
| + if (elements_kind == EXTERNAL_FLOAT32_ELEMENTS ||
|
| + elements_kind == FLOAT32_ELEMENTS ||
|
| + elements_kind == EXTERNAL_FLOAT64_ELEMENTS ||
|
| + elements_kind == FLOAT64_ELEMENTS) {
|
| Register address = scratch0();
|
| DwVfpRegister value(ToDoubleRegister(instr->value()));
|
| if (key_is_constant) {
|
| @@ -4317,7 +4333,8 @@
|
| } else {
|
| __ add(address, external_pointer, Operand(key, LSL, shift_size));
|
| }
|
| - if (elements_kind == FLOAT32_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);
|
| } else { // Storing doubles, not floats.
|
| @@ -4330,21 +4347,30 @@
|
| 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:
|
| __ strb(value, mem_operand);
|
| break;
|
| + case EXTERNAL_INT16_ELEMENTS:
|
| + case EXTERNAL_UINT16_ELEMENTS:
|
| case INT16_ELEMENTS:
|
| case UINT16_ELEMENTS:
|
| __ strh(value, mem_operand);
|
| break;
|
| + 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_FLOAT32_ELEMENTS:
|
| + case EXTERNAL_FLOAT64_ELEMENTS:
|
| case FAST_DOUBLE_ELEMENTS:
|
| case FAST_ELEMENTS:
|
| case FAST_SMI_ELEMENTS:
|
| @@ -4450,7 +4476,7 @@
|
|
|
| void LCodeGen::DoStoreKeyed(LStoreKeyed* instr) {
|
| // By cases: external, fast double
|
| - if (instr->is_fixed_typed_array()) {
|
| + if (instr->is_typed_elements()) {
|
| DoStoreKeyedExternalArray(instr);
|
| } else if (instr->hydrogen()->value()->representation().IsDouble()) {
|
| DoStoreKeyedFixedDoubleArray(instr);
|
|
|