| Index: runtime/vm/instructions_arm64.cc
|
| diff --git a/runtime/vm/instructions_arm64.cc b/runtime/vm/instructions_arm64.cc
|
| index b7b26b52b2af72273c01bde8cada3b6697ba57b3..12b7fcf90a8f1e12495f67cc9b9e9f53de32a49a 100644
|
| --- a/runtime/vm/instructions_arm64.cc
|
| +++ b/runtime/vm/instructions_arm64.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,36 +49,30 @@ NativeCallPattern::NativeCallPattern(uword pc, const Code& code)
|
| ASSERT(reg == R5);
|
| }
|
|
|
| -
|
| RawCode* NativeCallPattern::target() const {
|
| return reinterpret_cast<RawCode*>(
|
| object_pool_.ObjectAt(target_code_pool_index_));
|
| }
|
|
|
| -
|
| void NativeCallPattern::set_target(const Code& target) const {
|
| object_pool_.SetObjectAt(target_code_pool_index_, 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));
|
| }
|
|
|
| -
|
| intptr_t InstructionPattern::OffsetFromPPIndex(intptr_t index) {
|
| return Array::element_offset(index);
|
| }
|
|
|
| -
|
| // 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
|
| @@ -108,7 +101,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
|
| @@ -182,7 +174,6 @@ uword InstructionPattern::DecodeLoadWordImmediate(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
|
| @@ -255,7 +246,6 @@ uword InstructionPattern::DecodeLoadWordFromPool(uword end,
|
| return start;
|
| }
|
|
|
| -
|
| bool DecodeLoadObjectFromPoolOrThread(uword pc, const Code& code, Object* obj) {
|
| ASSERT(code.ContainsInstructionAt(pc));
|
|
|
| @@ -281,7 +271,6 @@ bool DecodeLoadObjectFromPoolOrThread(uword pc, const Code& code, Object* obj) {
|
| return false;
|
| }
|
|
|
| -
|
| // Encodes a load sequence ending at 'end'. Encodes a fixed length two
|
| // instruction load from the pool pointer in PP using the destination
|
| // register reg as a temporary for the base address.
|
| @@ -302,7 +291,6 @@ void InstructionPattern::EncodeLoadWordFromPoolFixed(uword end,
|
| instr->SetInstructionBits(instr->InstructionBits() | B22);
|
| }
|
|
|
| -
|
| RawICData* CallPattern::IcData() {
|
| if (ic_data_.IsNull()) {
|
| Register reg;
|
| @@ -313,19 +301,16 @@ 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) const {
|
| object_pool_.SetObjectAt(target_code_pool_index_, target);
|
| // No need to flush the instruction cache, since the code is not modified.
|
| }
|
|
|
| -
|
| SwitchableCallPattern::SwitchableCallPattern(uword pc, const Code& code)
|
| : object_pool_(ObjectPool::Handle(code.GetObjectPool())),
|
| data_pool_index_(-1),
|
| @@ -343,32 +328,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 Register crn = ConcreteRegister(LR);
|
|
|