Chromium Code Reviews| Index: runtime/vm/instructions_mips.cc |
| =================================================================== |
| --- runtime/vm/instructions_mips.cc (revision 20488) |
| +++ runtime/vm/instructions_mips.cc (working copy) |
| @@ -13,8 +13,20 @@ |
| CallPattern::CallPattern(uword pc, const Code& code) |
| : end_(reinterpret_cast<uword*>(pc)), |
| - pool_index_(DecodePoolIndex()), |
| - object_pool_(Array::Handle(code.ObjectPool())) { } |
| + target_address_pool_index_(-1), |
| + args_desc_load_end_(-1), |
| + args_desc_pool_index_(-1), |
| + ic_data_load_end_(-1), |
| + ic_data_pool_index_(-1), |
| + object_pool_(Array::Handle(code.ObjectPool())) { |
| + ASSERT(code.ContainsInstructionAt(pc)); |
| + ASSERT(Back(2) == 0x0020f809); // Last instruction: jalr RA, TMP(=R1) |
| + Register reg; |
| + // First end is 0 so that we begin from the delay slot of the jalr. |
| + args_desc_load_end_ = |
| + DecodeLoadWordFromPool(2, ®, &target_address_pool_index_); |
| + ASSERT(reg == TMP); |
| +} |
| uword CallPattern::Back(int n) const { |
| @@ -23,18 +35,66 @@ |
| } |
| -int CallPattern::DecodePoolIndex() { |
| +int CallPattern::DecodeLoadWordFromPool(int end, Register* reg, int* index) { |
| + ASSERT(end > 0); |
| + uword i = Back(++end); |
| + Instr* instr = Instr::At(reinterpret_cast<uword>(&i)); |
| + int offset = 0; |
| + if ((instr->OpcodeField() == LW) && (instr->RsField() == PP)) { |
| + offset = instr->SImmField(); |
| + *reg = instr->RtField(); |
| + } else { |
| + ASSERT(instr->OpcodeField() == LW); |
| + offset = instr->SImmField(); |
| + i = Back(++end); |
| + instr = Instr::At(reinterpret_cast<uword>(&i)); |
| + ASSERT((instr->OpcodeField() == SPECIAL) && |
| + (instr->FunctionField() == ADDU)); |
| + *reg = instr->RdField(); |
| + i = Back(++end); |
| + instr = Instr::At(reinterpret_cast<uword>(&i)); |
| + if (instr->OpcodeField() == ADDIU) { |
| + ASSERT((instr->RsField() == R0) && (instr->RtField() == *reg)); |
| + offset = instr->SImmField(); |
|
regis
2013/03/26 00:49:06
Shouldn't it be offset |= ?
zra
2013/03/26 17:29:07
Fixed-up to match LoadWordFromPoolOffset
|
| + } else { |
| + ASSERT((instr->OpcodeField() == ORI) && (instr->RtField() == *reg) && |
| + (instr->RsField() == *reg)); |
| + offset |= instr->UImmField(); |
| + i = Back(++end); |
| + instr = Instr::At(reinterpret_cast<uword>(&i)); |
| + ASSERT((instr->OpcodeField() == LUI) && (instr->RtField() == *reg)); |
| + offset |= (instr->UImmField() << 16); |
| + } |
| + } |
| + offset += kHeapObjectTag; |
| + ASSERT(Utils::IsAligned(offset, 4)); |
| + *index = (offset - Array::data_offset())/4; |
| + return end; |
| +} |
| + |
| + |
| +RawICData* CallPattern::IcData() { |
| UNIMPLEMENTED(); |
| - return 0; |
| + return NULL; |
| } |
| -uword CallPattern::TargetAddress() const { |
| +RawArray* CallPattern::ArgumentsDescriptor() { |
| UNIMPLEMENTED(); |
| - return 0; |
| + return NULL; |
| } |
| +uword CallPattern::TargetAddress() const { |
| + ASSERT(target_address_pool_index_ >= 0); |
| + const Object& target_address = |
| + Object::Handle(object_pool_.At(target_address_pool_index_)); |
| + ASSERT(target_address.IsSmi()); |
| + // The address is stored in the object array as a RawSmi. |
| + return reinterpret_cast<uword>(target_address.raw()); |
| +} |
| + |
| + |
| void CallPattern::SetTargetAddress(uword target_address) const { |
| UNIMPLEMENTED(); |
| } |