Index: src/mips/lithium-codegen-mips.cc |
diff --git a/src/mips/lithium-codegen-mips.cc b/src/mips/lithium-codegen-mips.cc |
index d6af3267c4452683b5e9fcfec05779239abc6d22..aaf522af1bfcadcb570c1b1e7549e42689763e76 100644 |
--- a/src/mips/lithium-codegen-mips.cc |
+++ b/src/mips/lithium-codegen-mips.cc |
@@ -2183,10 +2183,13 @@ void LCodeGen::DoBranch(LBranch* instr) { |
if (expected.Contains(ToBooleanStub::SIMD_VALUE)) { |
// SIMD value -> true. |
+ Label not_simd; |
const Register scratch = scratch1(); |
__ lbu(scratch, FieldMemOperand(map, Map::kInstanceTypeOffset)); |
- __ Branch(instr->TrueLabel(chunk_), eq, scratch, |
- Operand(FLOAT32X4_TYPE)); |
+ __ Branch(¬_simd, lt, at, Operand(FIRST_SIMD_VALUE_TYPE)); |
+ __ Branch(instr->TrueLabel(chunk_), le, scratch, |
+ Operand(LAST_SIMD_VALUE_TYPE)); |
+ __ bind(¬_simd); |
} |
if (expected.Contains(ToBooleanStub::HEAP_NUMBER)) { |
@@ -2899,17 +2902,15 @@ void LCodeGen::DoLoadGlobalViaContext(LLoadGlobalViaContext* instr) { |
DCHECK(ToRegister(instr->context()).is(cp)); |
DCHECK(ToRegister(instr->result()).is(v0)); |
- int const slot = instr->slot_index(); |
- int const depth = instr->depth(); |
- if (depth <= LoadGlobalViaContextStub::kMaximumDepth) { |
- __ li(LoadGlobalViaContextDescriptor::SlotRegister(), Operand(slot)); |
- Handle<Code> stub = |
- CodeFactory::LoadGlobalViaContext(isolate(), depth).code(); |
- CallCode(stub, RelocInfo::CODE_TARGET, instr); |
- } else { |
- __ Push(Smi::FromInt(slot)); |
- __ CallRuntime(Runtime::kLoadGlobalViaContext, 1); |
- } |
+ __ li(LoadGlobalViaContextDescriptor::DepthRegister(), |
+ Operand(Smi::FromInt(instr->depth()))); |
+ __ li(LoadGlobalViaContextDescriptor::SlotRegister(), |
+ Operand(Smi::FromInt(instr->slot_index()))); |
+ __ li(LoadGlobalViaContextDescriptor::NameRegister(), Operand(instr->name())); |
+ |
+ Handle<Code> stub = |
+ CodeFactory::LoadGlobalViaContext(isolate(), instr->depth()).code(); |
+ CallCode(stub, RelocInfo::CODE_TARGET, instr); |
} |
@@ -3111,7 +3112,10 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) { |
? (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) { |
FPURegister result = ToDoubleRegister(instr->result()); |
if (key_is_constant) { |
__ Addu(scratch0(), external_pointer, constant_key << element_size_shift); |
@@ -3119,7 +3123,8 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) { |
__ sll(scratch0(), key, shift_size); |
__ Addu(scratch0(), scratch0(), external_pointer); |
} |
- if (elements_kind == FLOAT32_ELEMENTS) { |
+ if (elements_kind == EXTERNAL_FLOAT32_ELEMENTS || |
+ elements_kind == FLOAT32_ELEMENTS) { |
__ lwc1(result, MemOperand(scratch0(), base_offset)); |
__ cvt_d_s(result, result); |
} else { // i.e. elements_kind == EXTERNAL_DOUBLE_ELEMENTS |
@@ -3131,22 +3136,29 @@ 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)) { |
@@ -3156,6 +3168,8 @@ 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: |
@@ -3267,7 +3281,7 @@ void LCodeGen::DoLoadKeyedFixedArray(LLoadKeyed* instr) { |
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); |
@@ -3521,8 +3535,9 @@ void LCodeGen::DoDeclareGlobals(LDeclareGlobals* instr) { |
DCHECK(ToRegister(instr->context()).is(cp)); |
__ li(scratch0(), instr->hydrogen()->pairs()); |
__ li(scratch1(), Operand(Smi::FromInt(instr->hydrogen()->flags()))); |
- __ Push(scratch0(), scratch1()); |
- CallRuntime(Runtime::kDeclareGlobals, 2, instr); |
+ // The context is the first argument. |
+ __ Push(cp, scratch0(), scratch1()); |
+ CallRuntime(Runtime::kDeclareGlobals, 3, instr); |
} |
@@ -4197,22 +4212,17 @@ void LCodeGen::DoStoreGlobalViaContext(LStoreGlobalViaContext* instr) { |
DCHECK(ToRegister(instr->value()) |
.is(StoreGlobalViaContextDescriptor::ValueRegister())); |
- int const slot = instr->slot_index(); |
- int const depth = instr->depth(); |
- if (depth <= StoreGlobalViaContextStub::kMaximumDepth) { |
- __ li(StoreGlobalViaContextDescriptor::SlotRegister(), Operand(slot)); |
- Handle<Code> stub = CodeFactory::StoreGlobalViaContext( |
- isolate(), depth, instr->language_mode()) |
- .code(); |
- CallCode(stub, RelocInfo::CODE_TARGET, instr); |
- } else { |
- __ Push(Smi::FromInt(slot)); |
- __ Push(StoreGlobalViaContextDescriptor::ValueRegister()); |
- __ CallRuntime(is_strict(language_mode()) |
- ? Runtime::kStoreGlobalViaContext_Strict |
- : Runtime::kStoreGlobalViaContext_Sloppy, |
- 2); |
- } |
+ __ li(StoreGlobalViaContextDescriptor::DepthRegister(), |
+ Operand(Smi::FromInt(instr->depth()))); |
+ __ li(StoreGlobalViaContextDescriptor::SlotRegister(), |
+ Operand(Smi::FromInt(instr->slot_index()))); |
+ __ li(StoreGlobalViaContextDescriptor::NameRegister(), |
+ Operand(instr->name())); |
+ |
+ Handle<Code> stub = CodeFactory::StoreGlobalViaContext( |
+ isolate(), instr->depth(), instr->language_mode()) |
+ .code(); |
+ CallCode(stub, RelocInfo::CODE_TARGET, instr); |
} |
@@ -4258,7 +4268,10 @@ void LCodeGen::DoStoreKeyedExternalArray(LStoreKeyed* instr) { |
? (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(); |
FPURegister value(ToDoubleRegister(instr->value())); |
if (key_is_constant) { |
@@ -4273,7 +4286,8 @@ void LCodeGen::DoStoreKeyedExternalArray(LStoreKeyed* instr) { |
__ Addu(address, external_pointer, address); |
} |
- if (elements_kind == FLOAT32_ELEMENTS) { |
+ if (elements_kind == EXTERNAL_FLOAT32_ELEMENTS || |
+ elements_kind == FLOAT32_ELEMENTS) { |
__ cvt_s_d(double_scratch0(), value); |
__ swc1(double_scratch0(), MemOperand(address, base_offset)); |
} else { // Storing doubles, not floats. |
@@ -4286,21 +4300,30 @@ 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: |
@@ -4414,7 +4437,7 @@ void LCodeGen::DoStoreKeyedFixedArray(LStoreKeyed* instr) { |
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); |
@@ -5748,6 +5771,48 @@ Condition LCodeGen::EmitTypeofIs(Label* true_label, |
*cmp2 = Operand(FLOAT32X4_TYPE); |
final_branch_condition = eq; |
+ } else if (String::Equals(type_name, factory->int32x4_string())) { |
+ __ JumpIfSmi(input, false_label); |
+ __ GetObjectType(input, input, scratch); |
+ *cmp1 = scratch; |
+ *cmp2 = Operand(INT32X4_TYPE); |
+ final_branch_condition = eq; |
+ |
+ } else if (String::Equals(type_name, factory->bool32x4_string())) { |
+ __ JumpIfSmi(input, false_label); |
+ __ GetObjectType(input, input, scratch); |
+ *cmp1 = scratch; |
+ *cmp2 = Operand(BOOL32X4_TYPE); |
+ final_branch_condition = eq; |
+ |
+ } else if (String::Equals(type_name, factory->int16x8_string())) { |
+ __ JumpIfSmi(input, false_label); |
+ __ GetObjectType(input, input, scratch); |
+ *cmp1 = scratch; |
+ *cmp2 = Operand(INT16X8_TYPE); |
+ final_branch_condition = eq; |
+ |
+ } else if (String::Equals(type_name, factory->bool16x8_string())) { |
+ __ JumpIfSmi(input, false_label); |
+ __ GetObjectType(input, input, scratch); |
+ *cmp1 = scratch; |
+ *cmp2 = Operand(BOOL16X8_TYPE); |
+ final_branch_condition = eq; |
+ |
+ } else if (String::Equals(type_name, factory->int8x16_string())) { |
+ __ JumpIfSmi(input, false_label); |
+ __ GetObjectType(input, input, scratch); |
+ *cmp1 = scratch; |
+ *cmp2 = Operand(INT8X16_TYPE); |
+ final_branch_condition = eq; |
+ |
+ } else if (String::Equals(type_name, factory->bool8x16_string())) { |
+ __ JumpIfSmi(input, false_label); |
+ __ GetObjectType(input, input, scratch); |
+ *cmp1 = scratch; |
+ *cmp2 = Operand(BOOL8X16_TYPE); |
+ final_branch_condition = eq; |
+ |
} else { |
*cmp1 = at; |
*cmp2 = Operand(zero_reg); // Set to valid regs, to avoid caller assertion. |