| Index: src/x64/lithium-codegen-x64.cc
|
| diff --git a/src/x64/lithium-codegen-x64.cc b/src/x64/lithium-codegen-x64.cc
|
| index 1c3b3801578c9186865e8b25809231f3b1101a93..46802da8f66858b67feaa3663ec0928f8ff5afaf 100644
|
| --- a/src/x64/lithium-codegen-x64.cc
|
| +++ b/src/x64/lithium-codegen-x64.cc
|
| @@ -2903,8 +2903,9 @@ void LCodeGen::DoLoadExternalArrayPointer(
|
| LLoadExternalArrayPointer* instr) {
|
| Register result = ToRegister(instr->result());
|
| Register input = ToRegister(instr->object());
|
| - __ movp(result, FieldOperand(input,
|
| - ExternalPixelArray::kExternalPointerOffset));
|
| + __ movp(result,
|
| + FieldOperand(input,
|
| + ExternalUint8ClampedArray::kExternalPointerOffset));
|
| }
|
|
|
|
|
| @@ -2961,40 +2962,40 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) {
|
| base_offset,
|
| instr->additional_index()));
|
|
|
| - if (elements_kind == EXTERNAL_FLOAT_ELEMENTS ||
|
| + if (elements_kind == EXTERNAL_FLOAT32_ELEMENTS ||
|
| elements_kind == FLOAT32_ELEMENTS) {
|
| XMMRegister result(ToDoubleRegister(instr->result()));
|
| __ movss(result, operand);
|
| __ cvtss2sd(result, result);
|
| - } else if (elements_kind == EXTERNAL_DOUBLE_ELEMENTS ||
|
| + } else if (elements_kind == EXTERNAL_FLOAT64_ELEMENTS ||
|
| elements_kind == FLOAT64_ELEMENTS) {
|
| __ movsd(ToDoubleRegister(instr->result()), operand);
|
| } else {
|
| Register result(ToRegister(instr->result()));
|
| switch (elements_kind) {
|
| - case EXTERNAL_BYTE_ELEMENTS:
|
| + case EXTERNAL_INT8_ELEMENTS:
|
| case INT8_ELEMENTS:
|
| __ movsxbq(result, operand);
|
| break;
|
| - case EXTERNAL_UNSIGNED_BYTE_ELEMENTS:
|
| - case EXTERNAL_PIXEL_ELEMENTS:
|
| + case EXTERNAL_UINT8_ELEMENTS:
|
| + case EXTERNAL_UINT8_CLAMPED_ELEMENTS:
|
| case UINT8_ELEMENTS:
|
| case UINT8_CLAMPED_ELEMENTS:
|
| __ movzxbq(result, operand);
|
| break;
|
| - case EXTERNAL_SHORT_ELEMENTS:
|
| + case EXTERNAL_INT16_ELEMENTS:
|
| case INT16_ELEMENTS:
|
| __ movsxwq(result, operand);
|
| break;
|
| - case EXTERNAL_UNSIGNED_SHORT_ELEMENTS:
|
| + case EXTERNAL_UINT16_ELEMENTS:
|
| case UINT16_ELEMENTS:
|
| __ movzxwq(result, operand);
|
| break;
|
| - case EXTERNAL_INT_ELEMENTS:
|
| + case EXTERNAL_INT32_ELEMENTS:
|
| case INT32_ELEMENTS:
|
| __ movsxlq(result, operand);
|
| break;
|
| - case EXTERNAL_UNSIGNED_INT_ELEMENTS:
|
| + case EXTERNAL_UINT32_ELEMENTS:
|
| case UINT32_ELEMENTS:
|
| __ movl(result, operand);
|
| if (!instr->hydrogen()->CheckFlag(HInstruction::kUint32)) {
|
| @@ -3002,8 +3003,8 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) {
|
| DeoptimizeIf(negative, instr->environment());
|
| }
|
| break;
|
| - case EXTERNAL_FLOAT_ELEMENTS:
|
| - case EXTERNAL_DOUBLE_ELEMENTS:
|
| + case EXTERNAL_FLOAT32_ELEMENTS:
|
| + case EXTERNAL_FLOAT64_ELEMENTS:
|
| case FLOAT32_ELEMENTS:
|
| case FLOAT64_ELEMENTS:
|
| case FAST_ELEMENTS:
|
| @@ -4153,39 +4154,39 @@ void LCodeGen::DoStoreKeyedExternalArray(LStoreKeyed* instr) {
|
| base_offset,
|
| instr->additional_index()));
|
|
|
| - if (elements_kind == EXTERNAL_FLOAT_ELEMENTS ||
|
| + if (elements_kind == EXTERNAL_FLOAT32_ELEMENTS ||
|
| elements_kind == FLOAT32_ELEMENTS) {
|
| XMMRegister value(ToDoubleRegister(instr->value()));
|
| __ cvtsd2ss(value, value);
|
| __ movss(operand, value);
|
| - } else if (elements_kind == EXTERNAL_DOUBLE_ELEMENTS ||
|
| + } else if (elements_kind == EXTERNAL_FLOAT64_ELEMENTS ||
|
| elements_kind == FLOAT64_ELEMENTS) {
|
| __ movsd(operand, ToDoubleRegister(instr->value()));
|
| } else {
|
| Register value(ToRegister(instr->value()));
|
| 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 INT8_ELEMENTS:
|
| case UINT8_ELEMENTS:
|
| case UINT8_CLAMPED_ELEMENTS:
|
| __ movb(operand, value);
|
| break;
|
| - case EXTERNAL_SHORT_ELEMENTS:
|
| - case EXTERNAL_UNSIGNED_SHORT_ELEMENTS:
|
| + case EXTERNAL_INT16_ELEMENTS:
|
| + case EXTERNAL_UINT16_ELEMENTS:
|
| case INT16_ELEMENTS:
|
| case UINT16_ELEMENTS:
|
| __ movw(operand, value);
|
| break;
|
| - case EXTERNAL_INT_ELEMENTS:
|
| - case EXTERNAL_UNSIGNED_INT_ELEMENTS:
|
| + case EXTERNAL_INT32_ELEMENTS:
|
| + case EXTERNAL_UINT32_ELEMENTS:
|
| case INT32_ELEMENTS:
|
| case UINT32_ELEMENTS:
|
| __ movl(operand, value);
|
| break;
|
| - case EXTERNAL_FLOAT_ELEMENTS:
|
| - case EXTERNAL_DOUBLE_ELEMENTS:
|
| + case EXTERNAL_FLOAT32_ELEMENTS:
|
| + case EXTERNAL_FLOAT64_ELEMENTS:
|
| case FLOAT32_ELEMENTS:
|
| case FLOAT64_ELEMENTS:
|
| case FAST_ELEMENTS:
|
|
|