| Index: src/mips/macro-assembler-mips.cc
|
| diff --git a/src/mips/macro-assembler-mips.cc b/src/mips/macro-assembler-mips.cc
|
| index 8e3bc03d37e40ef2e6cad9e756e9950cc4a20dc7..4d0b6c19535b14623353461b9180cf7cc0a7d71b 100644
|
| --- a/src/mips/macro-assembler-mips.cc
|
| +++ b/src/mips/macro-assembler-mips.cc
|
| @@ -14,6 +14,7 @@
|
| #include "src/cpu-profiler.h"
|
| #include "src/debug/debug.h"
|
| #include "src/mips/macro-assembler-mips.h"
|
| +#include "src/register-configuration.h"
|
| #include "src/runtime/runtime.h"
|
|
|
| namespace v8 {
|
| @@ -147,7 +148,7 @@ MemOperand MacroAssembler::SafepointRegisterSlot(Register reg) {
|
| MemOperand MacroAssembler::SafepointRegistersAndDoublesSlot(Register reg) {
|
| UNIMPLEMENTED_MIPS();
|
| // General purpose registers are pushed last on the stack.
|
| - int doubles_size = FPURegister::NumAllocatableRegisters() * kDoubleSize;
|
| + int doubles_size = DoubleRegister::kMaxNumRegisters * kDoubleSize;
|
| int register_offset = SafepointRegisterStackIndex(reg.code()) * kPointerSize;
|
| return MemOperand(sp, doubles_size + register_offset);
|
| }
|
| @@ -3682,7 +3683,7 @@ void MacroAssembler::CopyFields(Register dst,
|
| // Find a temp register in temps list.
|
| for (int i = 0; i < kNumRegisters; i++) {
|
| if ((temps & (1 << i)) != 0) {
|
| - tmp.code_ = i;
|
| + tmp.reg_code = i;
|
| break;
|
| }
|
| }
|
| @@ -5851,8 +5852,10 @@ Register GetRegisterThatIsNotOneOf(Register reg1,
|
| if (reg5.is_valid()) regs |= reg5.bit();
|
| if (reg6.is_valid()) regs |= reg6.bit();
|
|
|
| - for (int i = 0; i < Register::NumAllocatableRegisters(); i++) {
|
| - Register candidate = Register::FromAllocationIndex(i);
|
| + const RegisterConfiguration* config = RegisterConfiguration::ArchDefault();
|
| + for (int i = 0; i < config->num_allocatable_general_registers(); ++i) {
|
| + int code = config->GetAllocatableGeneralCode(i);
|
| + Register candidate = Register::from_code(code);
|
| if (regs & candidate.bit()) continue;
|
| return candidate;
|
| }
|
|
|