| Index: src/mips/assembler-mips-inl.h
|
| diff --git a/src/mips/assembler-mips-inl.h b/src/mips/assembler-mips-inl.h
|
| index cf8865b875d690db6e35dcad7fc6e74b06d425f6..db986f5eff1234001e2725f220dd6944b412e706 100644
|
| --- a/src/mips/assembler-mips-inl.h
|
| +++ b/src/mips/assembler-mips-inl.h
|
| @@ -100,11 +100,11 @@ int DoubleRegister::NumAllocatableRegisters() {
|
|
|
|
|
| int FPURegister::ToAllocationIndex(FPURegister reg) {
|
| - ASSERT(reg.code() % 2 == 0);
|
| - ASSERT(reg.code() / 2 < kMaxNumAllocatableRegisters);
|
| - ASSERT(reg.is_valid());
|
| - ASSERT(!reg.is(kDoubleRegZero));
|
| - ASSERT(!reg.is(kLithiumScratchDouble));
|
| + DCHECK(reg.code() % 2 == 0);
|
| + DCHECK(reg.code() / 2 < kMaxNumAllocatableRegisters);
|
| + DCHECK(reg.is_valid());
|
| + DCHECK(!reg.is(kDoubleRegZero));
|
| + DCHECK(!reg.is(kLithiumScratchDouble));
|
| return (reg.code() / 2);
|
| }
|
|
|
| @@ -131,13 +131,13 @@ void RelocInfo::apply(intptr_t delta, ICacheFlushMode icache_flush_mode) {
|
|
|
|
|
| Address RelocInfo::target_address() {
|
| - ASSERT(IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_));
|
| + DCHECK(IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_));
|
| return Assembler::target_address_at(pc_, host_);
|
| }
|
|
|
|
|
| Address RelocInfo::target_address_address() {
|
| - ASSERT(IsCodeTarget(rmode_) ||
|
| + DCHECK(IsCodeTarget(rmode_) ||
|
| IsRuntimeEntry(rmode_) ||
|
| rmode_ == EMBEDDED_OBJECT ||
|
| rmode_ == EXTERNAL_REFERENCE);
|
| @@ -174,7 +174,7 @@ int RelocInfo::target_address_size() {
|
| void RelocInfo::set_target_address(Address target,
|
| WriteBarrierMode write_barrier_mode,
|
| ICacheFlushMode icache_flush_mode) {
|
| - ASSERT(IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_));
|
| + DCHECK(IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_));
|
| Assembler::set_target_address_at(pc_, host_, target, icache_flush_mode);
|
| if (write_barrier_mode == UPDATE_WRITE_BARRIER &&
|
| host() != NULL && IsCodeTarget(rmode_)) {
|
| @@ -191,13 +191,13 @@ Address Assembler::target_address_from_return_address(Address pc) {
|
|
|
|
|
| Object* RelocInfo::target_object() {
|
| - ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT);
|
| + DCHECK(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT);
|
| return reinterpret_cast<Object*>(Assembler::target_address_at(pc_, host_));
|
| }
|
|
|
|
|
| Handle<Object> RelocInfo::target_object_handle(Assembler* origin) {
|
| - ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT);
|
| + DCHECK(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT);
|
| return Handle<Object>(reinterpret_cast<Object**>(
|
| Assembler::target_address_at(pc_, host_)));
|
| }
|
| @@ -206,7 +206,7 @@ Handle<Object> RelocInfo::target_object_handle(Assembler* origin) {
|
| void RelocInfo::set_target_object(Object* target,
|
| WriteBarrierMode write_barrier_mode,
|
| ICacheFlushMode icache_flush_mode) {
|
| - ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT);
|
| + DCHECK(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT);
|
| Assembler::set_target_address_at(pc_, host_,
|
| reinterpret_cast<Address>(target),
|
| icache_flush_mode);
|
| @@ -220,13 +220,13 @@ void RelocInfo::set_target_object(Object* target,
|
|
|
|
|
| Address RelocInfo::target_reference() {
|
| - ASSERT(rmode_ == EXTERNAL_REFERENCE);
|
| + DCHECK(rmode_ == EXTERNAL_REFERENCE);
|
| return Assembler::target_address_at(pc_, host_);
|
| }
|
|
|
|
|
| Address RelocInfo::target_runtime_entry(Assembler* origin) {
|
| - ASSERT(IsRuntimeEntry(rmode_));
|
| + DCHECK(IsRuntimeEntry(rmode_));
|
| return target_address();
|
| }
|
|
|
| @@ -234,21 +234,21 @@ Address RelocInfo::target_runtime_entry(Assembler* origin) {
|
| void RelocInfo::set_target_runtime_entry(Address target,
|
| WriteBarrierMode write_barrier_mode,
|
| ICacheFlushMode icache_flush_mode) {
|
| - ASSERT(IsRuntimeEntry(rmode_));
|
| + DCHECK(IsRuntimeEntry(rmode_));
|
| if (target_address() != target)
|
| set_target_address(target, write_barrier_mode, icache_flush_mode);
|
| }
|
|
|
|
|
| Handle<Cell> RelocInfo::target_cell_handle() {
|
| - ASSERT(rmode_ == RelocInfo::CELL);
|
| + DCHECK(rmode_ == RelocInfo::CELL);
|
| Address address = Memory::Address_at(pc_);
|
| return Handle<Cell>(reinterpret_cast<Cell**>(address));
|
| }
|
|
|
|
|
| Cell* RelocInfo::target_cell() {
|
| - ASSERT(rmode_ == RelocInfo::CELL);
|
| + DCHECK(rmode_ == RelocInfo::CELL);
|
| return Cell::FromValueAddress(Memory::Address_at(pc_));
|
| }
|
|
|
| @@ -256,7 +256,7 @@ Cell* RelocInfo::target_cell() {
|
| void RelocInfo::set_target_cell(Cell* cell,
|
| WriteBarrierMode write_barrier_mode,
|
| ICacheFlushMode icache_flush_mode) {
|
| - ASSERT(rmode_ == RelocInfo::CELL);
|
| + DCHECK(rmode_ == RelocInfo::CELL);
|
| Address address = cell->address() + Cell::kValueOffset;
|
| Memory::Address_at(pc_) = address;
|
| if (write_barrier_mode == UPDATE_WRITE_BARRIER && host() != NULL) {
|
| @@ -278,7 +278,7 @@ Handle<Object> RelocInfo::code_age_stub_handle(Assembler* origin) {
|
|
|
|
|
| Code* RelocInfo::code_age_stub() {
|
| - ASSERT(rmode_ == RelocInfo::CODE_AGE_SEQUENCE);
|
| + DCHECK(rmode_ == RelocInfo::CODE_AGE_SEQUENCE);
|
| return Code::GetCodeFromTargetAddress(
|
| Assembler::target_address_at(pc_ + Assembler::kInstrSize, host_));
|
| }
|
| @@ -286,7 +286,7 @@ Code* RelocInfo::code_age_stub() {
|
|
|
| void RelocInfo::set_code_age_stub(Code* stub,
|
| ICacheFlushMode icache_flush_mode) {
|
| - ASSERT(rmode_ == RelocInfo::CODE_AGE_SEQUENCE);
|
| + DCHECK(rmode_ == RelocInfo::CODE_AGE_SEQUENCE);
|
| Assembler::set_target_address_at(pc_ + Assembler::kInstrSize,
|
| host_,
|
| stub->instruction_start());
|
| @@ -294,7 +294,7 @@ void RelocInfo::set_code_age_stub(Code* stub,
|
|
|
|
|
| Address RelocInfo::call_address() {
|
| - ASSERT((IsJSReturn(rmode()) && IsPatchedReturnSequence()) ||
|
| + DCHECK((IsJSReturn(rmode()) && IsPatchedReturnSequence()) ||
|
| (IsDebugBreakSlot(rmode()) && IsPatchedDebugBreakSlotSequence()));
|
| // The pc_ offset of 0 assumes mips patched return sequence per
|
| // debug-mips.cc BreakLocationIterator::SetDebugBreakAtReturn(), or
|
| @@ -304,7 +304,7 @@ Address RelocInfo::call_address() {
|
|
|
|
|
| void RelocInfo::set_call_address(Address target) {
|
| - ASSERT((IsJSReturn(rmode()) && IsPatchedReturnSequence()) ||
|
| + DCHECK((IsJSReturn(rmode()) && IsPatchedReturnSequence()) ||
|
| (IsDebugBreakSlot(rmode()) && IsPatchedDebugBreakSlotSequence()));
|
| // The pc_ offset of 0 assumes mips patched return sequence per
|
| // debug-mips.cc BreakLocationIterator::SetDebugBreakAtReturn(), or
|
| @@ -324,7 +324,7 @@ Object* RelocInfo::call_object() {
|
|
|
|
|
| Object** RelocInfo::call_object_address() {
|
| - ASSERT((IsJSReturn(rmode()) && IsPatchedReturnSequence()) ||
|
| + DCHECK((IsJSReturn(rmode()) && IsPatchedReturnSequence()) ||
|
| (IsDebugBreakSlot(rmode()) && IsPatchedDebugBreakSlotSequence()));
|
| return reinterpret_cast<Object**>(pc_ + 2 * Assembler::kInstrSize);
|
| }
|
| @@ -336,7 +336,7 @@ void RelocInfo::set_call_object(Object* target) {
|
|
|
|
|
| void RelocInfo::WipeOut() {
|
| - ASSERT(IsEmbeddedObject(rmode_) ||
|
| + DCHECK(IsEmbeddedObject(rmode_) ||
|
| IsCodeTarget(rmode_) ||
|
| IsRuntimeEntry(rmode_) ||
|
| IsExternalReference(rmode_));
|
|
|