From c44a4d383c67ae3c2d685050cc633e87417f36b4 Mon Sep 17 00:00:00 2001 From: "svenpanne@chromium.org" Date: Thu, 7 Nov 2013 08:23:09 +0000 Subject: [PATCH] Removed useless getter/setter. R=bmeurer@chromium.org Review URL: https://codereview.chromium.org/64013002 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@17541 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/arm/assembler-arm-inl.h | 22 ++++++---------------- src/arm/assembler-arm.h | 4 ---- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/src/arm/assembler-arm-inl.h b/src/arm/assembler-arm-inl.h index dff8162..f93a9a6 100644 --- a/src/arm/assembler-arm-inl.h +++ b/src/arm/assembler-arm-inl.h @@ -126,21 +126,21 @@ void RelocInfo::set_target_address(Address target, WriteBarrierMode mode) { Object* RelocInfo::target_object() { ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT); - return reinterpret_cast(Assembler::target_pointer_at(pc_)); + return reinterpret_cast(Assembler::target_address_at(pc_)); } Handle RelocInfo::target_object_handle(Assembler* origin) { ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT); return Handle(reinterpret_cast( - Assembler::target_pointer_at(pc_))); + Assembler::target_address_at(pc_))); } void RelocInfo::set_target_object(Object* target, WriteBarrierMode mode) { ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT); ASSERT(!target->IsConsString()); - Assembler::set_target_pointer_at(pc_, reinterpret_cast
(target)); + Assembler::set_target_address_at(pc_, reinterpret_cast
(target)); if (mode == UPDATE_WRITE_BARRIER && host() != NULL && target->IsHeapObject()) { @@ -263,7 +263,7 @@ void RelocInfo::WipeOut() { IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_) || IsExternalReference(rmode_)); - Assembler::set_target_pointer_at(pc_, NULL); + Assembler::set_target_address_at(pc_, NULL); } @@ -397,7 +397,7 @@ Address Assembler::target_pointer_address_at(Address pc) { } -Address Assembler::target_pointer_at(Address pc) { +Address Assembler::target_address_at(Address pc) { if (IsMovW(Memory::int32_at(pc))) { ASSERT(IsMovT(Memory::int32_at(pc + kInstrSize))); Instruction* instr = Instruction::At(pc); @@ -464,7 +464,7 @@ static Instr EncodeMovwImmediate(uint32_t immediate) { } -void Assembler::set_target_pointer_at(Address pc, Address target) { +void Assembler::set_target_address_at(Address pc, Address target) { if (IsMovW(Memory::int32_at(pc))) { ASSERT(IsMovT(Memory::int32_at(pc + kInstrSize))); uint32_t* instr_ptr = reinterpret_cast(pc); @@ -495,16 +495,6 @@ void Assembler::set_target_pointer_at(Address pc, Address target) { } -Address Assembler::target_address_at(Address pc) { - return target_pointer_at(pc); -} - - -void Assembler::set_target_address_at(Address pc, Address target) { - set_target_pointer_at(pc, target); -} - - } } // namespace v8::internal #endif // V8_ARM_ASSEMBLER_ARM_INL_H_ diff --git a/src/arm/assembler-arm.h b/src/arm/assembler-arm.h index 0437b3f..9bfdc9e 100644 --- a/src/arm/assembler-arm.h +++ b/src/arm/assembler-arm.h @@ -785,10 +785,6 @@ class Assembler : public AssemblerBase { // the branch/call instruction at pc, or the object in a mov. INLINE(static Address target_pointer_address_at(Address pc)); - // Read/Modify the pointer in the branch/call/move instruction at pc. - INLINE(static Address target_pointer_at(Address pc)); - INLINE(static void set_target_pointer_at(Address pc, Address target)); - // Read/Modify the code target address in the branch/call instruction at pc. INLINE(static Address target_address_at(Address pc)); INLINE(static void set_target_address_at(Address pc, Address target)); -- 2.7.4