src/arm/macro-assembler-arm.h - Issue 7635018: Merge r8868 into 3.2 branch, fix deoptimizer for two-word call sites.

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/arm/macro-assembler-arm.h

Issue 7635018: Merge r8868 into 3.2 branch, fix deoptimizer for two-word call sites. (Closed) Base URL: http://v8.googlecode.com/svn/branches/3.2/

Patch Set: Created 9 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/arm/macro-assembler-arm.h

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

--- src/arm/macro-assembler-arm.h (revision 8924)

+++ src/arm/macro-assembler-arm.h (working copy)

@@ -100,11 +100,13 @@

void Jump(Register target, Condition cond = al);

void Jump(byte* target, RelocInfo::Mode rmode, Condition cond = al);

void Jump(Handle<Code> code, RelocInfo::Mode rmode, Condition cond = al);

- int CallSize(Register target, Condition cond = al);

+ static int CallSize(Register target, Condition cond = al);

void Call(Register target, Condition cond = al);

- int CallSize(byte* target, RelocInfo::Mode rmode, Condition cond = al);

+ static int CallSize(byte* target, RelocInfo::Mode rmode, Condition cond = al);

void Call(byte* target, RelocInfo::Mode rmode, Condition cond = al);

- int CallSize(Handle<Code> code, RelocInfo::Mode rmode, Condition cond = al);

+ static int CallSize(Handle<Code> code,

+ RelocInfo::Mode rmode,

+ Condition cond = al);

void Call(Handle<Code> code, RelocInfo::Mode rmode, Condition cond = al);

void Ret(Condition cond = al);

@@ -957,7 +959,9 @@

int num_arguments);

void Jump(intptr_t target, RelocInfo::Mode rmode, Condition cond = al);

- int CallSize(intptr_t target, RelocInfo::Mode rmode, Condition cond = al);

+ static int CallSize(intptr_t target,

+ RelocInfo::Mode rmode,

+ Condition cond = al);

void Call(intptr_t target, RelocInfo::Mode rmode, Condition cond = al);

// Helper functions for generating invokes.

« no previous file with comments | « src/arm/deoptimizer-arm.cc ('k') | src/version.cc » ('j') | no next file with comments »