| Index: src/compiler/register-allocator-verifier.cc
|
| diff --git a/src/compiler/register-allocator-verifier.cc b/src/compiler/register-allocator-verifier.cc
|
| index 081814d5b27d1b0a9cff20f424ddd3fdedb5bf58..2d10de081c5d9abaf0d095520ef61ebb0859cc28 100644
|
| --- a/src/compiler/register-allocator-verifier.cc
|
| +++ b/src/compiler/register-allocator-verifier.cc
|
| @@ -160,14 +160,14 @@ void RegisterAllocatorVerifier::BuildConstraint(const InstructionOperand* op,
|
| int vreg = unallocated->virtual_register();
|
| constraint->virtual_register_ = vreg;
|
| if (unallocated->basic_policy() == UnallocatedOperand::FIXED_SLOT) {
|
| - constraint->type_ = sequence()->IsFP(vreg) ? kDoubleSlot : kSlot;
|
| + constraint->type_ = sequence()->IsFP(vreg) ? kFPSlot : kSlot;
|
| constraint->value_ = unallocated->fixed_slot_index();
|
| } else {
|
| switch (unallocated->extended_policy()) {
|
| case UnallocatedOperand::ANY:
|
| case UnallocatedOperand::NONE:
|
| if (sequence()->IsFP(vreg)) {
|
| - constraint->type_ = kNoneDouble;
|
| + constraint->type_ = kNoneFP;
|
| } else {
|
| constraint->type_ = kNone;
|
| }
|
| @@ -181,19 +181,19 @@ void RegisterAllocatorVerifier::BuildConstraint(const InstructionOperand* op,
|
| }
|
| constraint->value_ = unallocated->fixed_register_index();
|
| break;
|
| - case UnallocatedOperand::FIXED_DOUBLE_REGISTER:
|
| - constraint->type_ = kFixedDoubleRegister;
|
| + case UnallocatedOperand::FIXED_FP_REGISTER:
|
| + constraint->type_ = kFixedFPRegister;
|
| constraint->value_ = unallocated->fixed_register_index();
|
| break;
|
| case UnallocatedOperand::MUST_HAVE_REGISTER:
|
| if (sequence()->IsFP(vreg)) {
|
| - constraint->type_ = kDoubleRegister;
|
| + constraint->type_ = kFPRegister;
|
| } else {
|
| constraint->type_ = kRegister;
|
| }
|
| break;
|
| case UnallocatedOperand::MUST_HAVE_SLOT:
|
| - constraint->type_ = sequence()->IsFP(vreg) ? kDoubleSlot : kSlot;
|
| + constraint->type_ = sequence()->IsFP(vreg) ? kFPSlot : kSlot;
|
| break;
|
| case UnallocatedOperand::SAME_AS_FIRST_INPUT:
|
| constraint->type_ = kSameAsFirst;
|
| @@ -223,7 +223,7 @@ void RegisterAllocatorVerifier::CheckConstraint(
|
| case kRegister:
|
| CHECK(op->IsRegister());
|
| return;
|
| - case kDoubleRegister:
|
| + case kFPRegister:
|
| CHECK(op->IsFPRegister());
|
| return;
|
| case kExplicit:
|
| @@ -232,13 +232,11 @@ void RegisterAllocatorVerifier::CheckConstraint(
|
| case kFixedRegister:
|
| case kRegisterAndSlot:
|
| CHECK(op->IsRegister());
|
| - CHECK_EQ(LocationOperand::cast(op)->GetRegister().code(),
|
| - constraint->value_);
|
| + CHECK_EQ(LocationOperand::cast(op)->register_code(), constraint->value_);
|
| return;
|
| - case kFixedDoubleRegister:
|
| + case kFixedFPRegister:
|
| CHECK(op->IsFPRegister());
|
| - CHECK_EQ(LocationOperand::cast(op)->GetDoubleRegister().code(),
|
| - constraint->value_);
|
| + CHECK_EQ(LocationOperand::cast(op)->register_code(), constraint->value_);
|
| return;
|
| case kFixedSlot:
|
| CHECK(op->IsStackSlot());
|
| @@ -247,13 +245,13 @@ void RegisterAllocatorVerifier::CheckConstraint(
|
| case kSlot:
|
| CHECK(op->IsStackSlot());
|
| return;
|
| - case kDoubleSlot:
|
| + case kFPSlot:
|
| CHECK(op->IsFPStackSlot());
|
| return;
|
| case kNone:
|
| CHECK(op->IsRegister() || op->IsStackSlot());
|
| return;
|
| - case kNoneDouble:
|
| + case kNoneFP:
|
| CHECK(op->IsFPRegister() || op->IsFPStackSlot());
|
| return;
|
| case kSameAsFirst:
|
|
|