From: danno@chromium.org Date: Wed, 13 Mar 2013 11:40:26 +0000 (+0000) Subject: Use IsRuntimeEntry for RUNTIME_ENTRY comparison X-Git-Tag: upstream/4.7.83~14864 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cfb957af15b1e87d3481c824bb557251e8ab5c56;p=platform%2Fupstream%2Fv8.git Use IsRuntimeEntry for RUNTIME_ENTRY comparison Review URL: https://codereview.chromium.org/12702005 Patch from Haitao Feng . git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@13929 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- diff --git a/src/arm/assembler-arm-inl.h b/src/arm/assembler-arm-inl.h index 85a523d..123013b 100644 --- a/src/arm/assembler-arm-inl.h +++ b/src/arm/assembler-arm-inl.h @@ -107,13 +107,13 @@ void RelocInfo::apply(intptr_t delta) { Address RelocInfo::target_address() { - ASSERT(IsCodeTarget(rmode_) || rmode_ == RUNTIME_ENTRY); + ASSERT(IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_)); return Assembler::target_address_at(pc_); } Address RelocInfo::target_address_address() { - ASSERT(IsCodeTarget(rmode_) || rmode_ == RUNTIME_ENTRY + ASSERT(IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_) || rmode_ == EMBEDDED_OBJECT || rmode_ == EXTERNAL_REFERENCE); return reinterpret_cast
(Assembler::target_pointer_address_at(pc_)); @@ -126,7 +126,7 @@ int RelocInfo::target_address_size() { void RelocInfo::set_target_address(Address target, WriteBarrierMode mode) { - ASSERT(IsCodeTarget(rmode_) || rmode_ == RUNTIME_ENTRY); + ASSERT(IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_)); Assembler::set_target_address_at(pc_, target); if (mode == UPDATE_WRITE_BARRIER && host() != NULL && IsCodeTarget(rmode_)) { Object* target_code = Code::GetCodeFromTargetAddress(target); @@ -321,7 +321,7 @@ void RelocInfo::Visit(ObjectVisitor* visitor) { Isolate::Current()->debug()->has_break_points()) { visitor->VisitDebugTarget(this); #endif - } else if (mode == RelocInfo::RUNTIME_ENTRY) { + } else if (RelocInfo::IsRuntimeEntry(mode)) { visitor->VisitRuntimeEntry(this); } } @@ -348,7 +348,7 @@ void RelocInfo::Visit(Heap* heap) { IsPatchedDebugBreakSlotSequence()))) { StaticVisitor::VisitDebugTarget(heap, this); #endif - } else if (mode == RelocInfo::RUNTIME_ENTRY) { + } else if (RelocInfo::IsRuntimeEntry(mode)) { StaticVisitor::VisitRuntimeEntry(this); } } diff --git a/src/assembler.cc b/src/assembler.cc index 8d8208d..ec4aa93 100644 --- a/src/assembler.cc +++ b/src/assembler.cc @@ -811,7 +811,7 @@ void RelocInfo::Print(FILE* out) { } } else if (IsPosition(rmode_)) { PrintF(out, " (%" V8_PTR_PREFIX "d)", data()); - } else if (rmode_ == RelocInfo::RUNTIME_ENTRY && + } else if (IsRuntimeEntry(rmode_) && Isolate::Current()->deoptimizer_data() != NULL) { // Depotimization bailouts are stored as runtime entries. int id = Deoptimizer::GetDeoptimizationId( diff --git a/src/assembler.h b/src/assembler.h index f5ae611..1608972 100644 --- a/src/assembler.h +++ b/src/assembler.h @@ -373,7 +373,7 @@ class RelocInfo BASE_EMBEDDED { // Read/modify the code target in the branch/call instruction // this relocation applies to; - // can only be called if IsCodeTarget(rmode_) || rmode_ == RUNTIME_ENTRY + // can only be called if IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_) INLINE(Address target_address()); INLINE(void set_target_address(Address target, WriteBarrierMode mode = UPDATE_WRITE_BARRIER)); diff --git a/src/disassembler.cc b/src/disassembler.cc index 5d18d68..3830759 100644 --- a/src/disassembler.cc +++ b/src/disassembler.cc @@ -282,7 +282,7 @@ static int DecodeIt(Isolate* isolate, if (rmode == RelocInfo::CODE_TARGET_WITH_ID) { out.AddFormatted(" (id = %d)", static_cast(relocinfo.data())); } - } else if (rmode == RelocInfo::RUNTIME_ENTRY && + } else if (RelocInfo::IsRuntimeEntry(rmode) && isolate->deoptimizer_data() != NULL) { // A runtime entry reloinfo might be a deoptimization bailout. Address addr = relocinfo.target_address(); diff --git a/src/mips/assembler-mips-inl.h b/src/mips/assembler-mips-inl.h index 1dad815..9c9f611 100644 --- a/src/mips/assembler-mips-inl.h +++ b/src/mips/assembler-mips-inl.h @@ -139,14 +139,14 @@ void RelocInfo::apply(intptr_t delta) { Address RelocInfo::target_address() { - ASSERT(IsCodeTarget(rmode_) || rmode_ == RUNTIME_ENTRY); + ASSERT(IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_)); return Assembler::target_address_at(pc_); } Address RelocInfo::target_address_address() { ASSERT(IsCodeTarget(rmode_) || - rmode_ == RUNTIME_ENTRY || + IsRuntimeEntry(rmode_) || rmode_ == EMBEDDED_OBJECT || rmode_ == EXTERNAL_REFERENCE); // Read the address of the word containing the target_address in an @@ -174,7 +174,7 @@ int RelocInfo::target_address_size() { void RelocInfo::set_target_address(Address target, WriteBarrierMode mode) { - ASSERT(IsCodeTarget(rmode_) || rmode_ == RUNTIME_ENTRY); + ASSERT(IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_)); Assembler::set_target_address_at(pc_, target); if (mode == UPDATE_WRITE_BARRIER && host() != NULL && IsCodeTarget(rmode_)) { Object* target_code = Code::GetCodeFromTargetAddress(target); @@ -372,7 +372,7 @@ void RelocInfo::Visit(ObjectVisitor* visitor) { Isolate::Current()->debug()->has_break_points()) { visitor->VisitDebugTarget(this); #endif - } else if (mode == RelocInfo::RUNTIME_ENTRY) { + } else if (RelocInfo::IsRuntimeEntry(mode)) { visitor->VisitRuntimeEntry(this); } } @@ -399,7 +399,7 @@ void RelocInfo::Visit(Heap* heap) { IsPatchedDebugBreakSlotSequence()))) { StaticVisitor::VisitDebugTarget(heap, this); #endif - } else if (mode == RelocInfo::RUNTIME_ENTRY) { + } else if (RelocInfo::IsRuntimeEntry(mode)) { StaticVisitor::VisitRuntimeEntry(this); } } diff --git a/src/objects.cc b/src/objects.cc index a57e264..7559083 100644 --- a/src/objects.cc +++ b/src/objects.cc @@ -9110,7 +9110,7 @@ void Code::PrintDeoptLocation(int bailout_id) { } else if (last_comment != NULL && bailout_id == Deoptimizer::GetDeoptimizationId( info->target_address(), Deoptimizer::EAGER)) { - CHECK(info->rmode() == RelocInfo::RUNTIME_ENTRY); + CHECK(RelocInfo::IsRuntimeEntry(info->rmode())); PrintF(" %s\n", last_comment); return; }