| Index: runtime/vm/instructions_mips.cc
|
| diff --git a/runtime/vm/instructions_mips.cc b/runtime/vm/instructions_mips.cc
|
| index 547b6fe72f003d2955b82c24107a3bd59133d8d3..3c60538e638dfbfc1a13d86a8fca0acfd06507ee 100644
|
| --- a/runtime/vm/instructions_mips.cc
|
| +++ b/runtime/vm/instructions_mips.cc
|
| @@ -25,10 +25,8 @@ CallPattern::CallPattern(uword pc, const Code& code)
|
| ASSERT(*(reinterpret_cast<uword*>(end_) - 2) == 0x0320f809);
|
| Register reg;
|
| // The end of the pattern is the instruction after the delay slot of the jalr.
|
| - ic_data_load_end_ =
|
| - InstructionPattern::DecodeLoadWordFromPool(end_ - (3 * Instr::kInstrSize),
|
| - ®,
|
| - &target_code_pool_index_);
|
| + ic_data_load_end_ = InstructionPattern::DecodeLoadWordFromPool(
|
| + end_ - (3 * Instr::kInstrSize), ®, &target_code_pool_index_);
|
| ASSERT(reg == CODE_REG);
|
| }
|
|
|
| @@ -123,9 +121,7 @@ uword InstructionPattern::DecodeLoadWordFromPool(uword end,
|
| }
|
|
|
|
|
| -bool DecodeLoadObjectFromPoolOrThread(uword pc,
|
| - const Code& code,
|
| - Object* obj) {
|
| +bool DecodeLoadObjectFromPoolOrThread(uword pc, const Code& code, Object* obj) {
|
| ASSERT(code.ContainsInstructionAt(pc));
|
|
|
| Instr* instr = Instr::At(pc);
|
| @@ -151,9 +147,7 @@ bool DecodeLoadObjectFromPoolOrThread(uword pc,
|
| RawICData* CallPattern::IcData() {
|
| if (ic_data_.IsNull()) {
|
| Register reg;
|
| - InstructionPattern::DecodeLoadObject(ic_data_load_end_,
|
| - object_pool_,
|
| - ®,
|
| + InstructionPattern::DecodeLoadObject(ic_data_load_end_, object_pool_, ®,
|
| &ic_data_);
|
| ASSERT(reg == S5);
|
| }
|
| @@ -183,13 +177,10 @@ NativeCallPattern::NativeCallPattern(uword pc, const Code& code)
|
| ASSERT(*(reinterpret_cast<uword*>(end_) - 2) == 0x0320f809);
|
|
|
| Register reg;
|
| - uword native_function_load_end =
|
| - InstructionPattern::DecodeLoadWordFromPool(end_ - 3 * Instr::kInstrSize,
|
| - ®,
|
| - &target_code_pool_index_);
|
| + uword native_function_load_end = InstructionPattern::DecodeLoadWordFromPool(
|
| + end_ - 3 * Instr::kInstrSize, ®, &target_code_pool_index_);
|
| ASSERT(reg == CODE_REG);
|
| - InstructionPattern::DecodeLoadWordFromPool(native_function_load_end,
|
| - ®,
|
| + InstructionPattern::DecodeLoadWordFromPool(native_function_load_end, ®,
|
| &native_function_pool_index_);
|
| ASSERT(reg == T5);
|
| }
|
| @@ -215,7 +206,7 @@ NativeFunction NativeCallPattern::native_function() const {
|
|
|
| void NativeCallPattern::set_native_function(NativeFunction func) const {
|
| object_pool_.SetRawValueAt(native_function_pool_index_,
|
| - reinterpret_cast<uword>(func));
|
| + reinterpret_cast<uword>(func));
|
| }
|
|
|
|
|
| @@ -229,14 +220,11 @@ SwitchableCallPattern::SwitchableCallPattern(uword pc, const Code& code)
|
| ASSERT(*(reinterpret_cast<uword*>(pc) - 2) == 0x0320f809);
|
|
|
| Register reg;
|
| - uword data_load_end =
|
| - InstructionPattern::DecodeLoadWordFromPool(pc - 2 * Instr::kInstrSize,
|
| - ®,
|
| - &data_pool_index_);
|
| + uword data_load_end = InstructionPattern::DecodeLoadWordFromPool(
|
| + pc - 2 * Instr::kInstrSize, ®, &data_pool_index_);
|
| ASSERT(reg == S5);
|
| InstructionPattern::DecodeLoadWordFromPool(data_load_end - Instr::kInstrSize,
|
| - ®,
|
| - &target_pool_index_);
|
| + ®, &target_pool_index_);
|
| ASSERT(reg == CODE_REG);
|
| }
|
|
|
| @@ -247,8 +235,7 @@ RawObject* SwitchableCallPattern::data() const {
|
|
|
|
|
| RawCode* SwitchableCallPattern::target() const {
|
| - return reinterpret_cast<RawCode*>(
|
| - object_pool_.ObjectAt(target_pool_index_));
|
| + return reinterpret_cast<RawCode*>(object_pool_.ObjectAt(target_pool_index_));
|
| }
|
|
|
|
|
| @@ -264,15 +251,12 @@ void SwitchableCallPattern::SetTarget(const Code& target) const {
|
| }
|
|
|
|
|
| -ReturnPattern::ReturnPattern(uword pc)
|
| - : pc_(pc) {
|
| -}
|
| +ReturnPattern::ReturnPattern(uword pc) : pc_(pc) {}
|
|
|
|
|
| bool ReturnPattern::IsValid() const {
|
| Instr* jr = Instr::At(pc_);
|
| - return (jr->OpcodeField() == SPECIAL) &&
|
| - (jr->FunctionField() == JR) &&
|
| + return (jr->OpcodeField() == SPECIAL) && (jr->FunctionField() == JR) &&
|
| (jr->RsField() == RA);
|
| }
|
|
|
|
|