| Index: src/compiler/mips/instruction-selector-mips.cc
|
| diff --git a/src/compiler/mips/instruction-selector-mips.cc b/src/compiler/mips/instruction-selector-mips.cc
|
| index 2a7020e9e632938f4070ad4bcef4a37b0b1b8b82..94beec1e944658f462fae5b302b2a5a02d5c5f60 100644
|
| --- a/src/compiler/mips/instruction-selector-mips.cc
|
| +++ b/src/compiler/mips/instruction-selector-mips.cc
|
| @@ -127,29 +127,28 @@ static void VisitBinop(InstructionSelector* selector, Node* node,
|
|
|
|
|
| void InstructionSelector::VisitLoad(Node* node) {
|
| - MachineType rep = RepresentationOf(OpParameter<LoadRepresentation>(node));
|
| - MachineType typ = TypeOf(OpParameter<LoadRepresentation>(node));
|
| + LoadRepresentation load_rep = LoadRepresentationOf(node->op());
|
| MipsOperandGenerator g(this);
|
| Node* base = node->InputAt(0);
|
| Node* index = node->InputAt(1);
|
|
|
| ArchOpcode opcode;
|
| - switch (rep) {
|
| - case kRepFloat32:
|
| + switch (load_rep.representation()) {
|
| + case MachineRepresentation::kFloat32:
|
| opcode = kMipsLwc1;
|
| break;
|
| - case kRepFloat64:
|
| + case MachineRepresentation::kFloat64:
|
| opcode = kMipsLdc1;
|
| break;
|
| - case kRepBit: // Fall through.
|
| - case kRepWord8:
|
| - opcode = typ == kTypeUint32 ? kMipsLbu : kMipsLb;
|
| + case MachineRepresentation::kBit: // Fall through.
|
| + case MachineRepresentation::kWord8:
|
| + opcode = load_rep.IsUnsigned() ? kMipsLbu : kMipsLb;
|
| break;
|
| - case kRepWord16:
|
| - opcode = typ == kTypeUint32 ? kMipsLhu : kMipsLh;
|
| + case MachineRepresentation::kWord16:
|
| + opcode = load_rep.IsUnsigned() ? kMipsLhu : kMipsLh;
|
| break;
|
| - case kRepTagged: // Fall through.
|
| - case kRepWord32:
|
| + case MachineRepresentation::kTagged: // Fall through.
|
| + case MachineRepresentation::kWord32:
|
| opcode = kMipsLw;
|
| break;
|
| default:
|
| @@ -179,11 +178,11 @@ void InstructionSelector::VisitStore(Node* node) {
|
|
|
| StoreRepresentation store_rep = OpParameter<StoreRepresentation>(node);
|
| WriteBarrierKind write_barrier_kind = store_rep.write_barrier_kind();
|
| - MachineType rep = RepresentationOf(store_rep.machine_type());
|
| + MachineRepresentation rep = store_rep.machine_type().representation();
|
|
|
| // TODO(mips): I guess this could be done in a better way.
|
| if (write_barrier_kind != kNoWriteBarrier) {
|
| - DCHECK_EQ(kRepTagged, rep);
|
| + DCHECK_EQ(MachineRepresentation::kTagged, rep);
|
| InstructionOperand inputs[3];
|
| size_t input_count = 0;
|
| inputs[input_count++] = g.UseUniqueRegister(base);
|
| @@ -214,21 +213,21 @@ void InstructionSelector::VisitStore(Node* node) {
|
| } else {
|
| ArchOpcode opcode;
|
| switch (rep) {
|
| - case kRepFloat32:
|
| + case MachineRepresentation::kFloat32:
|
| opcode = kMipsSwc1;
|
| break;
|
| - case kRepFloat64:
|
| + case MachineRepresentation::kFloat64:
|
| opcode = kMipsSdc1;
|
| break;
|
| - case kRepBit: // Fall through.
|
| - case kRepWord8:
|
| + case MachineRepresentation::kBit: // Fall through.
|
| + case MachineRepresentation::kWord8:
|
| opcode = kMipsSb;
|
| break;
|
| - case kRepWord16:
|
| + case MachineRepresentation::kWord16:
|
| opcode = kMipsSh;
|
| break;
|
| - case kRepTagged: // Fall through.
|
| - case kRepWord32:
|
| + case MachineRepresentation::kTagged: // Fall through.
|
| + case MachineRepresentation::kWord32:
|
| opcode = kMipsSw;
|
| break;
|
| default:
|
| @@ -803,27 +802,26 @@ bool InstructionSelector::IsTailCallAddressImmediate() { return false; }
|
|
|
|
|
| void InstructionSelector::VisitCheckedLoad(Node* node) {
|
| - MachineType rep = RepresentationOf(OpParameter<MachineType>(node));
|
| - MachineType typ = TypeOf(OpParameter<MachineType>(node));
|
| + CheckedLoadRepresentation load_rep = CheckedLoadRepresentationOf(node->op());
|
| MipsOperandGenerator g(this);
|
| Node* const buffer = node->InputAt(0);
|
| Node* const offset = node->InputAt(1);
|
| Node* const length = node->InputAt(2);
|
| ArchOpcode opcode;
|
| - switch (rep) {
|
| - case kRepWord8:
|
| - opcode = typ == kTypeInt32 ? kCheckedLoadInt8 : kCheckedLoadUint8;
|
| + switch (load_rep.representation()) {
|
| + case MachineRepresentation::kWord8:
|
| + opcode = load_rep.IsSigned() ? kCheckedLoadInt8 : kCheckedLoadUint8;
|
| break;
|
| - case kRepWord16:
|
| - opcode = typ == kTypeInt32 ? kCheckedLoadInt16 : kCheckedLoadUint16;
|
| + case MachineRepresentation::kWord16:
|
| + opcode = load_rep.IsSigned() ? kCheckedLoadInt16 : kCheckedLoadUint16;
|
| break;
|
| - case kRepWord32:
|
| + case MachineRepresentation::kWord32:
|
| opcode = kCheckedLoadWord32;
|
| break;
|
| - case kRepFloat32:
|
| + case MachineRepresentation::kFloat32:
|
| opcode = kCheckedLoadFloat32;
|
| break;
|
| - case kRepFloat64:
|
| + case MachineRepresentation::kFloat64:
|
| opcode = kCheckedLoadFloat64;
|
| break;
|
| default:
|
| @@ -847,7 +845,8 @@ void InstructionSelector::VisitCheckedLoad(Node* node) {
|
|
|
|
|
| void InstructionSelector::VisitCheckedStore(Node* node) {
|
| - MachineType rep = RepresentationOf(OpParameter<MachineType>(node));
|
| + MachineRepresentation rep =
|
| + CheckedStoreRepresentationOf(node->op()).representation();
|
| MipsOperandGenerator g(this);
|
| Node* const buffer = node->InputAt(0);
|
| Node* const offset = node->InputAt(1);
|
| @@ -855,19 +854,19 @@ void InstructionSelector::VisitCheckedStore(Node* node) {
|
| Node* const value = node->InputAt(3);
|
| ArchOpcode opcode;
|
| switch (rep) {
|
| - case kRepWord8:
|
| + case MachineRepresentation::kWord8:
|
| opcode = kCheckedStoreWord8;
|
| break;
|
| - case kRepWord16:
|
| + case MachineRepresentation::kWord16:
|
| opcode = kCheckedStoreWord16;
|
| break;
|
| - case kRepWord32:
|
| + case MachineRepresentation::kWord32:
|
| opcode = kCheckedStoreWord32;
|
| break;
|
| - case kRepFloat32:
|
| + case MachineRepresentation::kFloat32:
|
| opcode = kCheckedStoreFloat32;
|
| break;
|
| - case kRepFloat64:
|
| + case MachineRepresentation::kFloat64:
|
| opcode = kCheckedStoreFloat64;
|
| break;
|
| default:
|
|
|