Index: src/ia32/code-stubs-ia32.cc |
diff --git a/src/ia32/code-stubs-ia32.cc b/src/ia32/code-stubs-ia32.cc |
index fa67502ad0de1123811b5c597aa0274d2d31e9cd..548a132f83349bc5f4956c881eb5151eaf3bb48e 100644 |
--- a/src/ia32/code-stubs-ia32.cc |
+++ b/src/ia32/code-stubs-ia32.cc |
@@ -1542,7 +1542,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) { |
__ j(above, &runtime); |
// Reset offset for possibly sliced string. |
- __ Set(edi, Immediate(0)); |
+ __ Move(edi, Immediate(0)); |
__ mov(eax, Operand(esp, kSubjectOffset)); |
__ JumpIfSmi(eax, &runtime); |
__ mov(edx, eax); // Make a copy of the original subject string. |
@@ -1636,7 +1636,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) { |
__ cmp(ebx, FieldOperand(edx, String::kLengthOffset)); |
__ j(above_equal, &runtime); |
__ mov(edx, FieldOperand(ecx, JSRegExp::kDataAsciiCodeOffset)); |
- __ Set(ecx, Immediate(1)); // Type is one byte. |
+ __ Move(ecx, Immediate(1)); // Type is one byte. |
// (E) Carry on. String handling is done. |
__ bind(&check_code); |
@@ -1904,7 +1904,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) { |
__ cmp(ebx, FieldOperand(edx, String::kLengthOffset)); |
__ j(above_equal, &runtime); |
__ mov(edx, FieldOperand(ecx, JSRegExp::kDataUC16CodeOffset)); |
- __ Set(ecx, Immediate(0)); // Type is two byte. |
+ __ Move(ecx, Immediate(0)); // Type is two byte. |
__ jmp(&check_code); // Go to (E). |
// (10) Not a string or a short external string? If yes, bail out to runtime. |
@@ -2001,7 +2001,7 @@ void ICCompareStub::GenerateGeneric(MacroAssembler* masm) { |
Label check_for_nan; |
__ cmp(edx, masm->isolate()->factory()->undefined_value()); |
__ j(not_equal, &check_for_nan, Label::kNear); |
- __ Set(eax, Immediate(Smi::FromInt(NegativeComparisonResult(cc)))); |
+ __ Move(eax, Immediate(Smi::FromInt(NegativeComparisonResult(cc)))); |
__ ret(0); |
__ bind(&check_for_nan); |
} |
@@ -2016,7 +2016,7 @@ void ICCompareStub::GenerateGeneric(MacroAssembler* masm) { |
__ CmpObjectType(eax, FIRST_SPEC_OBJECT_TYPE, ecx); |
__ j(above_equal, ¬_identical); |
} |
- __ Set(eax, Immediate(Smi::FromInt(EQUAL))); |
+ __ Move(eax, Immediate(Smi::FromInt(EQUAL))); |
__ ret(0); |
@@ -2130,7 +2130,7 @@ void ICCompareStub::GenerateGeneric(MacroAssembler* masm) { |
__ j(below, &below_label, Label::kNear); |
__ j(above, &above_label, Label::kNear); |
- __ Set(eax, Immediate(0)); |
+ __ Move(eax, Immediate(0)); |
__ ret(0); |
__ bind(&below_label); |
@@ -2222,7 +2222,7 @@ void ICCompareStub::GenerateGeneric(MacroAssembler* masm) { |
__ j(zero, &return_unequal, Label::kNear); |
// The objects are both undetectable, so they both compare as the value |
// undefined, and are equal. |
- __ Set(eax, Immediate(EQUAL)); |
+ __ Move(eax, Immediate(EQUAL)); |
__ bind(&return_unequal); |
// Return non-equal by returning the non-zero object pointer in eax, |
// or return equal if we fell through to here. |
@@ -2438,8 +2438,8 @@ void CallFunctionStub::Generate(MacroAssembler* masm) { |
__ pop(ecx); |
__ push(edi); // put proxy as additional argument under return address |
__ push(ecx); |
- __ Set(eax, Immediate(argc_ + 1)); |
- __ Set(ebx, Immediate(0)); |
+ __ Move(eax, Immediate(argc_ + 1)); |
+ __ Move(ebx, Immediate(0)); |
__ GetBuiltinEntry(edx, Builtins::CALL_FUNCTION_PROXY); |
{ |
Handle<Code> adaptor = isolate->builtins()->ArgumentsAdaptorTrampoline(); |
@@ -2450,8 +2450,8 @@ void CallFunctionStub::Generate(MacroAssembler* masm) { |
// of the original receiver from the call site). |
__ bind(&non_function); |
__ mov(Operand(esp, (argc_ + 1) * kPointerSize), edi); |
- __ Set(eax, Immediate(argc_)); |
- __ Set(ebx, Immediate(0)); |
+ __ Move(eax, Immediate(argc_)); |
+ __ Move(ebx, Immediate(0)); |
__ GetBuiltinEntry(edx, Builtins::CALL_NON_FUNCTION); |
Handle<Code> adaptor = isolate->builtins()->ArgumentsAdaptorTrampoline(); |
__ jmp(adaptor, RelocInfo::CODE_TARGET); |
@@ -2533,7 +2533,7 @@ void CallConstructStub::Generate(MacroAssembler* masm) { |
__ GetBuiltinEntry(edx, Builtins::CALL_NON_FUNCTION_AS_CONSTRUCTOR); |
__ bind(&do_call); |
// Set expected number of arguments to zero (not changing eax). |
- __ Set(ebx, Immediate(0)); |
+ __ Move(ebx, Immediate(0)); |
Handle<Code> arguments_adaptor = |
masm->isolate()->builtins()->ArgumentsAdaptorTrampoline(); |
__ jmp(arguments_adaptor, RelocInfo::CODE_TARGET); |
@@ -3024,7 +3024,7 @@ void InstanceofStub::Generate(MacroAssembler* masm) { |
} |
__ mov(Operand(scratch, kDeltaToMovImmediate), eax); |
if (!ReturnTrueFalseObject()) { |
- __ Set(eax, Immediate(0)); |
+ __ Move(eax, Immediate(0)); |
} |
} |
__ ret((HasArgsInRegisters() ? 0 : 2) * kPointerSize); |
@@ -3044,7 +3044,7 @@ void InstanceofStub::Generate(MacroAssembler* masm) { |
} |
__ mov(Operand(scratch, kDeltaToMovImmediate), eax); |
if (!ReturnTrueFalseObject()) { |
- __ Set(eax, Immediate(Smi::FromInt(1))); |
+ __ Move(eax, Immediate(Smi::FromInt(1))); |
} |
} |
__ ret((HasArgsInRegisters() ? 0 : 2) * kPointerSize); |
@@ -3060,20 +3060,20 @@ void InstanceofStub::Generate(MacroAssembler* masm) { |
// Null is not instance of anything. |
__ cmp(object, factory->null_value()); |
__ j(not_equal, &object_not_null, Label::kNear); |
- __ Set(eax, Immediate(Smi::FromInt(1))); |
+ __ Move(eax, Immediate(Smi::FromInt(1))); |
__ ret((HasArgsInRegisters() ? 0 : 2) * kPointerSize); |
__ bind(&object_not_null); |
// Smi values is not instance of anything. |
__ JumpIfNotSmi(object, &object_not_null_or_smi, Label::kNear); |
- __ Set(eax, Immediate(Smi::FromInt(1))); |
+ __ Move(eax, Immediate(Smi::FromInt(1))); |
__ ret((HasArgsInRegisters() ? 0 : 2) * kPointerSize); |
__ bind(&object_not_null_or_smi); |
// String values is not instance of anything. |
Condition is_string = masm->IsObjectStringType(object, scratch, scratch); |
__ j(NegateCondition(is_string), &slow, Label::kNear); |
- __ Set(eax, Immediate(Smi::FromInt(1))); |
+ __ Move(eax, Immediate(Smi::FromInt(1))); |
__ ret((HasArgsInRegisters() ? 0 : 2) * kPointerSize); |
// Slow-case: Go through the JavaScript implementation. |
@@ -3221,7 +3221,7 @@ void StringCharFromCodeGenerator::GenerateFast(MacroAssembler* masm) { |
__ j(not_zero, &slow_case_); |
Factory* factory = masm->isolate()->factory(); |
- __ Set(result_, Immediate(factory->single_character_string_cache())); |
+ __ Move(result_, Immediate(factory->single_character_string_cache())); |
STATIC_ASSERT(kSmiTag == 0); |
STATIC_ASSERT(kSmiTagSize == 1); |
STATIC_ASSERT(kSmiShiftSize == 0); |
@@ -3620,7 +3620,7 @@ void StringCompareStub::GenerateFlatAsciiStringEquals(MacroAssembler* masm, |
__ cmp(length, FieldOperand(right, String::kLengthOffset)); |
__ j(equal, &check_zero_length, Label::kNear); |
__ bind(&strings_not_equal); |
- __ Set(eax, Immediate(Smi::FromInt(NOT_EQUAL))); |
+ __ Move(eax, Immediate(Smi::FromInt(NOT_EQUAL))); |
__ ret(0); |
// Check if the length is zero. |
@@ -3629,7 +3629,7 @@ void StringCompareStub::GenerateFlatAsciiStringEquals(MacroAssembler* masm, |
STATIC_ASSERT(kSmiTag == 0); |
__ test(length, length); |
__ j(not_zero, &compare_chars, Label::kNear); |
- __ Set(eax, Immediate(Smi::FromInt(EQUAL))); |
+ __ Move(eax, Immediate(Smi::FromInt(EQUAL))); |
__ ret(0); |
// Compare characters. |
@@ -3638,7 +3638,7 @@ void StringCompareStub::GenerateFlatAsciiStringEquals(MacroAssembler* masm, |
&strings_not_equal, Label::kNear); |
// Characters are equal. |
- __ Set(eax, Immediate(Smi::FromInt(EQUAL))); |
+ __ Move(eax, Immediate(Smi::FromInt(EQUAL))); |
__ ret(0); |
} |
@@ -3686,7 +3686,7 @@ void StringCompareStub::GenerateCompareFlatAsciiStrings(MacroAssembler* masm, |
// Result is EQUAL. |
STATIC_ASSERT(EQUAL == 0); |
STATIC_ASSERT(kSmiTag == 0); |
- __ Set(eax, Immediate(Smi::FromInt(EQUAL))); |
+ __ Move(eax, Immediate(Smi::FromInt(EQUAL))); |
__ ret(0); |
Label result_greater; |
@@ -3699,12 +3699,12 @@ void StringCompareStub::GenerateCompareFlatAsciiStrings(MacroAssembler* masm, |
__ bind(&result_less); |
// Result is LESS. |
- __ Set(eax, Immediate(Smi::FromInt(LESS))); |
+ __ Move(eax, Immediate(Smi::FromInt(LESS))); |
__ ret(0); |
// Result is GREATER. |
__ bind(&result_greater); |
- __ Set(eax, Immediate(Smi::FromInt(GREATER))); |
+ __ Move(eax, Immediate(Smi::FromInt(GREATER))); |
__ ret(0); |
} |
@@ -3755,7 +3755,7 @@ void StringCompareStub::Generate(MacroAssembler* masm) { |
__ j(not_equal, ¬_same, Label::kNear); |
STATIC_ASSERT(EQUAL == 0); |
STATIC_ASSERT(kSmiTag == 0); |
- __ Set(eax, Immediate(Smi::FromInt(EQUAL))); |
+ __ Move(eax, Immediate(Smi::FromInt(EQUAL))); |
__ IncrementCounter(masm->isolate()->counters()->string_compare_native(), 1); |
__ ret(2 * kPointerSize); |
@@ -4161,7 +4161,7 @@ void ICCompareStub::GenerateInternalizedStrings(MacroAssembler* masm) { |
__ j(not_equal, &done, Label::kNear); |
STATIC_ASSERT(EQUAL == 0); |
STATIC_ASSERT(kSmiTag == 0); |
- __ Set(eax, Immediate(Smi::FromInt(EQUAL))); |
+ __ Move(eax, Immediate(Smi::FromInt(EQUAL))); |
__ bind(&done); |
__ ret(0); |
@@ -4206,7 +4206,7 @@ void ICCompareStub::GenerateUniqueNames(MacroAssembler* masm) { |
__ j(not_equal, &done, Label::kNear); |
STATIC_ASSERT(EQUAL == 0); |
STATIC_ASSERT(kSmiTag == 0); |
- __ Set(eax, Immediate(Smi::FromInt(EQUAL))); |
+ __ Move(eax, Immediate(Smi::FromInt(EQUAL))); |
__ bind(&done); |
__ ret(0); |
@@ -4252,7 +4252,7 @@ void ICCompareStub::GenerateStrings(MacroAssembler* masm) { |
__ j(not_equal, ¬_same, Label::kNear); |
STATIC_ASSERT(EQUAL == 0); |
STATIC_ASSERT(kSmiTag == 0); |
- __ Set(eax, Immediate(Smi::FromInt(EQUAL))); |
+ __ Move(eax, Immediate(Smi::FromInt(EQUAL))); |
__ ret(0); |
// Handle not identical strings. |
@@ -5331,9 +5331,9 @@ void CallApiFunctionStub::Generate(MacroAssembler* masm) { |
// FunctionCallbackInfo::values_. |
__ mov(ApiParameterOperand(3), scratch); |
// FunctionCallbackInfo::length_. |
- __ Set(ApiParameterOperand(4), Immediate(argc)); |
+ __ Move(ApiParameterOperand(4), Immediate(argc)); |
// FunctionCallbackInfo::is_construct_call_. |
- __ Set(ApiParameterOperand(5), Immediate(0)); |
+ __ Move(ApiParameterOperand(5), Immediate(0)); |
// v8::InvocationCallback's argument. |
__ lea(scratch, ApiParameterOperand(2)); |