test/cctest/test-macro-assembler-x64.cc - Issue 6771052: Fix non-ia32 build.

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

Issue 6771052: Fix non-ia32 build. (Closed)

Patch Set: lint fix 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

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 c7c67b05888fc4533f412946bb85987320c3f7a1..59eeed906c8f69ce5bdc3b059fc6b2c2766e3624 100755

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

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

@@ -35,48 +35,49 @@

#include "serialize.h"

#include "cctest.h"

-using v8::internal::byte;

-using v8::internal::OS;

using v8::internal::Assembler;

+using v8::internal::CodeDesc;

using v8::internal::Condition;

-using v8::internal::MacroAssembler;

+using v8::internal::FUNCTION_CAST;

using v8::internal::HandleScope;

-using v8::internal::Operand;

using v8::internal::Immediate;

-using v8::internal::SmiIndex;

+using v8::internal::Isolate;

using v8::internal::Label;

+using v8::internal::MacroAssembler;

+using v8::internal::OS;

+using v8::internal::Operand;

using v8::internal::RelocInfo;

+using v8::internal::Smi;

+using v8::internal::SmiIndex;

+using v8::internal::byte;

+using v8::internal::carry;

+using v8::internal::greater;

+using v8::internal::greater_equal;

+using v8::internal::kIntSize;

+using v8::internal::kPointerSize;

+using v8::internal::kSmiTagMask;

+using v8::internal::kSmiValueSize;

+using v8::internal::less_equal;

+using v8::internal::negative;

+using v8::internal::not_carry;

+using v8::internal::not_equal;

+using v8::internal::not_zero;

+using v8::internal::positive;

+using v8::internal::r11;

+using v8::internal::r13;

+using v8::internal::r14;

+using v8::internal::r15;

+using v8::internal::r8;

+using v8::internal::r9;

using v8::internal::rax;

+using v8::internal::rbp;

using v8::internal::rbx;

-using v8::internal::rsi;

-using v8::internal::rdi;

using v8::internal::rcx;

+using v8::internal::rdi;

using v8::internal::rdx;

-using v8::internal::rbp;

+using v8::internal::rsi;

using v8::internal::rsp;

-using v8::internal::r8;

-using v8::internal::r9;

-using v8::internal::r11;

-using v8::internal::r13;

-using v8::internal::r14;

-using v8::internal::r15;

using v8::internal::times_pointer_size;

-using v8::internal::FUNCTION_CAST;

-using v8::internal::CodeDesc;

-using v8::internal::less_equal;

-using v8::internal::not_equal;

-using v8::internal::not_zero;

-using v8::internal::greater;

-using v8::internal::greater_equal;

-using v8::internal::carry;

-using v8::internal::not_carry;

-using v8::internal::negative;

-using v8::internal::positive;

-using v8::internal::Smi;

-using v8::internal::kSmiTagMask;

-using v8::internal::kSmiValueSize;

-using v8::internal::kPointerSize;

-using v8::internal::kIntSize;

// Test the x64 assembler by compiling some simple functions into

// a buffer and executing them. These tests do not initialize the

@@ -157,7 +158,9 @@ TEST(SmiMove) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, static_cast<int>(actual_size));

+ MacroAssembler assembler(Isolate::Current(),

+ buffer,

+ static_cast<int>(actual_size));

MacroAssembler* masm = &assembler; // Create a pointer for the __ macro.

masm->set_allow_stub_calls(false);

EntryCode(masm);

@@ -245,7 +248,9 @@ TEST(SmiCompare) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, static_cast<int>(actual_size));

+ MacroAssembler assembler(Isolate::Current(),

+ buffer,

+ static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -295,7 +300,9 @@ TEST(Integer32ToSmi) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, static_cast<int>(actual_size));

+ MacroAssembler assembler(Isolate::Current(),

+ buffer,

+ static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -423,7 +430,9 @@ TEST(Integer64PlusConstantToSmi) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, static_cast<int>(actual_size));

