Index: src/ia32/lithium-codegen-ia32.cc |
diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc |
index 05b6f3c5bfea2f261125ae3c241f00bae9acb22a..3299a8ed3218c37097a9be86a4f93d187899f37c 100644 |
--- a/src/ia32/lithium-codegen-ia32.cc |
+++ b/src/ia32/lithium-codegen-ia32.cc |
@@ -3409,7 +3409,7 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) { |
elements_kind, |
0, |
instr->additional_index())); |
- if (elements_kind == EXTERNAL_FLOAT_ELEMENTS || |
+ if (elements_kind == EXTERNAL_FLOAT32_ELEMENTS || |
elements_kind == FLOAT32_ELEMENTS) { |
if (CpuFeatures::IsSupported(SSE2)) { |
CpuFeatureScope scope(masm(), SSE2); |
@@ -3419,7 +3419,7 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) { |
} else { |
X87Mov(ToX87Register(instr->result()), operand, kX87FloatOperand); |
} |
- } else if (elements_kind == EXTERNAL_DOUBLE_ELEMENTS || |
+ } else if (elements_kind == EXTERNAL_FLOAT64_ELEMENTS || |
elements_kind == FLOAT64_ELEMENTS) { |
if (CpuFeatures::IsSupported(SSE2)) { |
CpuFeatureScope scope(masm(), SSE2); |
@@ -3430,29 +3430,29 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) { |
} else { |
Register result(ToRegister(instr->result())); |
switch (elements_kind) { |
- case EXTERNAL_BYTE_ELEMENTS: |
+ case EXTERNAL_INT8_ELEMENTS: |
case INT8_ELEMENTS: |
__ movsx_b(result, 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: |
__ movzx_b(result, operand); |
break; |
- case EXTERNAL_SHORT_ELEMENTS: |
+ case EXTERNAL_INT16_ELEMENTS: |
case INT16_ELEMENTS: |
__ movsx_w(result, operand); |
break; |
- case EXTERNAL_UNSIGNED_SHORT_ELEMENTS: |
+ case EXTERNAL_UINT16_ELEMENTS: |
case UINT16_ELEMENTS: |
__ movzx_w(result, operand); |
break; |
- case EXTERNAL_INT_ELEMENTS: |
+ case EXTERNAL_INT32_ELEMENTS: |
case INT32_ELEMENTS: |
__ mov(result, operand); |
break; |
- case EXTERNAL_UNSIGNED_INT_ELEMENTS: |
+ case EXTERNAL_UINT32_ELEMENTS: |
case UINT32_ELEMENTS: |
__ mov(result, operand); |
if (!instr->hydrogen()->CheckFlag(HInstruction::kUint32)) { |
@@ -3460,8 +3460,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_SMI_ELEMENTS: |
@@ -4539,7 +4539,7 @@ void LCodeGen::DoStoreKeyedExternalArray(LStoreKeyed* instr) { |
elements_kind, |
0, |
instr->additional_index())); |
- if (elements_kind == EXTERNAL_FLOAT_ELEMENTS || |
+ if (elements_kind == EXTERNAL_FLOAT32_ELEMENTS || |
elements_kind == FLOAT32_ELEMENTS) { |
if (CpuFeatures::IsSafeForSnapshot(SSE2)) { |
CpuFeatureScope scope(masm(), SSE2); |
@@ -4550,7 +4550,7 @@ void LCodeGen::DoStoreKeyedExternalArray(LStoreKeyed* instr) { |
__ fld(0); |
__ fstp_s(operand); |
} |
- } else if (elements_kind == EXTERNAL_DOUBLE_ELEMENTS || |
+ } else if (elements_kind == EXTERNAL_FLOAT64_ELEMENTS || |
elements_kind == FLOAT64_ELEMENTS) { |
if (CpuFeatures::IsSafeForSnapshot(SSE2)) { |
CpuFeatureScope scope(masm(), SSE2); |
@@ -4561,28 +4561,28 @@ void LCodeGen::DoStoreKeyedExternalArray(LStoreKeyed* instr) { |
} else { |
Register value = ToRegister(instr->value()); |
switch (elements_kind) { |
- case EXTERNAL_PIXEL_ELEMENTS: |
- case EXTERNAL_UNSIGNED_BYTE_ELEMENTS: |
- case EXTERNAL_BYTE_ELEMENTS: |
+ case EXTERNAL_UINT8_CLAMPED_ELEMENTS: |
+ case EXTERNAL_UINT8_ELEMENTS: |
+ case EXTERNAL_INT8_ELEMENTS: |
case UINT8_ELEMENTS: |
case INT8_ELEMENTS: |
case UINT8_CLAMPED_ELEMENTS: |
__ mov_b(operand, value); |
break; |
- case EXTERNAL_SHORT_ELEMENTS: |
- case EXTERNAL_UNSIGNED_SHORT_ELEMENTS: |
+ case EXTERNAL_INT16_ELEMENTS: |
+ case EXTERNAL_UINT16_ELEMENTS: |
case UINT16_ELEMENTS: |
case INT16_ELEMENTS: |
__ mov_w(operand, value); |
break; |
- case EXTERNAL_INT_ELEMENTS: |
- case EXTERNAL_UNSIGNED_INT_ELEMENTS: |
+ case EXTERNAL_INT32_ELEMENTS: |
+ case EXTERNAL_UINT32_ELEMENTS: |
case UINT32_ELEMENTS: |
case INT32_ELEMENTS: |
__ mov(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_SMI_ELEMENTS: |