| Index: src/arm/macro-assembler-arm.h
|
| diff --git a/src/arm/macro-assembler-arm.h b/src/arm/macro-assembler-arm.h
|
| index aa19806662fc2e474e22db63619da405c070867c..d5ca12e4f45ca1b7e13a0b02529629a897ac143a 100644
|
| --- a/src/arm/macro-assembler-arm.h
|
| +++ b/src/arm/macro-assembler-arm.h
|
| @@ -314,7 +314,7 @@ class MacroAssembler: public Assembler {
|
|
|
| // Push two registers. Pushes leftmost register first (to highest address).
|
| void Push(Register src1, Register src2, Condition cond = al) {
|
| - ASSERT(!src1.is(src2));
|
| + DCHECK(!src1.is(src2));
|
| if (src1.code() > src2.code()) {
|
| stm(db_w, sp, src1.bit() | src2.bit(), cond);
|
| } else {
|
| @@ -325,9 +325,9 @@ class MacroAssembler: public Assembler {
|
|
|
| // Push three registers. Pushes leftmost register first (to highest address).
|
| void Push(Register src1, Register src2, Register src3, Condition cond = al) {
|
| - ASSERT(!src1.is(src2));
|
| - ASSERT(!src2.is(src3));
|
| - ASSERT(!src1.is(src3));
|
| + DCHECK(!src1.is(src2));
|
| + DCHECK(!src2.is(src3));
|
| + DCHECK(!src1.is(src3));
|
| if (src1.code() > src2.code()) {
|
| if (src2.code() > src3.code()) {
|
| stm(db_w, sp, src1.bit() | src2.bit() | src3.bit(), cond);
|
| @@ -347,12 +347,12 @@ class MacroAssembler: public Assembler {
|
| Register src3,
|
| Register src4,
|
| Condition cond = al) {
|
| - ASSERT(!src1.is(src2));
|
| - ASSERT(!src2.is(src3));
|
| - ASSERT(!src1.is(src3));
|
| - ASSERT(!src1.is(src4));
|
| - ASSERT(!src2.is(src4));
|
| - ASSERT(!src3.is(src4));
|
| + DCHECK(!src1.is(src2));
|
| + DCHECK(!src2.is(src3));
|
| + DCHECK(!src1.is(src3));
|
| + DCHECK(!src1.is(src4));
|
| + DCHECK(!src2.is(src4));
|
| + DCHECK(!src3.is(src4));
|
| if (src1.code() > src2.code()) {
|
| if (src2.code() > src3.code()) {
|
| if (src3.code() > src4.code()) {
|
| @@ -376,7 +376,7 @@ class MacroAssembler: public Assembler {
|
|
|
| // Pop two registers. Pops rightmost register first (from lower address).
|
| void Pop(Register src1, Register src2, Condition cond = al) {
|
| - ASSERT(!src1.is(src2));
|
| + DCHECK(!src1.is(src2));
|
| if (src1.code() > src2.code()) {
|
| ldm(ia_w, sp, src1.bit() | src2.bit(), cond);
|
| } else {
|
| @@ -387,9 +387,9 @@ class MacroAssembler: public Assembler {
|
|
|
| // Pop three registers. Pops rightmost register first (from lower address).
|
| void Pop(Register src1, Register src2, Register src3, Condition cond = al) {
|
| - ASSERT(!src1.is(src2));
|
| - ASSERT(!src2.is(src3));
|
| - ASSERT(!src1.is(src3));
|
| + DCHECK(!src1.is(src2));
|
| + DCHECK(!src2.is(src3));
|
| + DCHECK(!src1.is(src3));
|
| if (src1.code() > src2.code()) {
|
| if (src2.code() > src3.code()) {
|
| ldm(ia_w, sp, src1.bit() | src2.bit() | src3.bit(), cond);
|
| @@ -409,12 +409,12 @@ class MacroAssembler: public Assembler {
|
| Register src3,
|
| Register src4,
|
| Condition cond = al) {
|
| - ASSERT(!src1.is(src2));
|
| - ASSERT(!src2.is(src3));
|
| - ASSERT(!src1.is(src3));
|
| - ASSERT(!src1.is(src4));
|
| - ASSERT(!src2.is(src4));
|
| - ASSERT(!src3.is(src4));
|
| + DCHECK(!src1.is(src2));
|
| + DCHECK(!src2.is(src3));
|
| + DCHECK(!src1.is(src3));
|
| + DCHECK(!src1.is(src4));
|
| + DCHECK(!src2.is(src4));
|
| + DCHECK(!src3.is(src4));
|
| if (src1.code() > src2.code()) {
|
| if (src2.code() > src3.code()) {
|
| if (src3.code() > src4.code()) {
|
| @@ -687,7 +687,7 @@ class MacroAssembler: public Assembler {
|
| // These instructions are generated to mark special location in the code,
|
| // like some special IC code.
|
| static inline bool IsMarkedCode(Instr instr, int type) {
|
| - ASSERT((FIRST_IC_MARKER <= type) && (type < LAST_CODE_MARKER));
|
| + DCHECK((FIRST_IC_MARKER <= type) && (type < LAST_CODE_MARKER));
|
| return IsNop(instr, type);
|
| }
|
|
|
| @@ -707,7 +707,7 @@ class MacroAssembler: public Assembler {
|
| (FIRST_IC_MARKER <= dst_reg) && (dst_reg < LAST_CODE_MARKER)
|
| ? src_reg
|
| : -1;
|
| - ASSERT((type == -1) ||
|
| + DCHECK((type == -1) ||
|
| ((FIRST_IC_MARKER <= type) && (type < LAST_CODE_MARKER)));
|
| return type;
|
| }
|
| @@ -947,7 +947,7 @@ class MacroAssembler: public Assembler {
|
| ldr(type, FieldMemOperand(obj, HeapObject::kMapOffset), cond);
|
| ldrb(type, FieldMemOperand(type, Map::kInstanceTypeOffset), cond);
|
| tst(type, Operand(kIsNotStringMask), cond);
|
| - ASSERT_EQ(0, kStringTag);
|
| + DCHECK_EQ(0, kStringTag);
|
| return eq;
|
| }
|
|
|
| @@ -1144,7 +1144,7 @@ class MacroAssembler: public Assembler {
|
| void GetBuiltinFunction(Register target, Builtins::JavaScript id);
|
|
|
| Handle<Object> CodeObject() {
|
| - ASSERT(!code_object_.is_null());
|
| + DCHECK(!code_object_.is_null());
|
| return code_object_;
|
| }
|
|
|
| @@ -1547,7 +1547,7 @@ class FrameAndConstantPoolScope {
|
| old_constant_pool_available_(masm->is_constant_pool_available()) {
|
| // We only want to enable constant pool access for non-manual frame scopes
|
| // to ensure the constant pool pointer is valid throughout the scope.
|
| - ASSERT(type_ != StackFrame::MANUAL && type_ != StackFrame::NONE);
|
| + DCHECK(type_ != StackFrame::MANUAL && type_ != StackFrame::NONE);
|
| masm->set_has_frame(true);
|
| masm->set_constant_pool_available(true);
|
| masm->EnterFrame(type, !old_constant_pool_available_);
|
| @@ -1565,7 +1565,7 @@ class FrameAndConstantPoolScope {
|
| // scope, the MacroAssembler is still marked as being in a frame scope, and
|
| // the code will be generated again when it goes out of scope.
|
| void GenerateLeaveFrame() {
|
| - ASSERT(type_ != StackFrame::MANUAL && type_ != StackFrame::NONE);
|
| + DCHECK(type_ != StackFrame::MANUAL && type_ != StackFrame::NONE);
|
| masm_->LeaveFrame(type_);
|
| }
|
|
|
|
|