+ MacroAssembler assembler(Isolate::Current(),

+ buffer,

+ static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -467,7 +476,9 @@ TEST(SmiCheck) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, static_cast<int>(actual_size));

+ MacroAssembler assembler(Isolate::Current(),

+ buffer,

+ static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -715,7 +726,9 @@ TEST(SmiNeg) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, static_cast<int>(actual_size));

+ MacroAssembler assembler(Isolate::Current(),

+ buffer,

+ static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -803,7 +816,9 @@ TEST(SmiAdd) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, static_cast<int>(actual_size));

+ MacroAssembler assembler(Isolate::Current(),

+ buffer,

+ static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -993,7 +1008,9 @@ TEST(SmiSub) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, static_cast<int>(actual_size));

+ MacroAssembler assembler(Isolate::Current(),

+ buffer,

+ static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -1083,7 +1100,9 @@ TEST(SmiMul) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, static_cast<int>(actual_size));

+ MacroAssembler assembler(Isolate::Current(),

+ buffer,

+ static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -1189,7 +1208,9 @@ TEST(SmiDiv) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, static_cast<int>(actual_size));

+ MacroAssembler assembler(Isolate::Current(),

+ buffer,

+ static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -1299,7 +1320,9 @@ TEST(SmiMod) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, static_cast<int>(actual_size));

+ MacroAssembler assembler(Isolate::Current(),

+ buffer,

+ static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -1395,7 +1418,9 @@ TEST(SmiIndex) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, static_cast<int>(actual_size));

+ MacroAssembler assembler(Isolate::Current(),

+ buffer,

+ static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -1464,7 +1489,9 @@ TEST(SmiSelectNonSmi) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, static_cast<int>(actual_size));

+ MacroAssembler assembler(Isolate::Current(),

+ buffer,

+ static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false); // Avoid inline checks.

@@ -1543,7 +1570,9 @@ TEST(SmiAnd) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, static_cast<int>(actual_size));

+ MacroAssembler assembler(Isolate::Current(),

+ buffer,

+ static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -1624,7 +1653,9 @@ TEST(SmiOr) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, static_cast<int>(actual_size));

+ MacroAssembler assembler(Isolate::Current(),

+ buffer,

+ static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -1707,7 +1738,9 @@ TEST(SmiXor) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, static_cast<int>(actual_size));

+ MacroAssembler assembler(Isolate::Current(),

+ buffer,

+ static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -1774,7 +1807,9 @@ TEST(SmiNot) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, static_cast<int>(actual_size));

+ MacroAssembler assembler(Isolate::Current(),

+ buffer,

+ static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -1870,7 +1905,9 @@ TEST(SmiShiftLeft) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, static_cast<int>(actual_size));

+ MacroAssembler assembler(Isolate::Current(),

+ buffer,

+ static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -1976,7 +2013,9 @@ TEST(SmiShiftLogicalRight) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, static_cast<int>(actual_size));

+ MacroAssembler assembler(Isolate::Current(),

+ buffer,

+ static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -2045,7 +2084,9 @@ TEST(SmiShiftArithmeticRight) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, static_cast<int>(actual_size));

+ MacroAssembler assembler(Isolate::Current(),

+ buffer,

+ static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -2109,7 +2150,9 @@ TEST(PositiveSmiTimesPowerOfTwoToInteger64) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, static_cast<int>(actual_size));

+ MacroAssembler assembler(Isolate::Current(),

+ buffer,

+ static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

@@ -2152,7 +2195,9 @@ TEST(OperandOffset) {

true));

CHECK(buffer);

HandleScope handles;

- MacroAssembler assembler(buffer, static_cast<int>(actual_size));

+ MacroAssembler assembler(Isolate::Current(),

+ buffer,

+ static_cast<int>(actual_size));

MacroAssembler* masm = &assembler;

masm->set_allow_stub_calls(false);

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