src/x64/macro-assembler-x64.cc - Issue 7970009: Merged from GC branch to 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/x64/macro-assembler-x64.cc

Issue 7970009: Merged from GC branch to bleeding_edge (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Updated test expectations. More passes, but not all. Created 9 years, 3 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/x64/macro-assembler-x64.cc

diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc

index 7570c85bf68ba68f03115f7e3573c610bcb87acf..02703bf82dad6349dde9ce4f8e38c06a29f9616d 100644

--- a/src/x64/macro-assembler-x64.cc

+++ b/src/x64/macro-assembler-x64.cc

@@ -4170,7 +4170,7 @@ void MacroAssembler::EnsureNotWhite(

addq(length, Immediate(0x04));

// Value now either 4 (if ASCII) or 8 (if UC16), i.e. char-size shifted by 2.

imul(length, FieldOperand(value, String::kLengthOffset));

- shr(length, Immediate(2 + kSmiTagSize));

+ shr(length, Immediate(2 + kSmiTagSize + kSmiShiftSize));

addq(length, Immediate(SeqString::kHeaderSize + kObjectAlignmentMask));

and_(length, Immediate(~kObjectAlignmentMask));

« no previous file with comments | « src/spaces.cc ('k') | test/mjsunit/mjsunit.status » ('j') | no next file with comments »