test/cctest/test-macro-assembler-x64.cc - Issue 6677076: Merge up to bleeding_edge r7201 to isolates branch.

Unified Diff: test/cctest/test-macro-assembler-x64.cc

Issue 6677076: Merge up to bleeding_edge r7201 to isolates branch. (Closed) Base URL: https://v8.googlecode.com/svn/branches/experimental/isolates

Patch Set: Created 9 years, 9 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: test/cctest/test-macro-assembler-x64.cc

diff --git a/test/cctest/test-macro-assembler-x64.cc b/test/cctest/test-macro-assembler-x64.cc

index 9bee374e02367ac9ace64ce64edafa70d28680d2..606f75753ea933b8d393b202ff7f8edde37009fa 100755

--- a/test/cctest/test-macro-assembler-x64.cc

+++ b/test/cctest/test-macro-assembler-x64.cc

@@ -221,7 +221,7 @@ void TestSmiCompare(MacroAssembler* masm, Label* exit, int id, int x, int y) {

__ j(less_equal, exit);

}

} else {

- __ SmiCompare(rcx, rcx);

+ __ cmpq(rcx, rcx);

__ movl(rax, Immediate(id + 11));

__ j(not_equal, exit);

__ incq(rax);

@@ -237,7 +237,7 @@ TEST(SmiCompare) {

// Allocate an executable page of memory.

size_t actual_size;

byte* buffer =

- static_cast<byte*>(OS::Allocate(Assembler::kMinimalBufferSize,

+ static_cast<byte*>(OS::Allocate(Assembler::kMinimalBufferSize * 2,

&actual_size,

true));

CHECK(buffer);

@@ -303,35 +303,35 @@ TEST(Integer32ToSmi) {

__ movl(rcx, Immediate(0));

__ Integer32ToSmi(rcx, rcx);

__ Set(rdx, reinterpret_cast<intptr_t>(Smi::FromInt(0)));

- __ SmiCompare(rcx, rdx);

+ __ cmpq(rcx, rdx);

__ j(not_equal, &exit);

__ movq(rax, Immediate(2)); // Test number.

__ movl(rcx, Immediate(1024));

__ Integer32ToSmi(rcx, rcx);

__ Set(rdx, reinterpret_cast<intptr_t>(Smi::FromInt(1024)));

- __ SmiCompare(rcx, rdx);

+ __ cmpq(rcx, rdx);

__ j(not_equal, &exit);

__ movq(rax, Immediate(3)); // Test number.

__ movl(rcx, Immediate(-1));

__ Integer32ToSmi(rcx, rcx);

__ Set(rdx, reinterpret_cast<intptr_t>(Smi::FromInt(-1)));

- __ SmiCompare(rcx, rdx);

+ __ cmpq(rcx, rdx);

__ j(not_equal, &exit);

__ movq(rax, Immediate(4)); // Test number.

__ movl(rcx, Immediate(Smi::kMaxValue));

__ Integer32ToSmi(rcx, rcx);

__ Set(rdx, reinterpret_cast<intptr_t>(Smi::FromInt(Smi::kMaxValue)));

- __ SmiCompare(rcx, rdx);

+ __ cmpq(rcx, rdx);

__ j(not_equal, &exit);

__ movq(rax, Immediate(5)); // Test number.

__ movl(rcx, Immediate(Smi::kMinValue));

__ Integer32ToSmi(rcx, rcx);

__ Set(rdx, reinterpret_cast<intptr_t>(Smi::FromInt(Smi::kMinValue)));

- __ SmiCompare(rcx, rdx);

+ __ cmpq(rcx, rdx);

__ j(not_equal, &exit);

// Different target register.

@@ -340,35 +340,35 @@ TEST(Integer32ToSmi) {

__ movl(rcx, Immediate(0));

__ Integer32ToSmi(r8, rcx);

__ Set(rdx, reinterpret_cast<intptr_t>(Smi::FromInt(0)));

- __ SmiCompare(r8, rdx);

+ __ cmpq(r8, rdx);

__ j(not_equal, &exit);

__ movq(rax, Immediate(7)); // Test number.

__ movl(rcx, Immediate(1024));

__ Integer32ToSmi(r8, rcx);

__ Set(rdx, reinterpret_cast<intptr_t>(Smi::FromInt(1024)));

- __ SmiCompare(r8, rdx);

+ __ cmpq(r8, rdx);

__ j(not_equal, &exit);

__ movq(rax, Immediate(8)); // Test number.

__ movl(rcx, Immediate(-1));

__ Integer32ToSmi(r8, rcx);

__ Set(rdx, reinterpret_cast<intptr_t>(Smi::FromInt(-1)));

- __ SmiCompare(r8, rdx);

+ __ cmpq(r8, rdx);

__ j(not_equal, &exit);

__ movq(rax, Immediate(9)); // Test number.

__ movl(rcx, Immediate(Smi::kMaxValue));

__ Integer32ToSmi(r8, rcx);

__ Set(rdx, reinterpret_cast<intptr_t>(Smi::FromInt(Smi::kMaxValue)));

- __ SmiCompare(r8, rdx);

+ __ cmpq(r8, rdx);

__ j(not_equal, &exit);

__ movq(rax, Immediate(10)); // Test number.

__ movl(rcx, Immediate(Smi::kMinValue));

__ Integer32ToSmi(r8, rcx);

__ Set(rdx, reinterpret_cast<intptr_t>(Smi::FromInt(Smi::kMinValue)));

- __ SmiCompare(r8, rdx);

+ __ cmpq(r8, rdx);

__ j(not_equal, &exit);

@@ -397,16 +397,16 @@ void TestI64PlusConstantToSmi(MacroAssembler* masm,

__ movq(rcx, x, RelocInfo::NONE);

__ movq(r11, rcx);

__ Integer64PlusConstantToSmi(rdx, rcx, y);

- __ SmiCompare(rdx, r8);

+ __ cmpq(rdx, r8);

__ j(not_equal, exit);

__ incq(rax);

- __ SmiCompare(r11, rcx);

+ __ cmpq(r11, rcx);

__ j(not_equal, exit);

__ incq(rax);

__ Integer64PlusConstantToSmi(rcx, rcx, y);

- __ SmiCompare(rcx, r8);

+ __ cmpq(rcx, r8);

__ j(not_equal, exit);

}

@@ -665,14 +665,14 @@ void TestSmiNeg(MacroAssembler* masm, Label* exit, int id, int x) {

__ SmiNeg(r9, rcx, exit);

__ incq(rax);

- __ SmiCompare(r11, rcx);

+ __ cmpq(r11, rcx);

__ j(not_equal, exit);

__ incq(rax);

__ SmiNeg(rcx, rcx, exit);

__ incq(rax);

- __ SmiCompare(r11, rcx);

+ __ cmpq(r11, rcx);

__ j(not_equal, exit);

} else {

Label smi_ok, smi_ok2;

@@ -684,11 +684,11 @@ void TestSmiNeg(MacroAssembler* masm, Label* exit, int id, int x) {

__ jmp(exit);

__ bind(&smi_ok);

__ incq(rax);

- __ SmiCompare(r9, r8);

+ __ cmpq(r9, r8);

__ j(not_equal, exit);

__ incq(rax);

- __ SmiCompare(r11, rcx);

+ __ cmpq(r11, rcx);

__ j(not_equal, exit);

__ incq(rax);

@@ -696,7 +696,7 @@ void TestSmiNeg(MacroAssembler* masm, Label* exit, int id, int x) {

__ jmp(exit);

__ bind(&smi_ok2);

__ incq(rax);

- __ SmiCompare(rcx, r8);

+ __ cmpq(rcx, r8);

__ j(not_equal, exit);

}

@@ -757,12 +757,12 @@ static void SmiAddTest(MacroAssembler* masm,

__ movl(rax, Immediate(id)); // Test number.

__ SmiAdd(r9, rcx, rdx, exit);

- __ SmiCompare(r9, r8);

+ __ cmpq(r9, r8);

__ j(not_equal, exit);

__ incq(rax);

__ SmiAdd(rcx, rcx, rdx, exit); \

- __ SmiCompare(rcx, r8);

+ __ cmpq(rcx, r8);

__ j(not_equal, exit);

__ movl(rcx, Immediate(first));

@@ -770,11 +770,11 @@ static void SmiAddTest(MacroAssembler* masm,

__ incq(rax);

__ SmiAddConstant(r9, rcx, Smi::FromInt(second));

- __ SmiCompare(r9, r8);

+ __ cmpq(r9, r8);

__ j(not_equal, exit);

__ SmiAddConstant(rcx, rcx, Smi::FromInt(second));

- __ SmiCompare(rcx, r8);

+ __ cmpq(rcx, r8);

__ j(not_equal, exit);

__ movl(rcx, Immediate(first));

@@ -782,12 +782,12 @@ static void SmiAddTest(MacroAssembler* masm,

__ incq(rax);

__ SmiAddConstant(r9, rcx, Smi::FromInt(second), exit);

- __ SmiCompare(r9, r8);

+ __ cmpq(r9, r8);

__ j(not_equal, exit);

__ incq(rax);

__ SmiAddConstant(rcx, rcx, Smi::FromInt(second), exit);

- __ SmiCompare(rcx, r8);

+ __ cmpq(rcx, r8);

__ j(not_equal, exit);

}

@@ -841,36 +841,36 @@ static void SmiSubTest(MacroAssembler* masm,

__ movl(rax, Immediate(id)); // Test 0.

__ SmiSub(r9, rcx, rdx, exit);

- __ SmiCompare(r9, r8);

+ __ cmpq(r9, r8);

__ j(not_equal, exit);

__ incq(rax); // Test 1.

__ SmiSub(rcx, rcx, rdx, exit);

- __ SmiCompare(rcx, r8);

+ __ cmpq(rcx, r8);

__ j(not_equal, exit);

__ Move(rcx, Smi::FromInt(first));

__ incq(rax); // Test 2.

__ SmiSubConstant(r9, rcx, Smi::FromInt(second));

- __ SmiCompare(r9, r8);

+ __ cmpq(r9, r8);

__ j(not_equal, exit);

__ incq(rax); // Test 3.

__ SmiSubConstant(rcx, rcx, Smi::FromInt(second));

- __ SmiCompare(rcx, r8);

+ __ cmpq(rcx, r8);

__ j(not_equal, exit);

__ Move(rcx, Smi::FromInt(first));

__ incq(rax); // Test 4.

__ SmiSubConstant(r9, rcx, Smi::FromInt(second), exit);

- __ SmiCompare(r9, r8);

+ __ cmpq(r9, r8);

__ j(not_equal, exit);

__ incq(rax); // Test 5.

__ SmiSubConstant(rcx, rcx, Smi::FromInt(second), exit);

- __ SmiCompare(rcx, r8);

+ __ cmpq(rcx, r8);

__ j(not_equal, exit);

}

@@ -893,7 +893,7 @@ static void SmiSubOverflowTest(MacroAssembler* masm,

__ jmp(exit);

__ bind(&overflow_ok);

__ incq(rax);

- __ SmiCompare(rcx, r11);

+ __ cmpq(rcx, r11);

__ j(not_equal, exit);

}

@@ -904,7 +904,7 @@ static void SmiSubOverflowTest(MacroAssembler* masm,

__ jmp(exit);

__ bind(&overflow_ok);

__ incq(rax);

- __ SmiCompare(rcx, r11);

+ __ cmpq(rcx, r11);

__ j(not_equal, exit);

}

@@ -916,7 +916,7 @@ static void SmiSubOverflowTest(MacroAssembler* masm,

__ jmp(exit);

__ bind(&overflow_ok);

__ incq(rax);

- __ SmiCompare(rcx, r11);

+ __ cmpq(rcx, r11);

__ j(not_equal, exit);

}

@@ -927,7 +927,7 @@ static void SmiSubOverflowTest(MacroAssembler* masm,

__ jmp(exit);

__ bind(&overflow_ok);

__ incq(rax);

- __ SmiCompare(rcx, r11);

+ __ cmpq(rcx, r11);

__ j(not_equal, exit);

}

@@ -940,7 +940,7 @@ static void SmiSubOverflowTest(MacroAssembler* masm,

__ jmp(exit);

__ bind(&overflow_ok);

__ incq(rax);

- __ SmiCompare(rcx, r11);

+ __ cmpq(rcx, r11);

__ j(not_equal, exit);

}

@@ -951,7 +951,7 @@ static void SmiSubOverflowTest(MacroAssembler* masm,

__ jmp(exit);

__ bind(&overflow_ok);

__ incq(rax);

- __ SmiCompare(rcx, r11);

+ __ cmpq(rcx, r11);

__ j(not_equal, exit);

}

@@ -963,7 +963,7 @@ static void SmiSubOverflowTest(MacroAssembler* masm,

__ jmp(exit);

__ bind(&overflow_ok);

__ incq(rax);

- __ SmiCompare(rcx, r11);

+ __ cmpq(rcx, r11);

__ j(not_equal, exit);

}

@@ -974,7 +974,7 @@ static void SmiSubOverflowTest(MacroAssembler* masm,

__ jmp(exit);

__ bind(&overflow_ok);

__ incq(rax);

- __ SmiCompare(rcx, r11);

+ __ cmpq(rcx, r11);

__ j(not_equal, exit);

}

@@ -1040,15 +1040,15 @@ void TestSmiMul(MacroAssembler* masm, Label* exit, int id, int x, int y) {

__ Move(r8, Smi::FromIntptr(result));

__ SmiMul(r9, rcx, rdx, exit);

__ incq(rax);

- __ SmiCompare(r11, rcx);

+ __ cmpq(r11, rcx);

__ j(not_equal, exit);

__ incq(rax);

- __ SmiCompare(r9, r8);

+ __ cmpq(r9, r8);

__ j(not_equal, exit);

__ incq(rax);

__ SmiMul(rcx, rcx, rdx, exit);

- __ SmiCompare(rcx, r8);

+ __ cmpq(rcx, r8);

__ j(not_equal, exit);

} else {

__ movl(rax, Immediate(id + 8));

@@ -1057,7 +1057,7 @@ void TestSmiMul(MacroAssembler* masm, Label* exit, int id, int x, int y) {

__ jmp(exit);

__ bind(&overflow_ok);

__ incq(rax);

- __ SmiCompare(r11, rcx);

+ __ cmpq(r11, rcx);

__ j(not_equal, exit);

__ incq(rax);

__ SmiMul(rcx, rcx, rdx, &overflow_ok2);

@@ -1065,7 +1065,7 @@ void TestSmiMul(MacroAssembler* masm, Label* exit, int id, int x, int y) {

__ bind(&overflow_ok2);

// 31-bit version doesn't preserve rcx on failure.

// __ incq(rax);

- // __ SmiCompare(r11, rcx);

+ // __ cmpq(r11, rcx);

// __ j(not_equal, exit);

}

@@ -1135,20 +1135,20 @@ void TestSmiDiv(MacroAssembler* masm, Label* exit, int id, int x, int y) {

__ SmiDiv(r9, rcx, r14, exit);

// Might have destroyed rcx and r14.

__ incq(r15);

- __ SmiCompare(r9, r8);

+ __ cmpq(r9, r8);

__ j(not_equal, exit);

__ incq(r15);

__ movq(rcx, r11);

__ Move(r14, Smi::FromInt(y));

- __ SmiCompare(rcx, r11);

+ __ cmpq(rcx, r11);

__ j(not_equal, exit);

__ incq(r15);

__ SmiDiv(rcx, rcx, r14, exit);

__ incq(r15);

- __ SmiCompare(rcx, r8);

+ __ cmpq(rcx, r8);

__ j(not_equal, exit);

} else {

// Division fails.

@@ -1161,7 +1161,7 @@ void TestSmiDiv(MacroAssembler* masm, Label* exit, int id, int x, int y) {

__ bind(&fail_ok);

__ incq(r15);

- __ SmiCompare(rcx, r11);

+ __ cmpq(rcx, r11);

__ j(not_equal, exit);

__ incq(r15);

@@ -1170,7 +1170,7 @@ void TestSmiDiv(MacroAssembler* masm, Label* exit, int id, int x, int y) {

__ bind(&fail_ok2);

__ incq(r15);

- __ SmiCompare(rcx, r11);

+ __ cmpq(rcx, r11);

__ j(not_equal, exit);

}

@@ -1248,18 +1248,18 @@ void TestSmiMod(MacroAssembler* masm, Label* exit, int id, int x, int y) {

__ SmiMod(r9, rcx, r14, exit);

__ incq(r15);

- __ SmiCompare(r9, r8);

+ __ cmpq(r9, r8);

__ j(not_equal, exit);

__ incq(r15);

- __ SmiCompare(rcx, r11);

+ __ cmpq(rcx, r11);

__ j(not_equal, exit);

__ incq(r15);

__ SmiMod(rcx, rcx, r14, exit);

__ incq(r15);

- __ SmiCompare(rcx, r8);

+ __ cmpq(rcx, r8);

__ j(not_equal, exit);

} else {

// Modulo fails.

@@ -1271,7 +1271,7 @@ void TestSmiMod(MacroAssembler* masm, Label* exit, int id, int x, int y) {

__ bind(&fail_ok);

__ incq(r15);

- __ SmiCompare(rcx, r11);

+ __ cmpq(rcx, r11);

__ j(not_equal, exit);

__ incq(r15);

@@ -1280,7 +1280,7 @@ void TestSmiMod(MacroAssembler* masm, Label* exit, int id, int x, int y) {

__ bind(&fail_ok2);

__ incq(r15);

- __ SmiCompare(rcx, r11);

+ __ cmpq(rcx, r11);

__ j(not_equal, exit);

}

@@ -1351,7 +1351,7 @@ void TestSmiIndex(MacroAssembler* masm, Label* exit, int id, int x) {

ASSERT(index.reg.is(rcx) || index.reg.is(rdx));

__ shl(index.reg, Immediate(index.scale));

__ Set(r8, static_cast<intptr_t>(x) << i);

- __ SmiCompare(index.reg, r8);

+ __ cmpq(index.reg, r8);

__ j(not_equal, exit);

__ incq(rax);

__ Move(rcx, Smi::FromInt(x));

@@ -1359,7 +1359,7 @@ void TestSmiIndex(MacroAssembler* masm, Label* exit, int id, int x) {

ASSERT(index.reg.is(rcx));

__ shl(rcx, Immediate(index.scale));

__ Set(r8, static_cast<intptr_t>(x) << i);

- __ SmiCompare(rcx, r8);

+ __ cmpq(rcx, r8);

__ j(not_equal, exit);

__ incq(rax);

@@ -1368,7 +1368,7 @@ void TestSmiIndex(MacroAssembler* masm, Label* exit, int id, int x) {

ASSERT(index.reg.is(rcx) || index.reg.is(rdx));

__ shl(index.reg, Immediate(index.scale));

__ Set(r8, static_cast<intptr_t>(-x) << i);

- __ SmiCompare(index.reg, r8);

+ __ cmpq(index.reg, r8);

__ j(not_equal, exit);

__ incq(rax);

__ Move(rcx, Smi::FromInt(x));

@@ -1376,7 +1376,7 @@ void TestSmiIndex(MacroAssembler* masm, Label* exit, int id, int x) {

ASSERT(index.reg.is(rcx));

__ shl(rcx, Immediate(index.scale));

__ Set(r8, static_cast<intptr_t>(-x) << i);

- __ SmiCompare(rcx, r8);

+ __ cmpq(rcx, r8);

__ j(not_equal, exit);

__ incq(rax);

}

@@ -1426,7 +1426,7 @@ void TestSelectNonSmi(MacroAssembler* masm, Label* exit, int id, int x, int y) {

__ SelectNonSmi(r9, rcx, rdx, exit);

__ incq(rax);

- __ SmiCompare(r9, rdx);

+ __ cmpq(r9, rdx);

__ j(not_equal, exit);

__ incq(rax);

@@ -1436,7 +1436,7 @@ void TestSelectNonSmi(MacroAssembler* masm, Label* exit, int id, int x, int y) {

__ SelectNonSmi(r9, rcx, rdx, exit);

__ incq(rax);

- __ SmiCompare(r9, rcx);

+ __ cmpq(r9, rcx);

__ j(not_equal, exit);

__ incq(rax);

@@ -1501,31 +1501,31 @@ void TestSmiAnd(MacroAssembler* masm, Label* exit, int id, int x, int y) {

__ Move(rdx, Smi::FromInt(y));

__ Move(r8, Smi::FromInt(result));

__ SmiAnd(r9, rcx, rdx);

- __ SmiCompare(r8, r9);

+ __ cmpq(r8, r9);

__ j(not_equal, exit);

__ incq(rax);

- __ SmiCompare(r11, rcx);

+ __ cmpq(r11, rcx);

__ j(not_equal, exit);

__ incq(rax);

__ SmiAnd(rcx, rcx, rdx);

- __ SmiCompare(r8, rcx);

+ __ cmpq(r8, rcx);

__ j(not_equal, exit);

__ movq(rcx, r11);

__ incq(rax);

__ SmiAndConstant(r9, rcx, Smi::FromInt(y));

- __ SmiCompare(r8, r9);

+ __ cmpq(r8, r9);

__ j(not_equal, exit);

__ incq(rax);

- __ SmiCompare(r11, rcx);

+ __ cmpq(r11, rcx);

__ j(not_equal, exit);

__ incq(rax);

__ SmiAndConstant(rcx, rcx, Smi::FromInt(y));

- __ SmiCompare(r8, rcx);

+ __ cmpq(r8, rcx);

__ j(not_equal, exit);

}

@@ -1582,31 +1582,31 @@ void TestSmiOr(MacroAssembler* masm, Label* exit, int id, int x, int y) {

__ Move(rdx, Smi::FromInt(y));

__ Move(r8, Smi::FromInt(result));

__ SmiOr(r9, rcx, rdx);

- __ SmiCompare(r8, r9);

+ __ cmpq(r8, r9);

__ j(not_equal, exit);

__ incq(rax);

- __ SmiCompare(r11, rcx);

+ __ cmpq(r11, rcx);

__ j(not_equal, exit);

__ incq(rax);

__ SmiOr(rcx, rcx, rdx);

- __ SmiCompare(r8, rcx);

+ __ cmpq(r8, rcx);

__ j(not_equal, exit);

__ movq(rcx, r11);

__ incq(rax);

__ SmiOrConstant(r9, rcx, Smi::FromInt(y));

- __ SmiCompare(r8, r9);

+ __ cmpq(r8, r9);

__ j(not_equal, exit);

__ incq(rax);

- __ SmiCompare(r11, rcx);

+ __ cmpq(r11, rcx);

__ j(not_equal, exit);

__ incq(rax);

__ SmiOrConstant(rcx, rcx, Smi::FromInt(y));

- __ SmiCompare(r8, rcx);

+ __ cmpq(r8, rcx);

__ j(not_equal, exit);

}

@@ -1665,31 +1665,31 @@ void TestSmiXor(MacroAssembler* masm, Label* exit, int id, int x, int y) {

__ Move(rdx, Smi::FromInt(y));

__ Move(r8, Smi::FromInt(result));

__ SmiXor(r9, rcx, rdx);

- __ SmiCompare(r8, r9);

+ __ cmpq(r8, r9);

__ j(not_equal, exit);

__ incq(rax);

- __ SmiCompare(r11, rcx);

+ __ cmpq(r11, rcx);

__ j(not_equal, exit);

__ incq(rax);

__ SmiXor(rcx, rcx, rdx);

- __ SmiCompare(r8, rcx);

+ __ cmpq(r8, rcx);

__ j(not_equal, exit);

__ movq(rcx, r11);

__ incq(rax);

__ SmiXorConstant(r9, rcx, Smi::FromInt(y));

- __ SmiCompare(r8, r9);

+ __ cmpq(r8, r9);

__ j(not_equal, exit);

__ incq(rax);

- __ SmiCompare(r11, rcx);

+ __ cmpq(r11, rcx);

__ j(not_equal, exit);

__ incq(rax);

__ SmiXorConstant(rcx, rcx, Smi::FromInt(y));

- __ SmiCompare(r8, rcx);

+ __ cmpq(r8, rcx);

__ j(not_equal, exit);

}

@@ -1747,16 +1747,16 @@ void TestSmiNot(MacroAssembler* masm, Label* exit, int id, int x) {

__ movq(r11, rcx);

__ SmiNot(r9, rcx);

- __ SmiCompare(r9, r8);

+ __ cmpq(r9, r8);

__ j(not_equal, exit);

__ incq(rax);

- __ SmiCompare(r11, rcx);

+ __ cmpq(r11, rcx);

__ j(not_equal, exit);

__ incq(rax);

__ SmiNot(rcx, rcx);

- __ SmiCompare(rcx, r8);

+ __ cmpq(rcx, r8);

__ j(not_equal, exit);

}

@@ -1814,7 +1814,7 @@ void TestSmiShiftLeft(MacroAssembler* masm, Label* exit, int id, int x) {

__ SmiShiftLeftConstant(r9, rcx, shift);

__ incq(rax);

- __ SmiCompare(r9, r8);

+ __ cmpq(r9, r8);

__ j(not_equal, exit);

__ incq(rax);

@@ -1822,7 +1822,7 @@ void TestSmiShiftLeft(MacroAssembler* masm, Label* exit, int id, int x) {

__ SmiShiftLeftConstant(rcx, rcx, shift);

__ incq(rax);

- __ SmiCompare(rcx, r8);

+ __ cmpq(rcx, r8);

__ j(not_equal, exit);

__ incq(rax);

@@ -1831,7 +1831,7 @@ void TestSmiShiftLeft(MacroAssembler* masm, Label* exit, int id, int x) {

__ SmiShiftLeft(r9, rdx, rcx);

__ incq(rax);

- __ SmiCompare(r9, r8);

+ __ cmpq(r9, r8);

__ j(not_equal, exit);

__ incq(rax);

@@ -1840,7 +1840,7 @@ void TestSmiShiftLeft(MacroAssembler* masm, Label* exit, int id, int x) {

__ SmiShiftLeft(r9, rdx, r11);

__ incq(rax);

- __ SmiCompare(r9, r8);

+ __ cmpq(r9, r8);

__ j(not_equal, exit);

__ incq(rax);

@@ -1849,7 +1849,7 @@ void TestSmiShiftLeft(MacroAssembler* masm, Label* exit, int id, int x) {

__ SmiShiftLeft(rdx, rdx, r11);

__ incq(rax);

- __ SmiCompare(rdx, r8);

+ __ cmpq(rdx, r8);

__ j(not_equal, exit);

__ incq(rax);

@@ -1911,7 +1911,7 @@ void TestSmiShiftLogicalRight(MacroAssembler* masm,

__ SmiShiftLogicalRightConstant(r9, rcx, shift, exit);

__ incq(rax);

- __ SmiCompare(r9, r8);

+ __ cmpq(r9, r8);

__ j(not_equal, exit);

__ incq(rax);

@@ -1920,7 +1920,7 @@ void TestSmiShiftLogicalRight(MacroAssembler* masm,

__ SmiShiftLogicalRight(r9, rdx, rcx, exit);

__ incq(rax);

- __ SmiCompare(r9, r8);

+ __ cmpq(r9, r8);

__ j(not_equal, exit);

__ incq(rax);

@@ -1929,7 +1929,7 @@ void TestSmiShiftLogicalRight(MacroAssembler* masm,

__ SmiShiftLogicalRight(r9, rdx, r11, exit);

__ incq(rax);

- __ SmiCompare(r9, r8);

+ __ cmpq(r9, r8);

__ j(not_equal, exit);

__ incq(rax);

@@ -1943,7 +1943,7 @@ void TestSmiShiftLogicalRight(MacroAssembler* masm,

__ bind(&fail_ok);

__ incq(rax);

- __ SmiCompare(rcx, r11);

+ __ cmpq(rcx, r11);

__ j(not_equal, exit);

__ incq(rax);

@@ -1954,7 +1954,7 @@ void TestSmiShiftLogicalRight(MacroAssembler* masm,

__ bind(&fail_ok3);

__ incq(rax);

- __ SmiCompare(rcx, r11);

+ __ cmpq(rcx, r11);

__ j(not_equal, exit);

__ addq(rax, Immediate(3));

@@ -2016,7 +2016,7 @@ void TestSmiShiftArithmeticRight(MacroAssembler* masm,

__ Move(rcx, Smi::FromInt(x));

__ SmiShiftArithmeticRightConstant(rcx, rcx, shift);

- __ SmiCompare(rcx, r8);

+ __ cmpq(rcx, r8);

__ j(not_equal, exit);

__ incq(rax);

@@ -2024,7 +2024,7 @@ void TestSmiShiftArithmeticRight(MacroAssembler* masm,

__ Move(r11, Smi::FromInt(shift));

__ SmiShiftArithmeticRight(rdx, rdx, r11);

- __ SmiCompare(rdx, r8);

+ __ cmpq(rdx, r8);

__ j(not_equal, exit);

__ incq(rax);

@@ -2082,14 +2082,14 @@ void TestPositiveSmiPowerUp(MacroAssembler* masm, Label* exit, int id, int x) {

__ Move(rcx, Smi::FromInt(x));

__ movq(r11, rcx);

__ PositiveSmiTimesPowerOfTwoToInteger64(rdx, rcx, power);

- __ SmiCompare(rdx, r8);

+ __ cmpq(rdx, r8);

__ j(not_equal, exit);

__ incq(rax);

- __ SmiCompare(r11, rcx); // rcx unchanged.

+ __ cmpq(r11, rcx); // rcx unchanged.

__ j(not_equal, exit);

__ incq(rax);

__ PositiveSmiTimesPowerOfTwoToInteger64(rcx, rcx, power);

- __ SmiCompare(rdx, r8);

+ __ cmpq(rdx, r8);

__ j(not_equal, exit);

__ incq(rax);

}

@@ -2097,11 +2097,15 @@ void TestPositiveSmiPowerUp(MacroAssembler* masm, Label* exit, int id, int x) {

TEST(PositiveSmiTimesPowerOfTwoToInteger64) {

+<<<<<<< .working

Vitaly Repeshko 2011/03/16 13:21:50 Huh?

Mads Ager (chromium) 2011/03/16 13:54:28 Whoops, thanks. Fixed, running tests now.

v8::internal::V8::Initialize(NULL);

+=======

+ v8::V8::Initialize();

+>>>>>>> .merge-right.r7201

// Allocate an executable page of memory.

size_t actual_size;

byte* buffer =

- static_cast<byte*>(OS::Allocate(Assembler::kMinimalBufferSize * 2,

+ static_cast<byte*>(OS::Allocate(Assembler::kMinimalBufferSize * 4,

&actual_size,

true));

CHECK(buffer);

« src/deoptimizer.cc ('K') | « test/cctest/test-disasm-arm.cc ('k') | test/cctest/testcfg.py » ('j') | no next file with comments »