src/x64/codegen-x64.cc - Issue 3156028: Change code pointer in function objects to a pointer to the first...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/x64/codegen-x64.cc

Issue 3156028: Change code pointer in function objects to a pointer to the first... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/

Patch Set: '' Created 10 years, 4 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

Download patch

Index: src/x64/codegen-x64.cc

===================================================================

--- src/x64/codegen-x64.cc (revision 5298)

+++ src/x64/codegen-x64.cc (working copy)

@@ -2616,8 +2616,10 @@

__ j(is_smi, &build_args);

__ CmpObjectType(rax, JS_FUNCTION_TYPE, rcx);

__ j(not_equal, &build_args);

+ __ movq(rcx, FieldOperand(rax, JSFunction::kCodeEntryOffset));

+ __ subq(rcx, Immediate(Code::kHeaderSize - kHeapObjectTag));

Handle<Code> apply_code(Builtins::builtin(Builtins::FunctionApply));

- __ Cmp(FieldOperand(rax, JSFunction::kCodeOffset), apply_code);

+ __ Cmp(FieldOperand(rcx, SharedFunctionInfo::kCodeOffset), apply_code);

__ j(not_equal, &build_args);

// Check that applicand is a function.

@@ -8758,7 +8760,8 @@

// Initialize the code pointer in the function to be the one

// found in the shared function info object.

__ movq(rdx, FieldOperand(rdx, SharedFunctionInfo::kCodeOffset));

- __ movq(FieldOperand(rax, JSFunction::kCodeOffset), rdx);

+ __ lea(rdx, FieldOperand(rdx, Code::kHeaderSize));

+ __ movq(FieldOperand(rax, JSFunction::kCodeEntryOffset), rdx);

// Return and remove the on-stack parameter.

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