src/ia32/stub-cache-ia32.cc - Issue 6928060: Merge Label and NearLabel

Unified Diff: src/ia32/stub-cache-ia32.cc

Issue 6928060: Merge Label and NearLabel (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Created 9 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: src/ia32/stub-cache-ia32.cc

diff --git a/src/ia32/stub-cache-ia32.cc b/src/ia32/stub-cache-ia32.cc

index 30e9dee22cd10fd04de1e82dbb32f33eb2bbae51..4eb7a537c8a0244664925c006d30fa16e2a16c47 100644

--- a/src/ia32/stub-cache-ia32.cc

+++ b/src/ia32/stub-cache-ia32.cc

@@ -57,7 +57,7 @@ static void ProbeTable(Isolate* isolate,

// Check that the key in the entry matches the name.

__ cmp(name, Operand::StaticArray(offset, times_2, key_offset));

- __ j(not_equal, &miss, not_taken);

+ __ j(not_equal, &miss, Label::kFar, not_taken);

// Check that the flags match what we're looking for.

__ mov(offset, FieldOperand(extra, Code::kFlagsOffset));

@@ -76,7 +76,7 @@ static void ProbeTable(Isolate* isolate,

// Check that the key in the entry matches the name.

__ cmp(name, Operand::StaticArray(offset, times_2, key_offset));

- __ j(not_equal, &miss, not_taken);

+ __ j(not_equal, &miss, Label::kFar, not_taken);

// Get the code entry from the cache.

__ mov(offset, Operand::StaticArray(offset, times_2, value_offset));

@@ -126,11 +126,11 @@ static void GenerateDictionaryNegativeLookup(MacroAssembler* masm,

// Bail out if the receiver has a named interceptor or requires access checks.

__ test_b(FieldOperand(r0, Map::kBitFieldOffset),

kInterceptorOrAccessCheckNeededMask);

- __ j(not_zero, miss_label, not_taken);

+ __ j(not_zero, miss_label, Label::kFar, not_taken);

// Check that receiver is a JSObject.

__ CmpInstanceType(r0, FIRST_JS_OBJECT_TYPE);

- __ j(below, miss_label, not_taken);

+ __ j(below, miss_label, Label::kFar, not_taken);

// Load properties array.

@@ -184,7 +184,7 @@ void StubCache::GenerateProbe(MacroAssembler* masm,

// Check that the receiver isn't a smi.

__ test(receiver, Immediate(kSmiTagMask));

- __ j(zero, &miss, not_taken);

+ __ j(zero, &miss, Label::kFar, not_taken);

// Get the map of the receiver and compute the hash.

__ mov(scratch, FieldOperand(name, String::kHashFieldOffset));

@@ -245,11 +245,11 @@ void StubCompiler::GenerateLoadArrayLength(MacroAssembler* masm,

Label* miss_label) {

// Check that the receiver isn't a smi.

__ test(receiver, Immediate(kSmiTagMask));

- __ j(zero, miss_label, not_taken);

+ __ j(zero, miss_label, Label::kFar, not_taken);

// Check that the object is a JS array.

__ CmpObjectType(receiver, JS_ARRAY_TYPE, scratch);

- __ j(not_equal, miss_label, not_taken);

+ __ j(not_equal, miss_label, Label::kFar, not_taken);

// Load length directly from the JS array.

__ mov(eax, FieldOperand(receiver, JSArray::kLengthOffset));

@@ -266,14 +266,14 @@ static void GenerateStringCheck(MacroAssembler* masm,

Label* non_string_object) {

// Check that the object isn't a smi.

__ test(receiver, Immediate(kSmiTagMask));

- __ j(zero, smi, not_taken);

+ __ j(zero, smi, Label::kFar, not_taken);

// Check that the object is a string.

__ mov(scratch, FieldOperand(receiver, HeapObject::kMapOffset));

__ movzx_b(scratch, FieldOperand(scratch, Map::kInstanceTypeOffset));

ASSERT(kNotStringTag != 0);

__ test(scratch, Immediate(kNotStringTag));

- __ j(not_zero, non_string_object, not_taken);

+ __ j(not_zero, non_string_object, Label::kFar, not_taken);

}

@@ -298,7 +298,7 @@ void StubCompiler::GenerateLoadStringLength(MacroAssembler* masm,

// Check if the object is a JSValue wrapper.

__ bind(&check_wrapper);

__ cmp(scratch1, JS_VALUE_TYPE);

- __ j(not_equal, miss, not_taken);

+ __ j(not_equal, miss, Label::kFar, not_taken);

// Check if the wrapped value is a string and load the length

// directly if it is.

@@ -503,7 +503,7 @@ class CallInterceptorCompiler BASE_EMBEDDED {

// Check that the receiver isn't a smi.

__ test(receiver, Immediate(kSmiTagMask));

- __ j(zero, miss, not_taken);

+ __ j(zero, miss, Label::kFar, not_taken);

CallOptimization optimization(lookup);

@@ -720,12 +720,12 @@ void StubCompiler::GenerateStoreField(MacroAssembler* masm,

Label* miss_label) {

// Check that the object isn't a smi.

__ test(receiver_reg, Immediate(kSmiTagMask));

- __ j(zero, miss_label, not_taken);

+ __ j(zero, miss_label, Label::kFar, not_taken);

// Check that the map of the object hasn't changed.

__ cmp(FieldOperand(receiver_reg, HeapObject::kMapOffset),

Immediate(Handle<Map>(object->map())));

- __ j(not_equal, miss_label, not_taken);

+ __ j(not_equal, miss_label, Label::kFar, not_taken);

// Perform global security token check if needed.

if (object->IsJSGlobalProxy()) {

@@ -815,7 +815,7 @@ MUST_USE_RESULT static MaybeObject* GenerateCheckPropertyCell(

__ cmp(Operand::Cell(Handle<JSGlobalPropertyCell>(cell)),

Immediate(masm->isolate()->factory()->the_hole_value()));

}

- __ j(not_equal, miss, not_taken);

+ __ j(not_equal, miss, Label::kFar, not_taken);

return cell;

}

@@ -915,7 +915,7 @@ Register StubCompiler::CheckPrototypes(JSObject* object,

__ mov(scratch1, FieldOperand(reg, HeapObject::kMapOffset));

__ cmp(Operand(scratch1), Immediate(Handle<Map>(current->map())));

// Branch on the result of the map check.

- __ j(not_equal, miss, not_taken);

+ __ j(not_equal, miss, Label::kFar, not_taken);

// Check access rights to the global object. This has to happen

// after the map check so that we know that the object is

// actually a global object.

@@ -935,7 +935,7 @@ Register StubCompiler::CheckPrototypes(JSObject* object,

__ cmp(FieldOperand(reg, HeapObject::kMapOffset),

Immediate(Handle<Map>(current->map())));

// Branch on the result of the map check.

- __ j(not_equal, miss, not_taken);

+ __ j(not_equal, miss, Label::kFar, not_taken);

// Check access rights to the global object. This has to happen

// after the map check so that we know that the object is

// actually a global object.

@@ -962,7 +962,7 @@ Register StubCompiler::CheckPrototypes(JSObject* object,

// Check the holder map.

__ cmp(FieldOperand(reg, HeapObject::kMapOffset),

Immediate(Handle<Map>(holder->map())));

- __ j(not_equal, miss, not_taken);

+ __ j(not_equal, miss, Label::kFar, not_taken);

// Perform security check for access to the global object.

ASSERT(holder->IsJSGlobalProxy() || !holder->IsAccessCheckNeeded());

@@ -997,7 +997,7 @@ void StubCompiler::GenerateLoadField(JSObject* object,

Label* miss) {

// Check that the receiver isn't a smi.

__ test(receiver, Immediate(kSmiTagMask));

- __ j(zero, miss, not_taken);

+ __ j(zero, miss, Label::kFar, not_taken);

// Check the prototype chain.

@@ -1022,7 +1022,7 @@ MaybeObject* StubCompiler::GenerateLoadCallback(JSObject* object,

Label* miss) {

// Check that the receiver isn't a smi.

__ test(receiver, Immediate(kSmiTagMask));

- __ j(zero, miss, not_taken);

+ __ j(zero, miss, Label::kFar, not_taken);

// Check that the maps haven't changed.

@@ -1089,7 +1089,7 @@ void StubCompiler::GenerateLoadConstant(JSObject* object,

Label* miss) {

// Check that the receiver isn't a smi.

__ test(receiver, Immediate(kSmiTagMask));

- __ j(zero, miss, not_taken);

+ __ j(zero, miss, Label::kFar, not_taken);

// Check that the maps haven't changed.

CheckPrototypes(object, receiver, holder,

@@ -1116,7 +1116,7 @@ void StubCompiler::GenerateLoadInterceptor(JSObject* object,

// Check that the receiver isn't a smi.

__ test(receiver, Immediate(kSmiTagMask));

- __ j(zero, miss, not_taken);

+ __ j(zero, miss, Label::kFar, not_taken);

// So far the most popular follow ups for interceptor loads are FIELD

// and CALLBACKS, so inline only them, other cases may be added

@@ -1245,7 +1245,7 @@ void StubCompiler::GenerateLoadInterceptor(JSObject* object,

void CallStubCompiler::GenerateNameCheck(String* name, Label* miss) {

if (kind_ == Code::KEYED_CALL_IC) {

__ cmp(Operand(ecx), Immediate(Handle<String>(name)));

- __ j(not_equal, miss, not_taken);

+ __ j(not_equal, miss, Label::kFar, not_taken);

}

@@ -1267,7 +1267,7 @@ void CallStubCompiler::GenerateGlobalReceiverCheck(JSObject* object,

// the receiver cannot be a smi.

if (object != holder) {

__ test(edx, Immediate(kSmiTagMask));

- __ j(zero, miss, not_taken);

+ __ j(zero, miss, Label::kFar, not_taken);

}

// Check that the maps haven't changed.

@@ -1294,17 +1294,17 @@ void CallStubCompiler::GenerateLoadFunctionFromCell(JSGlobalPropertyCell* cell,

// function can all use this call IC. Before we load through the

// function, we have to verify that it still is a function.

__ test(edi, Immediate(kSmiTagMask));

- __ j(zero, miss, not_taken);

+ __ j(zero, miss, Label::kFar, not_taken);

__ CmpObjectType(edi, JS_FUNCTION_TYPE, ebx);

- __ j(not_equal, miss, not_taken);

+ __ j(not_equal, miss, Label::kFar, not_taken);

// Check the shared function info. Make sure it hasn't changed.

__ cmp(FieldOperand(edi, JSFunction::kSharedFunctionInfoOffset),

Immediate(Handle<SharedFunctionInfo>(function->shared())));

- __ j(not_equal, miss, not_taken);

+ __ j(not_equal, miss, Label::kFar, not_taken);

} else {

__ cmp(Operand(edi), Immediate(Handle<JSFunction>(function)));

- __ j(not_equal, miss, not_taken);

+ __ j(not_equal, miss, Label::kFar, not_taken);

}

@@ -1342,7 +1342,7 @@ MUST_USE_RESULT MaybeObject* CallStubCompiler::CompileCallField(

// Check that the receiver isn't a smi.

__ test(edx, Immediate(kSmiTagMask));

- __ j(zero, &miss, not_taken);

+ __ j(zero, &miss, Label::kFar, not_taken);

// Do the right check and compute the holder register.

@@ -1352,9 +1352,9 @@ MUST_USE_RESULT MaybeObject* CallStubCompiler::CompileCallField(

// Check that the function really is a function.

__ test(edi, Immediate(kSmiTagMask));

- __ j(zero, &miss, not_taken);

+ __ j(zero, &miss, Label::kFar, not_taken);

__ CmpObjectType(edi, JS_FUNCTION_TYPE, ebx);

- __ j(not_equal, &miss, not_taken);

+ __ j(not_equal, &miss, Label::kFar, not_taken);

// Patch the receiver on the stack with the global proxy if

// necessary.

@@ -2119,7 +2119,7 @@ MaybeObject* CallStubCompiler::CompileFastApiCall(

// Check that the receiver isn't a smi.

__ test(edx, Immediate(kSmiTagMask));

- __ j(zero, &miss_before_stack_reserved, not_taken);

+ __ j(zero, &miss_before_stack_reserved, Label::kFar, not_taken);

Counters* counters = isolate()->counters();

__ IncrementCounter(counters->call_const(), 1);

@@ -2187,7 +2187,7 @@ MaybeObject* CallStubCompiler::CompileCallConstant(Object* object,

// Check that the receiver isn't a smi.

if (check != NUMBER_CHECK) {

__ test(edx, Immediate(kSmiTagMask));

- __ j(zero, &miss, not_taken);

+ __ j(zero, &miss, Label::kFar, not_taken);

}

// Make sure that it's okay not to patch the on stack receiver

@@ -2219,7 +2219,7 @@ MaybeObject* CallStubCompiler::CompileCallConstant(Object* object,

} else {

// Check that the object is a string or a symbol.

__ CmpObjectType(edx, FIRST_NONSTRING_TYPE, eax);

- __ j(above_equal, &miss, not_taken);

+ __ j(above_equal, &miss, Label::kFar, not_taken);

// Check that the maps starting from the prototype haven't changed.

GenerateDirectLoadGlobalFunctionPrototype(

masm(), Context::STRING_FUNCTION_INDEX, eax, &miss);

@@ -2237,9 +2237,9 @@ MaybeObject* CallStubCompiler::CompileCallConstant(Object* object,

Label fast;

// Check that the object is a smi or a heap number.

__ test(edx, Immediate(kSmiTagMask));

- __ j(zero, &fast, taken);

+ __ j(zero, &fast, Label::kFar, taken);

__ CmpObjectType(edx, HEAP_NUMBER_TYPE, eax);

- __ j(not_equal, &miss, not_taken);

+ __ j(not_equal, &miss, Label::kFar, not_taken);

__ bind(&fast);

// Check that the maps starting from the prototype haven't changed.

GenerateDirectLoadGlobalFunctionPrototype(

@@ -2259,9 +2259,9 @@ MaybeObject* CallStubCompiler::CompileCallConstant(Object* object,

Label fast;

// Check that the object is a boolean.

__ cmp(edx, factory()->true_value());

- __ j(equal, &fast, taken);

+ __ j(equal, &fast, Label::kFar, taken);

__ cmp(edx, factory()->false_value());

- __ j(not_equal, &miss, not_taken);

+ __ j(not_equal, &miss, Label::kFar, not_taken);

__ bind(&fast);

// Check that the maps starting from the prototype haven't changed.

GenerateDirectLoadGlobalFunctionPrototype(

@@ -2329,9 +2329,9 @@ MaybeObject* CallStubCompiler::CompileCallInterceptor(JSObject* object,

// Check that the function really is a function.

__ test(eax, Immediate(kSmiTagMask));

- __ j(zero, &miss, not_taken);

+ __ j(zero, &miss, Label::kFar, not_taken);

__ CmpObjectType(eax, JS_FUNCTION_TYPE, ebx);

- __ j(not_equal, &miss, not_taken);

+ __ j(not_equal, &miss, Label::kFar, not_taken);

// Patch the receiver on the stack with the global proxy if

// necessary.

@@ -2468,12 +2468,12 @@ MaybeObject* StoreStubCompiler::CompileStoreCallback(JSObject* object,

// Check that the object isn't a smi.

__ test(edx, Immediate(kSmiTagMask));

- __ j(zero, &miss, not_taken);

+ __ j(zero, &miss, Label::kFar, not_taken);

// Check that the map of the object hasn't changed.

__ cmp(FieldOperand(edx, HeapObject::kMapOffset),

Immediate(Handle<Map>(object->map())));

- __ j(not_equal, &miss, not_taken);

+ __ j(not_equal, &miss, Label::kFar, not_taken);

// Perform global security token check if needed.

if (object->IsJSGlobalProxy()) {

@@ -2518,12 +2518,12 @@ MaybeObject* StoreStubCompiler::CompileStoreInterceptor(JSObject* receiver,

// Check that the object isn't a smi.

__ test(edx, Immediate(kSmiTagMask));

- __ j(zero, &miss, not_taken);

+ __ j(zero, &miss, Label::kFar, not_taken);

// Check that the map of the object hasn't changed.

__ cmp(FieldOperand(edx, HeapObject::kMapOffset),

Immediate(Handle<Map>(receiver->map())));

- __ j(not_equal, &miss, not_taken);

+ __ j(not_equal, &miss, Label::kFar, not_taken);

// Perform global security token check if needed.

if (receiver->IsJSGlobalProxy()) {

@@ -2570,7 +2570,7 @@ MaybeObject* StoreStubCompiler::CompileStoreGlobal(GlobalObject* object,

// Check that the map of the global has not changed.

__ cmp(FieldOperand(edx, HeapObject::kMapOffset),

Immediate(Handle<Map>(object->map())));

- __ j(not_equal, &miss, not_taken);

+ __ j(not_equal, &miss, Label::kFar, not_taken);

// Compute the cell operand to use.

@@ -2623,7 +2623,7 @@ MaybeObject* KeyedStoreStubCompiler::CompileStoreField(JSObject* object,

// Check that the name has not changed.

__ cmp(Operand(ecx), Immediate(Handle<String>(name)));

- __ j(not_equal, &miss, not_taken);

+ __ j(not_equal, &miss, Label::kFar, not_taken);

// Generate store field code. Trashes the name register.

GenerateStoreField(masm(),

@@ -2656,30 +2656,30 @@ MaybeObject* KeyedStoreStubCompiler::CompileStoreSpecialized(

// Check that the receiver isn't a smi.

__ test(edx, Immediate(kSmiTagMask));

- __ j(zero, &miss, not_taken);

+ __ j(zero, &miss, Label::kFar, not_taken);

// Check that the map matches.

__ cmp(FieldOperand(edx, HeapObject::kMapOffset),

Immediate(Handle<Map>(receiver->map())));

- __ j(not_equal, &miss, not_taken);

+ __ j(not_equal, &miss, Label::kFar, not_taken);

// Check that the key is a smi.

__ test(ecx, Immediate(kSmiTagMask));

- __ j(not_zero, &miss, not_taken);

+ __ j(not_zero, &miss, Label::kFar, not_taken);

// Get the elements array and make sure it is a fast element array, not 'cow'.

__ mov(edi, FieldOperand(edx, JSObject::kElementsOffset));

__ cmp(FieldOperand(edi, HeapObject::kMapOffset),

Immediate(factory()->fixed_array_map()));

- __ j(not_equal, &miss, not_taken);

+ __ j(not_equal, &miss, Label::kFar, not_taken);

// Check that the key is within bounds.

if (receiver->IsJSArray()) {

__ cmp(ecx, FieldOperand(edx, JSArray::kLengthOffset)); // Compare smis.

- __ j(above_equal, &miss, not_taken);

+ __ j(above_equal, &miss, Label::kFar, not_taken);

} else {

__ cmp(ecx, FieldOperand(edi, FixedArray::kLengthOffset)); // Compare smis.

- __ j(above_equal, &miss, not_taken);

+ __ j(above_equal, &miss, Label::kFar, not_taken);

}

// Do the store and update the write barrier. Make sure to preserve

@@ -2713,7 +2713,7 @@ MaybeObject* LoadStubCompiler::CompileLoadNonexistent(String* name,

// Check that the receiver isn't a smi.

__ test(eax, Immediate(kSmiTagMask));

- __ j(zero, &miss, not_taken);

+ __ j(zero, &miss, Label::kFar, not_taken);

ASSERT(last->IsGlobalObject() || last->HasFastProperties());

@@ -2866,7 +2866,7 @@ MaybeObject* LoadStubCompiler::CompileLoadGlobal(JSObject* object,

// the receiver cannot be a smi.

if (object != holder) {

__ test(eax, Immediate(kSmiTagMask));

- __ j(zero, &miss, not_taken);

+ __ j(zero, &miss, Label::kFar, not_taken);

}

// Check that the maps haven't changed.

@@ -2883,7 +2883,7 @@ MaybeObject* LoadStubCompiler::CompileLoadGlobal(JSObject* object,

// Check for deleted property if property can actually be deleted.

if (!is_dont_delete) {

__ cmp(ebx, factory()->the_hole_value());

- __ j(equal, &miss, not_taken);

+ __ j(equal, &miss, Label::kFar, not_taken);

} else if (FLAG_debug_code) {

__ cmp(ebx, factory()->the_hole_value());

__ Check(not_equal, "DontDelete cells can't contain the hole");

@@ -2919,7 +2919,7 @@ MaybeObject* KeyedLoadStubCompiler::CompileLoadField(String* name,

// Check that the name has not changed.

__ cmp(Operand(eax), Immediate(Handle<String>(name)));

- __ j(not_equal, &miss, not_taken);

+ __ j(not_equal, &miss, Label::kFar, not_taken);

GenerateLoadField(receiver, holder, edx, ebx, ecx, edi, index, name, &miss);

@@ -2949,7 +2949,7 @@ MaybeObject* KeyedLoadStubCompiler::CompileLoadCallback(

// Check that the name has not changed.

__ cmp(Operand(eax), Immediate(Handle<String>(name)));

- __ j(not_equal, &miss, not_taken);

+ __ j(not_equal, &miss, Label::kFar, not_taken);

MaybeObject* result = GenerateLoadCallback(receiver, holder, edx, eax, ebx,

ecx, edi, callback, name, &miss);

@@ -2984,7 +2984,7 @@ MaybeObject* KeyedLoadStubCompiler::CompileLoadConstant(String* name,

// Check that the name has not changed.

__ cmp(Operand(eax), Immediate(Handle<String>(name)));

- __ j(not_equal, &miss, not_taken);

+ __ j(not_equal, &miss, Label::kFar, not_taken);

GenerateLoadConstant(receiver, holder, edx, ebx, ecx, edi,

value, name, &miss);

@@ -3012,7 +3012,7 @@ MaybeObject* KeyedLoadStubCompiler::CompileLoadInterceptor(JSObject* receiver,

// Check that the name has not changed.

__ cmp(Operand(eax), Immediate(Handle<String>(name)));

- __ j(not_equal, &miss, not_taken);

+ __ j(not_equal, &miss, Label::kFar, not_taken);

LookupResult lookup;

LookupPostInterceptor(holder, name, &lookup);

@@ -3048,7 +3048,7 @@ MaybeObject* KeyedLoadStubCompiler::CompileLoadArrayLength(String* name) {

// Check that the name has not changed.

__ cmp(Operand(eax), Immediate(Handle<String>(name)));

- __ j(not_equal, &miss, not_taken);

+ __ j(not_equal, &miss, Label::kFar, not_taken);

GenerateLoadArrayLength(masm(), edx, ecx, &miss);

__ bind(&miss);

@@ -3073,7 +3073,7 @@ MaybeObject* KeyedLoadStubCompiler::CompileLoadStringLength(String* name) {

// Check that the name has not changed.

__ cmp(Operand(eax), Immediate(Handle<String>(name)));

- __ j(not_equal, &miss, not_taken);

+ __ j(not_equal, &miss, Label::kFar, not_taken);

GenerateLoadStringLength(masm(), edx, ecx, ebx, &miss, true);

__ bind(&miss);

@@ -3098,7 +3098,7 @@ MaybeObject* KeyedLoadStubCompiler::CompileLoadFunctionPrototype(String* name) {

// Check that the name has not changed.

__ cmp(Operand(eax), Immediate(Handle<String>(name)));

- __ j(not_equal, &miss, not_taken);

+ __ j(not_equal, &miss, Label::kFar, not_taken);

GenerateLoadFunctionPrototype(masm(), edx, ecx, ebx, &miss);

__ bind(&miss);

@@ -3120,16 +3120,16 @@ MaybeObject* KeyedLoadStubCompiler::CompileLoadSpecialized(JSObject* receiver) {

// Check that the receiver isn't a smi.

__ test(edx, Immediate(kSmiTagMask));

- __ j(zero, &miss, not_taken);

+ __ j(zero, &miss, Label::kFar, not_taken);

// Check that the map matches.

__ cmp(FieldOperand(edx, HeapObject::kMapOffset),

Immediate(Handle<Map>(receiver->map())));

- __ j(not_equal, &miss, not_taken);

+ __ j(not_equal, &miss, Label::kFar, not_taken);

// Check that the key is a smi.

__ test(eax, Immediate(kSmiTagMask));

- __ j(not_zero, &miss, not_taken);

+ __ j(not_zero, &miss, Label::kFar, not_taken);

// Get the elements array.

__ mov(ecx, FieldOperand(edx, JSObject::kElementsOffset));

@@ -3137,13 +3137,13 @@ MaybeObject* KeyedLoadStubCompiler::CompileLoadSpecialized(JSObject* receiver) {

// Check that the key is within bounds.

__ cmp(eax, FieldOperand(ecx, FixedArray::kLengthOffset));

- __ j(above_equal, &miss, not_taken);

+ __ j(above_equal, &miss, Label::kFar, not_taken);

// Load the result and make sure it's not the hole.

__ mov(ebx, Operand(ecx, eax, times_2,

FixedArray::kHeaderSize - kHeapObjectTag));

__ cmp(ebx, factory()->the_hole_value());

- __ j(equal, &miss, not_taken);

+ __ j(equal, &miss, Label::kFar, not_taken);

__ mov(eax, ebx);

__ ret(0);

@@ -3172,7 +3172,7 @@ MaybeObject* ConstructStubCompiler::CompileConstructStub(JSFunction* function) {

__ mov(ebx, FieldOperand(edi, JSFunction::kSharedFunctionInfoOffset));

__ mov(ebx, FieldOperand(ebx, SharedFunctionInfo::kDebugInfoOffset));

__ cmp(ebx, factory()->undefined_value());

- __ j(not_equal, &generic_stub_call, not_taken);

+ __ j(not_equal, &generic_stub_call, Label::kFar, not_taken);

#endif

// Load the initial map and verify that it is in fact a map.

@@ -3305,11 +3305,11 @@ MaybeObject* ExternalArrayStubCompiler::CompileKeyedLoadStub(

// Check that the object isn't a smi.

__ test(edx, Immediate(kSmiTagMask));

- __ j(zero, &slow, not_taken);

+ __ j(zero, &slow, Label::kFar, not_taken);

// Check that the key is a smi.

__ test(eax, Immediate(kSmiTagMask));

- __ j(not_zero, &slow, not_taken);

+ __ j(not_zero, &slow, Label::kFar, not_taken);

// Check that the map matches.

__ CheckMap(edx, Handle<Map>(receiver->map()), &slow, false);

@@ -3501,9 +3501,9 @@ MaybeObject* ExternalArrayStubCompiler::CompileKeyedStoreStub(

switch (array_type) {

case kExternalPixelArray:

{ // Clamp the value to [0..255].

- NearLabel done;

+ Label done;

__ test(ecx, Immediate(0xFFFFFF00));

- __ j(zero, &done);

+ __ j(zero, &done, Label::kNear);

__ setcc(negative, ecx); // 1 if negative, 0 if positive.

__ dec_b(ecx); // 0 if negative, 255 if positive.

__ bind(&done);

@@ -3584,9 +3584,9 @@ MaybeObject* ExternalArrayStubCompiler::CompileKeyedStoreStub(

switch (array_type) {

case kExternalPixelArray:

{ // Clamp the value to [0..255].

- NearLabel done;

+ Label done;

__ test(ecx, Immediate(0xFFFFFF00));

- __ j(zero, &done);

+ __ j(zero, &done, Label::kNear);

__ setcc(negative, ecx); // 1 if negative, 0 if positive.

__ dec_b(ecx); // 0 if negative, 255 if positive.

__ bind(&done);

« src/ia32/assembler-ia32.cc ('K') | « src/ia32/regexp-macro-assembler-ia32.cc ('k') | src/x64/assembler-x64.h » ('j') | no next file with comments »