Commit 8689b3bc authored by vitalyr@chromium.org's avatar vitalyr@chromium.org

Direct load of global function prototype.

As most of call IC code is tied to a context anyway we can save a few dependent loads by having a direct reference to an initial map of a global function.

Review URL: http://codereview.chromium.org/2239009

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@4802 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent c9b1bf7e
...@@ -152,6 +152,17 @@ void StubCompiler::GenerateLoadGlobalFunctionPrototype(MacroAssembler* masm, ...@@ -152,6 +152,17 @@ void StubCompiler::GenerateLoadGlobalFunctionPrototype(MacroAssembler* masm,
} }
void StubCompiler::GenerateDirectLoadGlobalFunctionPrototype(
MacroAssembler* masm, int index, Register prototype) {
// Get the global function with the given index.
JSFunction* function = JSFunction::cast(Top::global_context()->get(index));
// Load its initial map. The global functions all have initial maps.
__ Move(prototype, Handle<Map>(function->initial_map()));
// Load the prototype from the initial map.
__ ldr(prototype, FieldMemOperand(prototype, Map::kPrototypeOffset));
}
// Load a fast property out of a holder object (src). In-object properties // Load a fast property out of a holder object (src). In-object properties
// are loaded directly otherwise the property is loaded from the properties // are loaded directly otherwise the property is loaded from the properties
// fixed array. // fixed array.
...@@ -1238,9 +1249,8 @@ Object* CallStubCompiler::CompileCallConstant(Object* object, ...@@ -1238,9 +1249,8 @@ Object* CallStubCompiler::CompileCallConstant(Object* object,
__ CompareObjectType(r1, r3, r3, FIRST_NONSTRING_TYPE); __ CompareObjectType(r1, r3, r3, FIRST_NONSTRING_TYPE);
__ b(hs, &miss); __ b(hs, &miss);
// Check that the maps starting from the prototype haven't changed. // Check that the maps starting from the prototype haven't changed.
GenerateLoadGlobalFunctionPrototype(masm(), GenerateDirectLoadGlobalFunctionPrototype(
Context::STRING_FUNCTION_INDEX, masm(), Context::STRING_FUNCTION_INDEX, r0);
r0);
CheckPrototypes(JSObject::cast(object->GetPrototype()), r0, holder, r3, CheckPrototypes(JSObject::cast(object->GetPrototype()), r0, holder, r3,
r1, name, &miss); r1, name, &miss);
} }
...@@ -1259,9 +1269,8 @@ Object* CallStubCompiler::CompileCallConstant(Object* object, ...@@ -1259,9 +1269,8 @@ Object* CallStubCompiler::CompileCallConstant(Object* object,
__ b(ne, &miss); __ b(ne, &miss);
__ bind(&fast); __ bind(&fast);
// Check that the maps starting from the prototype haven't changed. // Check that the maps starting from the prototype haven't changed.
GenerateLoadGlobalFunctionPrototype(masm(), GenerateDirectLoadGlobalFunctionPrototype(
Context::NUMBER_FUNCTION_INDEX, masm(), Context::NUMBER_FUNCTION_INDEX, r0);
r0);
CheckPrototypes(JSObject::cast(object->GetPrototype()), r0, holder, r3, CheckPrototypes(JSObject::cast(object->GetPrototype()), r0, holder, r3,
r1, name, &miss); r1, name, &miss);
} }
...@@ -1283,9 +1292,8 @@ Object* CallStubCompiler::CompileCallConstant(Object* object, ...@@ -1283,9 +1292,8 @@ Object* CallStubCompiler::CompileCallConstant(Object* object,
__ b(ne, &miss); __ b(ne, &miss);
__ bind(&fast); __ bind(&fast);
// Check that the maps starting from the prototype haven't changed. // Check that the maps starting from the prototype haven't changed.
GenerateLoadGlobalFunctionPrototype(masm(), GenerateDirectLoadGlobalFunctionPrototype(
Context::BOOLEAN_FUNCTION_INDEX, masm(), Context::BOOLEAN_FUNCTION_INDEX, r0);
r0);
CheckPrototypes(JSObject::cast(object->GetPrototype()), r0, holder, r3, CheckPrototypes(JSObject::cast(object->GetPrototype()), r0, holder, r3,
r1, name, &miss); r1, name, &miss);
} }
......
...@@ -172,6 +172,17 @@ void StubCompiler::GenerateLoadGlobalFunctionPrototype(MacroAssembler* masm, ...@@ -172,6 +172,17 @@ void StubCompiler::GenerateLoadGlobalFunctionPrototype(MacroAssembler* masm,
} }
void StubCompiler::GenerateDirectLoadGlobalFunctionPrototype(
MacroAssembler* masm, int index, Register prototype) {
// Get the global function with the given index.
JSFunction* function = JSFunction::cast(Top::global_context()->get(index));
// Load its initial map. The global functions all have initial maps.
__ Set(prototype, Immediate(Handle<Map>(function->initial_map())));
// Load the prototype from the initial map.
__ mov(prototype, FieldOperand(prototype, Map::kPrototypeOffset));
}
void StubCompiler::GenerateLoadArrayLength(MacroAssembler* masm, void StubCompiler::GenerateLoadArrayLength(MacroAssembler* masm,
Register receiver, Register receiver,
Register scratch, Register scratch,
...@@ -1328,9 +1339,9 @@ Object* CallStubCompiler::CompileStringCharCodeAtCall(Object* object, ...@@ -1328,9 +1339,9 @@ Object* CallStubCompiler::CompileStringCharCodeAtCall(Object* object,
Label index_out_of_range; Label index_out_of_range;
// Check that the maps starting from the prototype haven't changed. // Check that the maps starting from the prototype haven't changed.
GenerateLoadGlobalFunctionPrototype(masm(), GenerateDirectLoadGlobalFunctionPrototype(masm(),
Context::STRING_FUNCTION_INDEX, Context::STRING_FUNCTION_INDEX,
eax); eax);
CheckPrototypes(JSObject::cast(object->GetPrototype()), eax, holder, CheckPrototypes(JSObject::cast(object->GetPrototype()), eax, holder,
ebx, edx, name, &miss); ebx, edx, name, &miss);
...@@ -1394,9 +1405,9 @@ Object* CallStubCompiler::CompileStringCharAtCall(Object* object, ...@@ -1394,9 +1405,9 @@ Object* CallStubCompiler::CompileStringCharAtCall(Object* object,
Label index_out_of_range; Label index_out_of_range;
// Check that the maps starting from the prototype haven't changed. // Check that the maps starting from the prototype haven't changed.
GenerateLoadGlobalFunctionPrototype(masm(), GenerateDirectLoadGlobalFunctionPrototype(masm(),
Context::STRING_FUNCTION_INDEX, Context::STRING_FUNCTION_INDEX,
eax); eax);
CheckPrototypes(JSObject::cast(object->GetPrototype()), eax, holder, CheckPrototypes(JSObject::cast(object->GetPrototype()), eax, holder,
ebx, edx, name, &miss); ebx, edx, name, &miss);
...@@ -1523,9 +1534,8 @@ Object* CallStubCompiler::CompileCallConstant(Object* object, ...@@ -1523,9 +1534,8 @@ Object* CallStubCompiler::CompileCallConstant(Object* object,
__ CmpObjectType(edx, FIRST_NONSTRING_TYPE, eax); __ CmpObjectType(edx, FIRST_NONSTRING_TYPE, eax);
__ j(above_equal, &miss, not_taken); __ j(above_equal, &miss, not_taken);
// Check that the maps starting from the prototype haven't changed. // Check that the maps starting from the prototype haven't changed.
GenerateLoadGlobalFunctionPrototype(masm(), GenerateDirectLoadGlobalFunctionPrototype(
Context::STRING_FUNCTION_INDEX, masm(), Context::STRING_FUNCTION_INDEX, eax);
eax);
CheckPrototypes(JSObject::cast(object->GetPrototype()), eax, holder, CheckPrototypes(JSObject::cast(object->GetPrototype()), eax, holder,
ebx, edx, name, &miss); ebx, edx, name, &miss);
} }
...@@ -1544,9 +1554,8 @@ Object* CallStubCompiler::CompileCallConstant(Object* object, ...@@ -1544,9 +1554,8 @@ Object* CallStubCompiler::CompileCallConstant(Object* object,
__ j(not_equal, &miss, not_taken); __ j(not_equal, &miss, not_taken);
__ bind(&fast); __ bind(&fast);
// Check that the maps starting from the prototype haven't changed. // Check that the maps starting from the prototype haven't changed.
GenerateLoadGlobalFunctionPrototype(masm(), GenerateDirectLoadGlobalFunctionPrototype(
Context::NUMBER_FUNCTION_INDEX, masm(), Context::NUMBER_FUNCTION_INDEX, eax);
eax);
CheckPrototypes(JSObject::cast(object->GetPrototype()), eax, holder, CheckPrototypes(JSObject::cast(object->GetPrototype()), eax, holder,
ebx, edx, name, &miss); ebx, edx, name, &miss);
} }
...@@ -1566,9 +1575,8 @@ Object* CallStubCompiler::CompileCallConstant(Object* object, ...@@ -1566,9 +1575,8 @@ Object* CallStubCompiler::CompileCallConstant(Object* object,
__ j(not_equal, &miss, not_taken); __ j(not_equal, &miss, not_taken);
__ bind(&fast); __ bind(&fast);
// Check that the maps starting from the prototype haven't changed. // Check that the maps starting from the prototype haven't changed.
GenerateLoadGlobalFunctionPrototype(masm(), GenerateDirectLoadGlobalFunctionPrototype(
Context::BOOLEAN_FUNCTION_INDEX, masm(), Context::BOOLEAN_FUNCTION_INDEX, eax);
eax);
CheckPrototypes(JSObject::cast(object->GetPrototype()), eax, holder, CheckPrototypes(JSObject::cast(object->GetPrototype()), eax, holder,
ebx, edx, name, &miss); ebx, edx, name, &miss);
} }
......
...@@ -349,6 +349,15 @@ class StubCompiler BASE_EMBEDDED { ...@@ -349,6 +349,15 @@ class StubCompiler BASE_EMBEDDED {
int index, int index,
Register prototype); Register prototype);
// Generates prototype loading code that uses the objects from the
// context we were in when this function was called. This ties the
// generated code to a particular context and so must not be used in
// cases where the generated code is not allowed to have references
// to objects from a context.
static void GenerateDirectLoadGlobalFunctionPrototype(MacroAssembler* masm,
int index,
Register prototype);
static void GenerateFastPropertyLoad(MacroAssembler* masm, static void GenerateFastPropertyLoad(MacroAssembler* masm,
Register dst, Register src, Register dst, Register src,
JSObject* holder, int index); JSObject* holder, int index);
......
...@@ -114,6 +114,17 @@ void StubCompiler::GenerateLoadGlobalFunctionPrototype(MacroAssembler* masm, ...@@ -114,6 +114,17 @@ void StubCompiler::GenerateLoadGlobalFunctionPrototype(MacroAssembler* masm,
} }
void StubCompiler::GenerateDirectLoadGlobalFunctionPrototype(
MacroAssembler* masm, int index, Register prototype) {
// Get the global function with the given index.
JSFunction* function = JSFunction::cast(Top::global_context()->get(index));
// Load its initial map. The global functions all have initial maps.
__ Move(prototype, Handle<Map>(function->initial_map()));
// Load the prototype from the initial map.
__ movq(prototype, FieldOperand(prototype, Map::kPrototypeOffset));
}
// Load a fast property out of a holder object (src). In-object properties // Load a fast property out of a holder object (src). In-object properties
// are loaded directly otherwise the property is loaded from the properties // are loaded directly otherwise the property is loaded from the properties
// fixed array. // fixed array.
...@@ -776,9 +787,8 @@ Object* CallStubCompiler::CompileCallConstant(Object* object, ...@@ -776,9 +787,8 @@ Object* CallStubCompiler::CompileCallConstant(Object* object,
__ CmpObjectType(rdx, FIRST_NONSTRING_TYPE, rax); __ CmpObjectType(rdx, FIRST_NONSTRING_TYPE, rax);
__ j(above_equal, &miss); __ j(above_equal, &miss);
// Check that the maps starting from the prototype haven't changed. // Check that the maps starting from the prototype haven't changed.
GenerateLoadGlobalFunctionPrototype(masm(), GenerateDirectLoadGlobalFunctionPrototype(
Context::STRING_FUNCTION_INDEX, masm(), Context::STRING_FUNCTION_INDEX, rax);
rax);
CheckPrototypes(JSObject::cast(object->GetPrototype()), rax, holder, CheckPrototypes(JSObject::cast(object->GetPrototype()), rax, holder,
rbx, rdx, name, &miss); rbx, rdx, name, &miss);
} }
...@@ -796,9 +806,8 @@ Object* CallStubCompiler::CompileCallConstant(Object* object, ...@@ -796,9 +806,8 @@ Object* CallStubCompiler::CompileCallConstant(Object* object,
__ j(not_equal, &miss); __ j(not_equal, &miss);
__ bind(&fast); __ bind(&fast);
// Check that the maps starting from the prototype haven't changed. // Check that the maps starting from the prototype haven't changed.
GenerateLoadGlobalFunctionPrototype(masm(), GenerateDirectLoadGlobalFunctionPrototype(
Context::NUMBER_FUNCTION_INDEX, masm(), Context::NUMBER_FUNCTION_INDEX, rax);
rax);
CheckPrototypes(JSObject::cast(object->GetPrototype()), rax, holder, CheckPrototypes(JSObject::cast(object->GetPrototype()), rax, holder,
rbx, rdx, name, &miss); rbx, rdx, name, &miss);
} }
...@@ -818,9 +827,8 @@ Object* CallStubCompiler::CompileCallConstant(Object* object, ...@@ -818,9 +827,8 @@ Object* CallStubCompiler::CompileCallConstant(Object* object,
__ j(not_equal, &miss); __ j(not_equal, &miss);
__ bind(&fast); __ bind(&fast);
// Check that the maps starting from the prototype haven't changed. // Check that the maps starting from the prototype haven't changed.
GenerateLoadGlobalFunctionPrototype(masm(), GenerateDirectLoadGlobalFunctionPrototype(
Context::BOOLEAN_FUNCTION_INDEX, masm(), Context::BOOLEAN_FUNCTION_INDEX, rax);
rax);
CheckPrototypes(JSObject::cast(object->GetPrototype()), rax, holder, CheckPrototypes(JSObject::cast(object->GetPrototype()), rax, holder,
rbx, rdx, name, &miss); rbx, rdx, name, &miss);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment