| Index: src/arm64/lithium-codegen-arm64.cc
|
| diff --git a/src/arm64/lithium-codegen-arm64.cc b/src/arm64/lithium-codegen-arm64.cc
|
| index 6fb1088efc71e9b6b27ff9e52c61e2b24369f44c..9eda7e1d8b32c615996353e43862ab47d9698b34 100644
|
| --- a/src/arm64/lithium-codegen-arm64.cc
|
| +++ b/src/arm64/lithium-codegen-arm64.cc
|
| @@ -1933,8 +1933,12 @@ void LCodeGen::DoBranch(LBranch* instr) {
|
|
|
| if (expected.Contains(ToBooleanStub::SIMD_VALUE)) {
|
| // SIMD value -> true.
|
| - __ CompareInstanceType(map, scratch, FLOAT32X4_TYPE);
|
| - __ B(eq, true_label);
|
| + Label not_simd;
|
| + __ CompareInstanceType(map, scratch, FIRST_SIMD_VALUE_TYPE);
|
| + __ B(lt, ¬_simd);
|
| + __ CompareInstanceType(map, scratch, LAST_SIMD_VALUE_TYPE);
|
| + __ B(le, true_label);
|
| + __ Bind(¬_simd);
|
| }
|
|
|
| if (expected.Contains(ToBooleanStub::HEAP_NUMBER)) {
|
| @@ -3384,17 +3388,16 @@ void LCodeGen::DoLoadGlobalViaContext(LLoadGlobalViaContext* instr) {
|
| DCHECK(ToRegister(instr->context()).is(cp));
|
| DCHECK(ToRegister(instr->result()).is(x0));
|
|
|
| - int const slot = instr->slot_index();
|
| - int const depth = instr->depth();
|
| - if (depth <= LoadGlobalViaContextStub::kMaximumDepth) {
|
| - __ Mov(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);
|
| - }
|
| + __ Mov(LoadGlobalViaContextDescriptor::DepthRegister(),
|
| + Operand(Smi::FromInt(instr->depth())));
|
| + __ Mov(LoadGlobalViaContextDescriptor::SlotRegister(),
|
| + Operand(Smi::FromInt(instr->slot_index())));
|
| + __ Mov(LoadGlobalViaContextDescriptor::NameRegister(),
|
| + Operand(instr->name()));
|
| +
|
| + Handle<Code> stub =
|
| + CodeFactory::LoadGlobalViaContext(isolate(), instr->depth()).code();
|
| + CallCode(stub, RelocInfo::CODE_TARGET, instr);
|
| }
|
|
|
|
|
| @@ -3455,33 +3458,42 @@ void LCodeGen::DoLoadKeyedExternal(LLoadKeyedExternal* instr) {
|
| elements_kind,
|
| instr->base_offset());
|
|
|
| - if (elements_kind == FLOAT32_ELEMENTS) {
|
| + if ((elements_kind == EXTERNAL_FLOAT32_ELEMENTS) ||
|
| + (elements_kind == FLOAT32_ELEMENTS)) {
|
| DoubleRegister result = ToDoubleRegister(instr->result());
|
| __ Ldr(result.S(), mem_op);
|
| __ Fcvt(result, result.S());
|
| - } else if (elements_kind == FLOAT64_ELEMENTS) {
|
| + } else if ((elements_kind == EXTERNAL_FLOAT64_ELEMENTS) ||
|
| + (elements_kind == FLOAT64_ELEMENTS)) {
|
| DoubleRegister result = ToDoubleRegister(instr->result());
|
| __ Ldr(result, mem_op);
|
| } else {
|
| Register result = ToRegister(instr->result());
|
|
|
| switch (elements_kind) {
|
| + case EXTERNAL_INT8_ELEMENTS:
|
| case INT8_ELEMENTS:
|
| __ Ldrsb(result, mem_op);
|
| break;
|
| + case EXTERNAL_UINT8_CLAMPED_ELEMENTS:
|
| + case EXTERNAL_UINT8_ELEMENTS:
|
| case UINT8_ELEMENTS:
|
| case UINT8_CLAMPED_ELEMENTS:
|
| __ Ldrb(result, mem_op);
|
| break;
|
| + case EXTERNAL_INT16_ELEMENTS:
|
| case INT16_ELEMENTS:
|
| __ Ldrsh(result, mem_op);
|
| break;
|
| + case EXTERNAL_UINT16_ELEMENTS:
|
| case UINT16_ELEMENTS:
|
| __ Ldrh(result, mem_op);
|
| break;
|
| + case EXTERNAL_INT32_ELEMENTS:
|
| case INT32_ELEMENTS:
|
| __ Ldrsw(result, mem_op);
|
| break;
|
| + case EXTERNAL_UINT32_ELEMENTS:
|
| case UINT32_ELEMENTS:
|
| __ Ldr(result.W(), mem_op);
|
| if (!instr->hydrogen()->CheckFlag(HInstruction::kUint32)) {
|
| @@ -3492,6 +3504,8 @@ void LCodeGen::DoLoadKeyedExternal(LLoadKeyedExternal* 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:
|
| @@ -5035,8 +5049,8 @@ void LCodeGen::DoDeclareGlobals(LDeclareGlobals* instr) {
|
| // here.
|
| __ LoadHeapObject(scratch1, instr->hydrogen()->pairs());
|
| __ Mov(scratch2, Smi::FromInt(instr->hydrogen()->flags()));
|
| - __ Push(scratch1, scratch2);
|
| - CallRuntime(Runtime::kDeclareGlobals, 2, instr);
|
| + __ Push(cp, scratch1, scratch2); // The context is the first argument.
|
| + CallRuntime(Runtime::kDeclareGlobals, 3, instr);
|
| }
|
|
|
|
|
| @@ -5166,33 +5180,44 @@ void LCodeGen::DoStoreKeyedExternal(LStoreKeyedExternal* instr) {
|
| elements_kind,
|
| instr->base_offset());
|
|
|
| - if (elements_kind == FLOAT32_ELEMENTS) {
|
| + if ((elements_kind == EXTERNAL_FLOAT32_ELEMENTS) ||
|
| + (elements_kind == FLOAT32_ELEMENTS)) {
|
| DoubleRegister value = ToDoubleRegister(instr->value());
|
| DoubleRegister dbl_scratch = double_scratch();
|
| __ Fcvt(dbl_scratch.S(), value);
|
| __ Str(dbl_scratch.S(), dst);
|
| - } else if (elements_kind == FLOAT64_ELEMENTS) {
|
| + } else if ((elements_kind == EXTERNAL_FLOAT64_ELEMENTS) ||
|
| + (elements_kind == FLOAT64_ELEMENTS)) {
|
| DoubleRegister value = ToDoubleRegister(instr->value());
|
| __ Str(value, dst);
|
| } else {
|
| Register value = ToRegister(instr->value());
|
|
|
| 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, dst);
|
| break;
|
| + case EXTERNAL_INT16_ELEMENTS:
|
| + case EXTERNAL_UINT16_ELEMENTS:
|
| case INT16_ELEMENTS:
|
| case UINT16_ELEMENTS:
|
| __ Strh(value, dst);
|
| break;
|
| + case EXTERNAL_INT32_ELEMENTS:
|
| + case EXTERNAL_UINT32_ELEMENTS:
|
| case INT32_ELEMENTS:
|
| case UINT32_ELEMENTS:
|
| __ Str(value.W(), dst);
|
| 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:
|
| @@ -5519,22 +5544,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) {
|
| - __ Mov(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(instr->language_mode())
|
| - ? Runtime::kStoreGlobalViaContext_Strict
|
| - : Runtime::kStoreGlobalViaContext_Sloppy,
|
| - 2);
|
| - }
|
| + __ Mov(StoreGlobalViaContextDescriptor::DepthRegister(),
|
| + Operand(Smi::FromInt(instr->depth())));
|
| + __ Mov(StoreGlobalViaContextDescriptor::SlotRegister(),
|
| + Operand(Smi::FromInt(instr->slot_index())));
|
| + __ Mov(StoreGlobalViaContextDescriptor::NameRegister(),
|
| + Operand(instr->name()));
|
| +
|
| + Handle<Code> stub = CodeFactory::StoreGlobalViaContext(
|
| + isolate(), instr->depth(), instr->language_mode())
|
| + .code();
|
| + CallCode(stub, RelocInfo::CODE_TARGET, instr);
|
| }
|
|
|
|
|
| @@ -6002,6 +6022,60 @@ void LCodeGen::DoTypeofIsAndBranch(LTypeofIsAndBranch* instr) {
|
| __ CompareObjectType(value, map, scratch, FLOAT32X4_TYPE);
|
| EmitBranch(instr, eq);
|
|
|
| + } else if (String::Equals(type_name, factory->int32x4_string())) {
|
| + DCHECK((instr->temp1() != NULL) && (instr->temp2() != NULL));
|
| + Register map = ToRegister(instr->temp1());
|
| + Register scratch = ToRegister(instr->temp2());
|
| +
|
| + __ JumpIfSmi(value, false_label);
|
| + __ CompareObjectType(value, map, scratch, INT32X4_TYPE);
|
| + EmitBranch(instr, eq);
|
| +
|
| + } else if (String::Equals(type_name, factory->bool32x4_string())) {
|
| + DCHECK((instr->temp1() != NULL) && (instr->temp2() != NULL));
|
| + Register map = ToRegister(instr->temp1());
|
| + Register scratch = ToRegister(instr->temp2());
|
| +
|
| + __ JumpIfSmi(value, false_label);
|
| + __ CompareObjectType(value, map, scratch, BOOL32X4_TYPE);
|
| + EmitBranch(instr, eq);
|
| +
|
| + } else if (String::Equals(type_name, factory->int16x8_string())) {
|
| + DCHECK((instr->temp1() != NULL) && (instr->temp2() != NULL));
|
| + Register map = ToRegister(instr->temp1());
|
| + Register scratch = ToRegister(instr->temp2());
|
| +
|
| + __ JumpIfSmi(value, false_label);
|
| + __ CompareObjectType(value, map, scratch, INT16X8_TYPE);
|
| + EmitBranch(instr, eq);
|
| +
|
| + } else if (String::Equals(type_name, factory->bool16x8_string())) {
|
| + DCHECK((instr->temp1() != NULL) && (instr->temp2() != NULL));
|
| + Register map = ToRegister(instr->temp1());
|
| + Register scratch = ToRegister(instr->temp2());
|
| +
|
| + __ JumpIfSmi(value, false_label);
|
| + __ CompareObjectType(value, map, scratch, BOOL16X8_TYPE);
|
| + EmitBranch(instr, eq);
|
| +
|
| + } else if (String::Equals(type_name, factory->int8x16_string())) {
|
| + DCHECK((instr->temp1() != NULL) && (instr->temp2() != NULL));
|
| + Register map = ToRegister(instr->temp1());
|
| + Register scratch = ToRegister(instr->temp2());
|
| +
|
| + __ JumpIfSmi(value, false_label);
|
| + __ CompareObjectType(value, map, scratch, INT8X16_TYPE);
|
| + EmitBranch(instr, eq);
|
| +
|
| + } else if (String::Equals(type_name, factory->bool8x16_string())) {
|
| + DCHECK((instr->temp1() != NULL) && (instr->temp2() != NULL));
|
| + Register map = ToRegister(instr->temp1());
|
| + Register scratch = ToRegister(instr->temp2());
|
| +
|
| + __ JumpIfSmi(value, false_label);
|
| + __ CompareObjectType(value, map, scratch, BOOL8X16_TYPE);
|
| + EmitBranch(instr, eq);
|
| +
|
| } else {
|
| __ B(false_label);
|
| }
|
|
|