src/arm/frames-arm.cc - Issue 6529055: [Isolates] Merge crankshaft (r5922 from bleeding_edge).

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/frames-arm.cc

Issue 6529055: [Isolates] Merge crankshaft (r5922 from bleeding_edge). (Closed)

Patch Set: Win32 port Created 9 years, 10 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:

Index: src/arm/frames-arm.cc

diff --git a/src/arm/frames-arm.cc b/src/arm/frames-arm.cc

index b0c09903060cb49fa480b586982e761623158e74..d2726cfcfe7ffc3f488331e59aa19ae6e6de4428 100644

--- a/src/arm/frames-arm.cc

+++ b/src/arm/frames-arm.cc

@@ -38,7 +38,12 @@ namespace internal {

Address ExitFrame::ComputeStackPointer(Address fp) {

- return fp + ExitFrameConstants::kSPOffset;

+ Address marker = Memory::Address_at(fp + ExitFrameConstants::kMarkerOffset);

+ Address sp = fp + ExitFrameConstants::kSPOffset;

+ if (marker == NULL) {

+ sp -= DwVfpRegister::kNumRegisters * kDoubleSize + 2 * kPointerSize;

+ }

+ return sp;

}

« no previous file with comments | « src/arm/frames-arm.h ('k') | src/arm/full-codegen-arm.cc » ('j') | no next file with comments »