Index: src/mips/lithium-codegen-mips.cc |
diff --git a/src/mips/lithium-codegen-mips.cc b/src/mips/lithium-codegen-mips.cc |
index 37fa97d2ecc81e3dbf5bd9949ac4aef27073cea4..0d52867972a9d2daf0b5d5bc1df7ff1222f7839b 100644 |
--- a/src/mips/lithium-codegen-mips.cc |
+++ b/src/mips/lithium-codegen-mips.cc |
@@ -2183,13 +2183,10 @@ 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(¬_simd, lt, scratch, Operand(FIRST_SIMD_VALUE_TYPE)); |
- __ Branch(instr->TrueLabel(chunk_), le, scratch, |
- Operand(LAST_SIMD_VALUE_TYPE)); |
- __ bind(¬_simd); |
+ __ Branch(instr->TrueLabel(chunk_), eq, scratch, |
+ Operand(SIMD128_VALUE_TYPE)); |
} |
if (expected.Contains(ToBooleanStub::HEAP_NUMBER)) { |
@@ -5744,54 +5741,18 @@ Condition LCodeGen::EmitTypeofIs(Label* true_label, |
*cmp2 = Operand(zero_reg); |
final_branch_condition = eq; |
- } else if (String::Equals(type_name, factory->float32x4_string())) { |
- __ JumpIfSmi(input, false_label); |
- __ GetObjectType(input, input, scratch); |
- *cmp1 = scratch; |
- *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); |
+// clang-format off |
+#define SIMD128_TYPE(TYPE, Type, type, lane_count, lane_type) \ |
+ } else if (String::Equals(type_name, factory->type##_string())) { \ |
+ __ JumpIfSmi(input, false_label); \ |
+ __ lw(input, FieldMemOperand(input, HeapObject::kMapOffset)); \ |
+ __ LoadRoot(at, Heap::k##Type##MapRootIndex); \ |
+ *cmp1 = input; \ |
+ *cmp2 = Operand(at); \ |
final_branch_condition = eq; |
+ SIMD128_TYPES(SIMD128_TYPE) |
+#undef SIMD128_TYPE |
+ // clang-format on |
} else { |
*cmp1 = at; |