Index: runtime/vm/instructions_arm.cc |
diff --git a/runtime/vm/instructions_arm.cc b/runtime/vm/instructions_arm.cc |
index 8de71dbd38df3d63baf7c65cc50431ca2d74d1fe..0b0bf6448206e68ddbe407efffafe0d4309e6125 100644 |
--- a/runtime/vm/instructions_arm.cc |
+++ b/runtime/vm/instructions_arm.cc |
@@ -31,7 +31,6 @@ CallPattern::CallPattern(uword pc, const Code& code) |
ASSERT(reg == CODE_REG); |
} |
- |
NativeCallPattern::NativeCallPattern(uword pc, const Code& code) |
: object_pool_(ObjectPool::Handle(code.GetObjectPool())), |
end_(pc), |
@@ -50,31 +49,26 @@ NativeCallPattern::NativeCallPattern(uword pc, const Code& code) |
ASSERT(reg == R9); |
} |
- |
RawCode* NativeCallPattern::target() const { |
return reinterpret_cast<RawCode*>( |
object_pool_.ObjectAt(target_code_pool_index_)); |
} |
- |
void NativeCallPattern::set_target(const Code& new_target) const { |
object_pool_.SetObjectAt(target_code_pool_index_, new_target); |
// No need to flush the instruction cache, since the code is not modified. |
} |
- |
NativeFunction NativeCallPattern::native_function() const { |
return reinterpret_cast<NativeFunction>( |
object_pool_.RawValueAt(native_function_pool_index_)); |
} |
- |
void NativeCallPattern::set_native_function(NativeFunction func) const { |
object_pool_.SetRawValueAt(native_function_pool_index_, |
reinterpret_cast<uword>(func)); |
} |
- |
// Decodes a load sequence ending at 'end' (the last instruction of the load |
// sequence is the instruction before the one at end). Returns a pointer to |
// the first instruction in the sequence. Returns the register being loaded |
@@ -99,7 +93,6 @@ uword InstructionPattern::DecodeLoadObject(uword end, |
return start; |
} |
- |
// Decodes a load sequence ending at 'end' (the last instruction of the load |
// sequence is the instruction before the one at end). Returns a pointer to |
// the first instruction in the sequence. Returns the register being loaded |
@@ -150,7 +143,6 @@ uword InstructionPattern::DecodeLoadWordImmediate(uword end, |
return start; |
} |
- |
static bool IsLoadWithOffset(int32_t instr, |
Register base, |
intptr_t* offset, |
@@ -164,7 +156,6 @@ static bool IsLoadWithOffset(int32_t instr, |
return false; |
} |
- |
// Decodes a load sequence ending at 'end' (the last instruction of the load |
// sequence is the instruction before the one at end). Returns a pointer to |
// the first instruction in the sequence. Returns the register being loaded |
@@ -199,7 +190,6 @@ uword InstructionPattern::DecodeLoadWordFromPool(uword end, |
return start; |
} |
- |
bool DecodeLoadObjectFromPoolOrThread(uword pc, const Code& code, Object* obj) { |
ASSERT(code.ContainsInstructionAt(pc)); |
@@ -221,7 +211,6 @@ bool DecodeLoadObjectFromPoolOrThread(uword pc, const Code& code, Object* obj) { |
return false; |
} |
- |
RawICData* CallPattern::IcData() { |
if (ic_data_.IsNull()) { |
Register reg; |
@@ -232,18 +221,15 @@ RawICData* CallPattern::IcData() { |
return ic_data_.raw(); |
} |
- |
RawCode* CallPattern::TargetCode() const { |
return reinterpret_cast<RawCode*>( |
object_pool_.ObjectAt(target_code_pool_index_)); |
} |
- |
void CallPattern::SetTargetCode(const Code& target_code) const { |
object_pool_.SetObjectAt(target_code_pool_index_, target_code); |
} |
- |
SwitchableCallPattern::SwitchableCallPattern(uword pc, const Code& code) |
: object_pool_(ObjectPool::Handle(code.GetObjectPool())), |
data_pool_index_(-1), |
@@ -261,32 +247,26 @@ SwitchableCallPattern::SwitchableCallPattern(uword pc, const Code& code) |
ASSERT(reg == CODE_REG); |
} |
- |
RawObject* SwitchableCallPattern::data() const { |
return object_pool_.ObjectAt(data_pool_index_); |
} |
- |
RawCode* SwitchableCallPattern::target() const { |
return reinterpret_cast<RawCode*>(object_pool_.ObjectAt(target_pool_index_)); |
} |
- |
void SwitchableCallPattern::SetData(const Object& data) const { |
ASSERT(!Object::Handle(object_pool_.ObjectAt(data_pool_index_)).IsCode()); |
object_pool_.SetObjectAt(data_pool_index_, data); |
} |
- |
void SwitchableCallPattern::SetTarget(const Code& target) const { |
ASSERT(Object::Handle(object_pool_.ObjectAt(target_pool_index_)).IsCode()); |
object_pool_.SetObjectAt(target_pool_index_, target); |
} |
- |
ReturnPattern::ReturnPattern(uword pc) : pc_(pc) {} |
- |
bool ReturnPattern::IsValid() const { |
Instr* bx_lr = Instr::At(pc_); |
const int32_t B4 = 1 << 4; |