| Index: src/ia32/macro-assembler-ia32.cc
|
| diff --git a/src/ia32/macro-assembler-ia32.cc b/src/ia32/macro-assembler-ia32.cc
|
| index a4cf3d72e90409cebad8cc0f5f579d80687197cd..556e71076b2ce54919416e547f8e349a365277b1 100644
|
| --- a/src/ia32/macro-assembler-ia32.cc
|
| +++ b/src/ia32/macro-assembler-ia32.cc
|
| @@ -454,7 +454,7 @@ void MacroAssembler::RecordWriteField(
|
| lea(dst, FieldOperand(object, offset));
|
| if (emit_debug_code()) {
|
| Label ok;
|
| - test_b(dst, (1 << kPointerSizeLog2) - 1);
|
| + test_b(dst, Immediate((1 << kPointerSizeLog2) - 1));
|
| j(zero, &ok, Label::kNear);
|
| int3();
|
| bind(&ok);
|
| @@ -487,7 +487,7 @@ void MacroAssembler::RecordWriteForMap(
|
| if (emit_debug_code()) {
|
| Label ok;
|
| lea(address, FieldOperand(object, HeapObject::kMapOffset));
|
| - test_b(address, (1 << kPointerSizeLog2) - 1);
|
| + test_b(address, Immediate((1 << kPointerSizeLog2) - 1));
|
| j(zero, &ok, Label::kNear);
|
| int3();
|
| bind(&ok);
|
| @@ -808,8 +808,7 @@ void MacroAssembler::CmpObjectType(Register heap_object,
|
|
|
|
|
| void MacroAssembler::CmpInstanceType(Register map, InstanceType type) {
|
| - cmpb(FieldOperand(map, Map::kInstanceTypeOffset),
|
| - static_cast<int8_t>(type));
|
| + cmpb(FieldOperand(map, Map::kInstanceTypeOffset), Immediate(type));
|
| }
|
|
|
|
|
| @@ -821,7 +820,7 @@ void MacroAssembler::CheckFastElements(Register map,
|
| STATIC_ASSERT(FAST_ELEMENTS == 2);
|
| STATIC_ASSERT(FAST_HOLEY_ELEMENTS == 3);
|
| cmpb(FieldOperand(map, Map::kBitField2Offset),
|
| - Map::kMaximumBitField2FastHoleyElementValue);
|
| + Immediate(Map::kMaximumBitField2FastHoleyElementValue));
|
| j(above, fail, distance);
|
| }
|
|
|
| @@ -834,10 +833,10 @@ void MacroAssembler::CheckFastObjectElements(Register map,
|
| STATIC_ASSERT(FAST_ELEMENTS == 2);
|
| STATIC_ASSERT(FAST_HOLEY_ELEMENTS == 3);
|
| cmpb(FieldOperand(map, Map::kBitField2Offset),
|
| - Map::kMaximumBitField2FastHoleySmiElementValue);
|
| + Immediate(Map::kMaximumBitField2FastHoleySmiElementValue));
|
| j(below_equal, fail, distance);
|
| cmpb(FieldOperand(map, Map::kBitField2Offset),
|
| - Map::kMaximumBitField2FastHoleyElementValue);
|
| + Immediate(Map::kMaximumBitField2FastHoleyElementValue));
|
| j(above, fail, distance);
|
| }
|
|
|
| @@ -848,7 +847,7 @@ void MacroAssembler::CheckFastSmiElements(Register map,
|
| STATIC_ASSERT(FAST_SMI_ELEMENTS == 0);
|
| STATIC_ASSERT(FAST_HOLEY_SMI_ELEMENTS == 1);
|
| cmpb(FieldOperand(map, Map::kBitField2Offset),
|
| - Map::kMaximumBitField2FastHoleySmiElementValue);
|
| + Immediate(Map::kMaximumBitField2FastHoleySmiElementValue));
|
| j(above, fail, distance);
|
| }
|
|
|
| @@ -937,7 +936,7 @@ Condition MacroAssembler::IsObjectNameType(Register heap_object,
|
| Register instance_type) {
|
| mov(map, FieldOperand(heap_object, HeapObject::kMapOffset));
|
| movzx_b(instance_type, FieldOperand(map, Map::kInstanceTypeOffset));
|
| - cmpb(instance_type, static_cast<uint8_t>(LAST_NAME_TYPE));
|
| + cmpb(instance_type, Immediate(LAST_NAME_TYPE));
|
| return below_equal;
|
| }
|
|
|
| @@ -2003,7 +2002,7 @@ void MacroAssembler::BooleanBitTest(Register object,
|
| int byte_index = bit_index / kBitsPerByte;
|
| int byte_bit_index = bit_index & (kBitsPerByte - 1);
|
| test_b(FieldOperand(object, field_offset + byte_index),
|
| - static_cast<byte>(1 << byte_bit_index));
|
| + Immediate(1 << byte_bit_index));
|
| }
|
|
|
|
|
| @@ -2324,7 +2323,7 @@ void MacroAssembler::FloodFunctionIfStepping(Register fun, Register new_target,
|
| Label skip_flooding;
|
| ExternalReference step_in_enabled =
|
| ExternalReference::debug_step_in_enabled_address(isolate());
|
| - cmpb(Operand::StaticVariable(step_in_enabled), 0);
|
| + cmpb(Operand::StaticVariable(step_in_enabled), Immediate(0));
|
| j(equal, &skip_flooding);
|
| {
|
| FrameScope frame(this,
|
| @@ -3014,7 +3013,7 @@ void MacroAssembler::JumpIfNotUniqueNameInstanceType(Operand operand,
|
| Label succeed;
|
| test(operand, Immediate(kIsNotStringMask | kIsNotInternalizedMask));
|
| j(zero, &succeed);
|
| - cmpb(operand, static_cast<uint8_t>(SYMBOL_TYPE));
|
| + cmpb(operand, Immediate(SYMBOL_TYPE));
|
| j(not_equal, not_unique_name, distance);
|
|
|
| bind(&succeed);
|
| @@ -3162,8 +3161,7 @@ void MacroAssembler::CheckPageFlag(
|
| and_(scratch, object);
|
| }
|
| if (mask < (1 << kBitsPerByte)) {
|
| - test_b(Operand(scratch, MemoryChunk::kFlagsOffset),
|
| - static_cast<uint8_t>(mask));
|
| + test_b(Operand(scratch, MemoryChunk::kFlagsOffset), Immediate(mask));
|
| } else {
|
| test(Operand(scratch, MemoryChunk::kFlagsOffset), Immediate(mask));
|
| }
|
| @@ -3186,7 +3184,7 @@ void MacroAssembler::CheckPageFlagForMap(
|
| DCHECK(!isolate()->heap()->mark_compact_collector()->
|
| IsOnEvacuationCandidate(*map));
|
| if (mask < (1 << kBitsPerByte)) {
|
| - test_b(Operand::StaticVariable(reference), static_cast<uint8_t>(mask));
|
| + test_b(Operand::StaticVariable(reference), Immediate(mask));
|
| } else {
|
| test(Operand::StaticVariable(reference), Immediate(mask));
|
| }
|
| @@ -3226,7 +3224,8 @@ void MacroAssembler::HasColor(Register object,
|
| jmp(&other_color, Label::kNear);
|
|
|
| bind(&word_boundary);
|
| - test_b(Operand(bitmap_scratch, MemoryChunk::kHeaderSize + kPointerSize), 1);
|
| + test_b(Operand(bitmap_scratch, MemoryChunk::kHeaderSize + kPointerSize),
|
| + Immediate(1));
|
|
|
| j(second_bit == 1 ? not_zero : zero, has_color, has_color_distance);
|
| bind(&other_color);
|
|
|