Skip to content

V
V8
Commit 654a7cb3 authored by Florian Sattler's avatar Florian Sattler Committed by Commit Bot
Browse files
Options

[cleanup] Replace 0 and NULL with nullptr for compiler files. 

Fixing clang-tidy warning.

Bug: v8:8015
Change-Id: I20fd23b5370d15dddc913f6bdb05e649d71c2059
Reviewed-on: https://chromium-review.googlesource.com/1224373Reviewed-by: 's avatarIgor Sheludko <ishell@chromium.org>
Commit-Queue: Florian Sattler <sattlerf@google.com>
Cr-Commit-Position: refs/heads/master@{#55919}
parent 3a79fe23
Show whitespace changes
Inline Side-by-side
Showing with 239 additions and 239 deletions
test/unittests/compiler/graph-reducer-unittest.cc
View file @ 654a7cb3
......@@ -751,7 +751,7 @@ TEST_F(GraphReducerTest, Sorter1) {
Node* n1 = graph()->NewNode(&kOpA0);
Node* n2 = graph()->NewNode(&kOpA1, n1);
Node* n3 = graph()->NewNode(&kOpA1, n1);
Node* end = NULL; // Initialize to please the compiler.
Node* end = nullptr; // Initialize to please the compiler.
if (i == 0) end = graph()->NewNode(&kOpA2, n2, n3);
if (i == 1) end = graph()->NewNode(&kOpA2, n3, n2);
......
test/unittests/compiler/node-cache-unittest.cc
View file @ 654a7cb3
......@@ -63,7 +63,7 @@ TEST_F(NodeCacheTest, Int32Constant_hits) {
for (int i = 0; i < kSize; i++) {
int32_t v = i * -55;
Node** pos = cache.Find(zone(), v);
if (*pos != NULL) {
if (*pos != nullptr) {
EXPECT_EQ(nodes[i], *pos);
hits++;
}
......@@ -101,7 +101,7 @@ TEST_F(NodeCacheTest, Int64Constant_hits) {
for (int i = 0; i < kSize; i++) {
int64_t v = static_cast<int64_t>(i) * static_cast<int64_t>(5003001);
Node** pos = cache.Find(zone(), v);
if (*pos != NULL) {
if (*pos != nullptr) {
EXPECT_EQ(nodes[i], *pos);
hits++;
}
......@@ -118,7 +118,7 @@ TEST_F(NodeCacheTest, GetCachedNodes_int32) {
for (size_t i = 0; i < arraysize(constants); i++) {
int32_t k = constants[i];
Node** pos = cache.Find(zone(), k);
if (*pos != NULL) {
if (*pos != nullptr) {
ZoneVector<Node*> nodes(zone());
cache.GetCachedNodes(&nodes);
EXPECT_THAT(nodes, Contains(*pos));
......@@ -141,7 +141,7 @@ TEST_F(NodeCacheTest, GetCachedNodes_int64) {
for (size_t i = 0; i < arraysize(constants); i++) {
int64_t k = constants[i];
Node** pos = cache.Find(zone(), k);
if (*pos != NULL) {
if (*pos != nullptr) {
ZoneVector<Node*> nodes(zone());
cache.GetCachedNodes(&nodes);
EXPECT_THAT(nodes, Contains(*pos));
......
test/unittests/compiler/node-matchers-unittest.cc
View file @ 654a7cb3
......@@ -150,191 +150,191 @@ TEST_F(NodeMatcherTest, ScaledWithOffset32Matcher) {
// (B0 + B1) -> [B0, 0, B1, NULL]
BaseWithIndexAndDisplacement32Matcher match1(graph()->NewNode(a_op, b0, b1));
CheckBaseWithIndexAndDisplacement(&match1, b1, 0, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match1, b1, 0, b0, nullptr);
// (B0 + D15) -> [NULL, 0, B0, D15]
BaseWithIndexAndDisplacement32Matcher match2(graph()->NewNode(a_op, b0, d15));
CheckBaseWithIndexAndDisplacement(&match2, NULL, 0, b0, d15);
CheckBaseWithIndexAndDisplacement(&match2, nullptr, 0, b0, d15);
// (D15 + B0) -> [NULL, 0, B0, D15]
BaseWithIndexAndDisplacement32Matcher match3(graph()->NewNode(a_op, d15, b0));
CheckBaseWithIndexAndDisplacement(&match3, NULL, 0, b0, d15);
CheckBaseWithIndexAndDisplacement(&match3, nullptr, 0, b0, d15);
// (B0 + M1) -> [p1, 0, B0, NULL]
BaseWithIndexAndDisplacement32Matcher match4(graph()->NewNode(a_op, b0, m1));
CheckBaseWithIndexAndDisplacement(&match4, p1, 0, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match4, p1, 0, b0, nullptr);
// (M1 + B0) -> [p1, 0, B0, NULL]
m1 = graph()->NewNode(m_op, p1, d1);
BaseWithIndexAndDisplacement32Matcher match5(graph()->NewNode(a_op, m1, b0));
CheckBaseWithIndexAndDisplacement(&match5, p1, 0, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match5, p1, 0, b0, nullptr);
// (D15 + M1) -> [P1, 0, NULL, D15]
m1 = graph()->NewNode(m_op, p1, d1);
BaseWithIndexAndDisplacement32Matcher match6(graph()->NewNode(a_op, d15, m1));
CheckBaseWithIndexAndDisplacement(&match6, p1, 0, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match6, p1, 0, nullptr, d15);
// (M1 + D15) -> [P1, 0, NULL, D15]
m1 = graph()->NewNode(m_op, p1, d1);
BaseWithIndexAndDisplacement32Matcher match7(graph()->NewNode(a_op, m1, d15));
CheckBaseWithIndexAndDisplacement(&match7, p1, 0, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match7, p1, 0, nullptr, d15);
// (B0 + S0) -> [p1, 0, B0, NULL]
BaseWithIndexAndDisplacement32Matcher match8(graph()->NewNode(a_op, b0, s0));
CheckBaseWithIndexAndDisplacement(&match8, p1, 0, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match8, p1, 0, b0, nullptr);
// (S0 + B0) -> [p1, 0, B0, NULL]
s0 = graph()->NewNode(s_op, p1, d0);
BaseWithIndexAndDisplacement32Matcher match9(graph()->NewNode(a_op, s0, b0));
CheckBaseWithIndexAndDisplacement(&match9, p1, 0, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match9, p1, 0, b0, nullptr);
// (D15 + S0) -> [P1, 0, NULL, D15]
s0 = graph()->NewNode(s_op, p1, d0);
BaseWithIndexAndDisplacement32Matcher match10(
graph()->NewNode(a_op, d15, s0));
CheckBaseWithIndexAndDisplacement(&match10, p1, 0, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match10, p1, 0, nullptr, d15);
// (S0 + D15) -> [P1, 0, NULL, D15]
s0 = graph()->NewNode(s_op, p1, d0);
BaseWithIndexAndDisplacement32Matcher match11(
graph()->NewNode(a_op, s0, d15));
CheckBaseWithIndexAndDisplacement(&match11, p1, 0, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match11, p1, 0, nullptr, d15);
// (B0 + M2) -> [p1, 1, B0, NULL]
BaseWithIndexAndDisplacement32Matcher match12(graph()->NewNode(a_op, b0, m2));
CheckBaseWithIndexAndDisplacement(&match12, p1, 1, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match12, p1, 1, b0, nullptr);
// (M2 + B0) -> [p1, 1, B0, NULL]
m2 = graph()->NewNode(m_op, p1, d2);
BaseWithIndexAndDisplacement32Matcher match13(graph()->NewNode(a_op, m2, b0));
CheckBaseWithIndexAndDisplacement(&match13, p1, 1, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match13, p1, 1, b0, nullptr);
// (D15 + M2) -> [P1, 1, NULL, D15]
m2 = graph()->NewNode(m_op, p1, d2);
BaseWithIndexAndDisplacement32Matcher match14(
graph()->NewNode(a_op, d15, m2));
CheckBaseWithIndexAndDisplacement(&match14, p1, 1, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match14, p1, 1, nullptr, d15);
// (M2 + D15) -> [P1, 1, NULL, D15]
m2 = graph()->NewNode(m_op, p1, d2);
BaseWithIndexAndDisplacement32Matcher match15(
graph()->NewNode(a_op, m2, d15));
CheckBaseWithIndexAndDisplacement(&match15, p1, 1, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match15, p1, 1, nullptr, d15);
// (B0 + S1) -> [p1, 1, B0, NULL]
BaseWithIndexAndDisplacement32Matcher match16(graph()->NewNode(a_op, b0, s1));
CheckBaseWithIndexAndDisplacement(&match16, p1, 1, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match16, p1, 1, b0, nullptr);
// (S1 + B0) -> [p1, 1, B0, NULL]
s1 = graph()->NewNode(s_op, p1, d1);
BaseWithIndexAndDisplacement32Matcher match17(graph()->NewNode(a_op, s1, b0));
CheckBaseWithIndexAndDisplacement(&match17, p1, 1, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match17, p1, 1, b0, nullptr);
// (D15 + S1) -> [P1, 1, NULL, D15]
s1 = graph()->NewNode(s_op, p1, d1);
BaseWithIndexAndDisplacement32Matcher match18(
graph()->NewNode(a_op, d15, s1));
CheckBaseWithIndexAndDisplacement(&match18, p1, 1, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match18, p1, 1, nullptr, d15);
// (S1 + D15) -> [P1, 1, NULL, D15]
s1 = graph()->NewNode(s_op, p1, d1);
BaseWithIndexAndDisplacement32Matcher match19(
graph()->NewNode(a_op, s1, d15));
CheckBaseWithIndexAndDisplacement(&match19, p1, 1, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match19, p1, 1, nullptr, d15);
// (B0 + M4) -> [p1, 2, B0, NULL]
BaseWithIndexAndDisplacement32Matcher match20(graph()->NewNode(a_op, b0, m4));
CheckBaseWithIndexAndDisplacement(&match20, p1, 2, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match20, p1, 2, b0, nullptr);
// (M4 + B0) -> [p1, 2, B0, NULL]
m4 = graph()->NewNode(m_op, p1, d4);
BaseWithIndexAndDisplacement32Matcher match21(graph()->NewNode(a_op, m4, b0));
CheckBaseWithIndexAndDisplacement(&match21, p1, 2, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match21, p1, 2, b0, nullptr);
// (D15 + M4) -> [p1, 2, NULL, D15]
m4 = graph()->NewNode(m_op, p1, d4);
BaseWithIndexAndDisplacement32Matcher match22(
graph()->NewNode(a_op, d15, m4));
CheckBaseWithIndexAndDisplacement(&match22, p1, 2, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match22, p1, 2, nullptr, d15);
// (M4 + D15) -> [p1, 2, NULL, D15]
m4 = graph()->NewNode(m_op, p1, d4);
BaseWithIndexAndDisplacement32Matcher match23(
graph()->NewNode(a_op, m4, d15));
CheckBaseWithIndexAndDisplacement(&match23, p1, 2, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match23, p1, 2, nullptr, d15);
// (B0 + S2) -> [p1, 2, B0, NULL]
BaseWithIndexAndDisplacement32Matcher match24(graph()->NewNode(a_op, b0, s2));
CheckBaseWithIndexAndDisplacement(&match24, p1, 2, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match24, p1, 2, b0, nullptr);
// (S2 + B0) -> [p1, 2, B0, NULL]
s2 = graph()->NewNode(s_op, p1, d2);
BaseWithIndexAndDisplacement32Matcher match25(graph()->NewNode(a_op, s2, b0));
CheckBaseWithIndexAndDisplacement(&match25, p1, 2, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match25, p1, 2, b0, nullptr);
// (D15 + S2) -> [p1, 2, NULL, D15]
s2 = graph()->NewNode(s_op, p1, d2);
BaseWithIndexAndDisplacement32Matcher match26(
graph()->NewNode(a_op, d15, s2));
CheckBaseWithIndexAndDisplacement(&match26, p1, 2, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match26, p1, 2, nullptr, d15);
// (S2 + D15) -> [p1, 2, NULL, D15]
s2 = graph()->NewNode(s_op, p1, d2);
BaseWithIndexAndDisplacement32Matcher match27(
graph()->NewNode(a_op, s2, d15));
CheckBaseWithIndexAndDisplacement(&match27, p1, 2, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match27, p1, 2, nullptr, d15);
// (B0 + M8) -> [p1, 2, B0, NULL]
BaseWithIndexAndDisplacement32Matcher match28(graph()->NewNode(a_op, b0, m8));
CheckBaseWithIndexAndDisplacement(&match28, p1, 3, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match28, p1, 3, b0, nullptr);
// (M8 + B0) -> [p1, 2, B0, NULL]
m8 = graph()->NewNode(m_op, p1, d8);
BaseWithIndexAndDisplacement32Matcher match29(graph()->NewNode(a_op, m8, b0));
CheckBaseWithIndexAndDisplacement(&match29, p1, 3, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match29, p1, 3, b0, nullptr);
// (D15 + M8) -> [p1, 2, NULL, D15]
m8 = graph()->NewNode(m_op, p1, d8);
BaseWithIndexAndDisplacement32Matcher match30(
graph()->NewNode(a_op, d15, m8));
CheckBaseWithIndexAndDisplacement(&match30, p1, 3, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match30, p1, 3, nullptr, d15);
// (M8 + D15) -> [p1, 2, NULL, D15]
m8 = graph()->NewNode(m_op, p1, d8);
BaseWithIndexAndDisplacement32Matcher match31(
graph()->NewNode(a_op, m8, d15));
CheckBaseWithIndexAndDisplacement(&match31, p1, 3, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match31, p1, 3, nullptr, d15);
// (B0 + S3) -> [p1, 2, B0, NULL]
BaseWithIndexAndDisplacement32Matcher match32(graph()->NewNode(a_op, b0, s3));
CheckBaseWithIndexAndDisplacement(&match32, p1, 3, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match32, p1, 3, b0, nullptr);
// (S3 + B0) -> [p1, 2, B0, NULL]
s3 = graph()->NewNode(s_op, p1, d3);
BaseWithIndexAndDisplacement32Matcher match33(graph()->NewNode(a_op, s3, b0));
CheckBaseWithIndexAndDisplacement(&match33, p1, 3, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match33, p1, 3, b0, nullptr);
// (D15 + S3) -> [p1, 2, NULL, D15]
s3 = graph()->NewNode(s_op, p1, d3);
BaseWithIndexAndDisplacement32Matcher match34(
graph()->NewNode(a_op, d15, s3));
CheckBaseWithIndexAndDisplacement(&match34, p1, 3, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match34, p1, 3, nullptr, d15);
// (S3 + D15) -> [p1, 2, NULL, D15]
s3 = graph()->NewNode(s_op, p1, d3);
BaseWithIndexAndDisplacement32Matcher match35(
graph()->NewNode(a_op, s3, d15));
CheckBaseWithIndexAndDisplacement(&match35, p1, 3, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match35, p1, 3, nullptr, d15);
// 2 INPUT - NEGATIVE CASES
// (M3 + B1) -> [B0, 0, M3, NULL]
BaseWithIndexAndDisplacement32Matcher match36(graph()->NewNode(a_op, b1, m3));
CheckBaseWithIndexAndDisplacement(&match36, m3, 0, b1, NULL);
CheckBaseWithIndexAndDisplacement(&match36, m3, 0, b1, nullptr);
// (S4 + B1) -> [B0, 0, S4, NULL]
BaseWithIndexAndDisplacement32Matcher match37(graph()->NewNode(a_op, b1, s4));
CheckBaseWithIndexAndDisplacement(&match37, s4, 0, b1, NULL);
CheckBaseWithIndexAndDisplacement(&match37, s4, 0, b1, nullptr);
// 3 INPUT
......@@ -400,209 +400,209 @@ TEST_F(NodeMatcherTest, ScaledWithOffset32Matcher) {
m1 = graph()->NewNode(m_op, p1, d1);
ADD_ADDRESSING_OPERAND_USES(m1);
BaseWithIndexAndDisplacement32Matcher match47(graph()->NewNode(a_op, b0, m1));
CheckBaseWithIndexAndDisplacement(&match47, p1, 0, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match47, p1, 0, b0, nullptr);
// (M1 + B0) -> [p1, 0, B0, NULL]
m1 = graph()->NewNode(m_op, p1, d1);
ADD_ADDRESSING_OPERAND_USES(m1);
BaseWithIndexAndDisplacement32Matcher match48(graph()->NewNode(a_op, m1, b0));
CheckBaseWithIndexAndDisplacement(&match48, p1, 0, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match48, p1, 0, b0, nullptr);
// (D15 + M1) -> [P1, 0, NULL, D15]
m1 = graph()->NewNode(m_op, p1, d1);
ADD_ADDRESSING_OPERAND_USES(m1);
BaseWithIndexAndDisplacement32Matcher match49(
graph()->NewNode(a_op, d15, m1));
CheckBaseWithIndexAndDisplacement(&match49, p1, 0, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match49, p1, 0, nullptr, d15);
// (M1 + D15) -> [P1, 0, NULL, D15]
m1 = graph()->NewNode(m_op, p1, d1);
ADD_ADDRESSING_OPERAND_USES(m1);
BaseWithIndexAndDisplacement32Matcher match50(
graph()->NewNode(a_op, m1, d15));
CheckBaseWithIndexAndDisplacement(&match50, p1, 0, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match50, p1, 0, nullptr, d15);
// (B0 + S0) -> [p1, 0, B0, NULL]
s0 = graph()->NewNode(s_op, p1, d0);
ADD_ADDRESSING_OPERAND_USES(s0);
BaseWithIndexAndDisplacement32Matcher match51(graph()->NewNode(a_op, b0, s0));
CheckBaseWithIndexAndDisplacement(&match51, p1, 0, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match51, p1, 0, b0, nullptr);
// (S0 + B0) -> [p1, 0, B0, NULL]
s0 = graph()->NewNode(s_op, p1, d0);
ADD_ADDRESSING_OPERAND_USES(s0);
BaseWithIndexAndDisplacement32Matcher match52(graph()->NewNode(a_op, s0, b0));
CheckBaseWithIndexAndDisplacement(&match52, p1, 0, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match52, p1, 0, b0, nullptr);
// (D15 + S0) -> [P1, 0, NULL, D15]
s0 = graph()->NewNode(s_op, p1, d0);
ADD_ADDRESSING_OPERAND_USES(s0);
BaseWithIndexAndDisplacement32Matcher match53(
graph()->NewNode(a_op, d15, s0));
CheckBaseWithIndexAndDisplacement(&match53, p1, 0, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match53, p1, 0, nullptr, d15);
// (S0 + D15) -> [P1, 0, NULL, D15]
s0 = graph()->NewNode(s_op, p1, d0);
ADD_ADDRESSING_OPERAND_USES(s0);
BaseWithIndexAndDisplacement32Matcher match54(
graph()->NewNode(a_op, s0, d15));
CheckBaseWithIndexAndDisplacement(&match54, p1, 0, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match54, p1, 0, nullptr, d15);
// (B0 + M2) -> [p1, 1, B0, NULL]
m2 = graph()->NewNode(m_op, p1, d2);
ADD_ADDRESSING_OPERAND_USES(m2);
BaseWithIndexAndDisplacement32Matcher match55(graph()->NewNode(a_op, b0, m2));
CheckBaseWithIndexAndDisplacement(&match55, p1, 1, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match55, p1, 1, b0, nullptr);
// (M2 + B0) -> [p1, 1, B0, NULL]
m2 = graph()->NewNode(m_op, p1, d2);
ADD_ADDRESSING_OPERAND_USES(m2);
BaseWithIndexAndDisplacement32Matcher match56(graph()->NewNode(a_op, m2, b0));
CheckBaseWithIndexAndDisplacement(&match56, p1, 1, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match56, p1, 1, b0, nullptr);
// (D15 + M2) -> [P1, 1, NULL, D15]
m2 = graph()->NewNode(m_op, p1, d2);
ADD_ADDRESSING_OPERAND_USES(m2);
BaseWithIndexAndDisplacement32Matcher match57(
graph()->NewNode(a_op, d15, m2));
CheckBaseWithIndexAndDisplacement(&match57, p1, 1, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match57, p1, 1, nullptr, d15);
// (M2 + D15) -> [P1, 1, NULL, D15]
m2 = graph()->NewNode(m_op, p1, d2);
ADD_ADDRESSING_OPERAND_USES(m2);
BaseWithIndexAndDisplacement32Matcher match58(
graph()->NewNode(a_op, m2, d15));
CheckBaseWithIndexAndDisplacement(&match58, p1, 1, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match58, p1, 1, nullptr, d15);
// (B0 + S1) -> [p1, 1, B0, NULL]
s1 = graph()->NewNode(s_op, p1, d1);
ADD_ADDRESSING_OPERAND_USES(s1);
BaseWithIndexAndDisplacement32Matcher match59(graph()->NewNode(a_op, b0, s1));
CheckBaseWithIndexAndDisplacement(&match59, p1, 1, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match59, p1, 1, b0, nullptr);
// (S1 + B0) -> [p1, 1, B0, NULL]
s1 = graph()->NewNode(s_op, p1, d1);
ADD_ADDRESSING_OPERAND_USES(s1);
BaseWithIndexAndDisplacement32Matcher match60(graph()->NewNode(a_op, s1, b0));
CheckBaseWithIndexAndDisplacement(&match60, p1, 1, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match60, p1, 1, b0, nullptr);
// (D15 + S1) -> [P1, 1, NULL, D15]
s1 = graph()->NewNode(s_op, p1, d1);
ADD_ADDRESSING_OPERAND_USES(s1);
BaseWithIndexAndDisplacement32Matcher match61(
graph()->NewNode(a_op, d15, s1));
CheckBaseWithIndexAndDisplacement(&match61, p1, 1, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match61, p1, 1, nullptr, d15);
// (S1 + D15) -> [P1, 1, NULL, D15]
s1 = graph()->NewNode(s_op, p1, d1);
ADD_ADDRESSING_OPERAND_USES(s1);
BaseWithIndexAndDisplacement32Matcher match62(
graph()->NewNode(a_op, s1, d15));
CheckBaseWithIndexAndDisplacement(&match62, p1, 1, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match62, p1, 1, nullptr, d15);
// (B0 + M4) -> [p1, 2, B0, NULL]
m4 = graph()->NewNode(m_op, p1, d4);
ADD_ADDRESSING_OPERAND_USES(m4);
BaseWithIndexAndDisplacement32Matcher match63(graph()->NewNode(a_op, b0, m4));
CheckBaseWithIndexAndDisplacement(&match63, p1, 2, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match63, p1, 2, b0, nullptr);
// (M4 + B0) -> [p1, 2, B0, NULL]
m4 = graph()->NewNode(m_op, p1, d4);
ADD_ADDRESSING_OPERAND_USES(m4);
BaseWithIndexAndDisplacement32Matcher match64(graph()->NewNode(a_op, m4, b0));
CheckBaseWithIndexAndDisplacement(&match64, p1, 2, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match64, p1, 2, b0, nullptr);
// (D15 + M4) -> [p1, 2, NULL, D15]
m4 = graph()->NewNode(m_op, p1, d4);
ADD_ADDRESSING_OPERAND_USES(m4);
BaseWithIndexAndDisplacement32Matcher match65(
graph()->NewNode(a_op, d15, m4));
CheckBaseWithIndexAndDisplacement(&match65, p1, 2, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match65, p1, 2, nullptr, d15);
// (M4 + D15) -> [p1, 2, NULL, D15]
m4 = graph()->NewNode(m_op, p1, d4);
ADD_ADDRESSING_OPERAND_USES(m4);
BaseWithIndexAndDisplacement32Matcher match66(
graph()->NewNode(a_op, m4, d15));
CheckBaseWithIndexAndDisplacement(&match66, p1, 2, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match66, p1, 2, nullptr, d15);
// (B0 + S2) -> [p1, 2, B0, NULL]
s2 = graph()->NewNode(s_op, p1, d2);
ADD_ADDRESSING_OPERAND_USES(s2);
BaseWithIndexAndDisplacement32Matcher match67(graph()->NewNode(a_op, b0, s2));
CheckBaseWithIndexAndDisplacement(&match67, p1, 2, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match67, p1, 2, b0, nullptr);
// (S2 + B0) -> [p1, 2, B0, NULL]
s2 = graph()->NewNode(s_op, p1, d2);
ADD_ADDRESSING_OPERAND_USES(s2);
BaseWithIndexAndDisplacement32Matcher match68(graph()->NewNode(a_op, s2, b0));
CheckBaseWithIndexAndDisplacement(&match68, p1, 2, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match68, p1, 2, b0, nullptr);
// (D15 + S2) -> [p1, 2, NULL, D15]
s2 = graph()->NewNode(s_op, p1, d2);
ADD_ADDRESSING_OPERAND_USES(s2);
BaseWithIndexAndDisplacement32Matcher match69(
graph()->NewNode(a_op, d15, s2));
CheckBaseWithIndexAndDisplacement(&match69, p1, 2, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match69, p1, 2, nullptr, d15);
// (S2 + D15) -> [p1, 2, NULL, D15]
s2 = graph()->NewNode(s_op, p1, d2);
ADD_ADDRESSING_OPERAND_USES(s2);
BaseWithIndexAndDisplacement32Matcher match70(
graph()->NewNode(a_op, s2, d15));
CheckBaseWithIndexAndDisplacement(&match70, p1, 2, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match70, p1, 2, nullptr, d15);
// (B0 + M8) -> [p1, 2, B0, NULL]
m8 = graph()->NewNode(m_op, p1, d8);
ADD_ADDRESSING_OPERAND_USES(m8);
BaseWithIndexAndDisplacement32Matcher match71(graph()->NewNode(a_op, b0, m8));
CheckBaseWithIndexAndDisplacement(&match71, p1, 3, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match71, p1, 3, b0, nullptr);
// (M8 + B0) -> [p1, 2, B0, NULL]
m8 = graph()->NewNode(m_op, p1, d8);
ADD_ADDRESSING_OPERAND_USES(m8);
BaseWithIndexAndDisplacement32Matcher match72(graph()->NewNode(a_op, m8, b0));
CheckBaseWithIndexAndDisplacement(&match72, p1, 3, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match72, p1, 3, b0, nullptr);
// (D15 + M8) -> [p1, 2, NULL, D15]
m8 = graph()->NewNode(m_op, p1, d8);
ADD_ADDRESSING_OPERAND_USES(m8);
BaseWithIndexAndDisplacement32Matcher match73(
graph()->NewNode(a_op, d15, m8));
CheckBaseWithIndexAndDisplacement(&match73, p1, 3, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match73, p1, 3, nullptr, d15);
// (M8 + D15) -> [p1, 2, NULL, D15]
m8 = graph()->NewNode(m_op, p1, d8);
ADD_ADDRESSING_OPERAND_USES(m8);
BaseWithIndexAndDisplacement32Matcher match74(
graph()->NewNode(a_op, m8, d15));
CheckBaseWithIndexAndDisplacement(&match74, p1, 3, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match74, p1, 3, nullptr, d15);
// (B0 + S3) -> [p1, 2, B0, NULL]
s3 = graph()->NewNode(s_op, p1, d3);
ADD_ADDRESSING_OPERAND_USES(s3);
BaseWithIndexAndDisplacement32Matcher match75(graph()->NewNode(a_op, b0, s3));
CheckBaseWithIndexAndDisplacement(&match75, p1, 3, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match75, p1, 3, b0, nullptr);
// (S3 + B0) -> [p1, 2, B0, NULL]
s3 = graph()->NewNode(s_op, p1, d3);
ADD_ADDRESSING_OPERAND_USES(s3);
BaseWithIndexAndDisplacement32Matcher match76(graph()->NewNode(a_op, s3, b0));
CheckBaseWithIndexAndDisplacement(&match76, p1, 3, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match76, p1, 3, b0, nullptr);
// (D15 + S3) -> [p1, 2, NULL, D15]
s3 = graph()->NewNode(s_op, p1, d3);
ADD_ADDRESSING_OPERAND_USES(s3);
BaseWithIndexAndDisplacement32Matcher match77(
graph()->NewNode(a_op, d15, s3));
CheckBaseWithIndexAndDisplacement(&match77, p1, 3, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match77, p1, 3, nullptr, d15);
// (S3 + D15) -> [p1, 2, NULL, D15]
s3 = graph()->NewNode(s_op, p1, d3);
ADD_ADDRESSING_OPERAND_USES(s3);
BaseWithIndexAndDisplacement32Matcher match78(
graph()->NewNode(a_op, s3, d15));
CheckBaseWithIndexAndDisplacement(&match78, p1, 3, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match78, p1, 3, nullptr, d15);
// (D15 + S3) + B0 -> [p1, 2, b0, d15]
s3 = graph()->NewNode(s_op, p1, d3);
......@@ -627,7 +627,7 @@ TEST_F(NodeMatcherTest, ScaledWithOffset32Matcher) {
ADD_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement32Matcher match81(
graph()->NewNode(a_op, temp, d15));
CheckBaseWithIndexAndDisplacement(&match81, NULL, 0, temp, d15);
CheckBaseWithIndexAndDisplacement(&match81, nullptr, 0, temp, d15);
// D15 + (S3 + B0) -> [NULL, 0, (s3 + b0), d15]
// Avoid changing simple addressing to complex addressing
......@@ -636,7 +636,7 @@ TEST_F(NodeMatcherTest, ScaledWithOffset32Matcher) {
ADD_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement32Matcher match82(
graph()->NewNode(a_op, d15, temp));
CheckBaseWithIndexAndDisplacement(&match82, NULL, 0, temp, d15);
CheckBaseWithIndexAndDisplacement(&match82, nullptr, 0, temp, d15);
// B0 + (D15 + S3) -> [p1, 2, b0, d15]
s3 = graph()->NewNode(s_op, p1, d3);
......@@ -686,7 +686,7 @@ TEST_F(NodeMatcherTest, ScaledWithOffset32Matcher) {
ADD_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement32Matcher match88(
graph()->NewNode(a_op, temp, d15));
CheckBaseWithIndexAndDisplacement(&match88, NULL, 0, temp, d15);
CheckBaseWithIndexAndDisplacement(&match88, nullptr, 0, temp, d15);
// D15 + (B0 + B1) -> [NULL, 0, (b0 + b1), d15]
// Avoid changing simple addressing to complex addressing
......@@ -694,7 +694,7 @@ TEST_F(NodeMatcherTest, ScaledWithOffset32Matcher) {
ADD_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement32Matcher match89(
graph()->NewNode(a_op, d15, temp));
CheckBaseWithIndexAndDisplacement(&match89, NULL, 0, temp, d15);
CheckBaseWithIndexAndDisplacement(&match89, nullptr, 0, temp, d15);
// 5 INPUT - with none-addressing operand uses
......@@ -702,219 +702,219 @@ TEST_F(NodeMatcherTest, ScaledWithOffset32Matcher) {
m1 = graph()->NewNode(m_op, p1, d1);
ADD_NONE_ADDRESSING_OPERAND_USES(m1);
BaseWithIndexAndDisplacement32Matcher match90(graph()->NewNode(a_op, b0, m1));
CheckBaseWithIndexAndDisplacement(&match90, b0, 0, m1, NULL);
CheckBaseWithIndexAndDisplacement(&match90, b0, 0, m1, nullptr);
// (M1 + B0) -> [b0, 0, m1, NULL]
m1 = graph()->NewNode(m_op, p1, d1);
ADD_NONE_ADDRESSING_OPERAND_USES(m1);
BaseWithIndexAndDisplacement32Matcher match91(graph()->NewNode(a_op, m1, b0));
CheckBaseWithIndexAndDisplacement(&match91, b0, 0, m1, NULL);
CheckBaseWithIndexAndDisplacement(&match91, b0, 0, m1, nullptr);
// (D15 + M1) -> [NULL, 0, m1, d15]
m1 = graph()->NewNode(m_op, p1, d1);
ADD_NONE_ADDRESSING_OPERAND_USES(m1);
BaseWithIndexAndDisplacement32Matcher match92(
graph()->NewNode(a_op, d15, m1));
CheckBaseWithIndexAndDisplacement(&match92, NULL, 0, m1, d15);
CheckBaseWithIndexAndDisplacement(&match92, nullptr, 0, m1, d15);
// (M1 + D15) -> [NULL, 0, m1, d15]
m1 = graph()->NewNode(m_op, p1, d1);
ADD_NONE_ADDRESSING_OPERAND_USES(m1);
BaseWithIndexAndDisplacement32Matcher match93(
graph()->NewNode(a_op, m1, d15));
CheckBaseWithIndexAndDisplacement(&match93, NULL, 0, m1, d15);
CheckBaseWithIndexAndDisplacement(&match93, nullptr, 0, m1, d15);
// (B0 + S0) -> [b0, 0, s0, NULL]
s0 = graph()->NewNode(s_op, p1, d0);
ADD_NONE_ADDRESSING_OPERAND_USES(s0);
BaseWithIndexAndDisplacement32Matcher match94(graph()->NewNode(a_op, b0, s0));
CheckBaseWithIndexAndDisplacement(&match94, b0, 0, s0, NULL);
CheckBaseWithIndexAndDisplacement(&match94, b0, 0, s0, nullptr);
// (S0 + B0) -> [b0, 0, s0, NULL]
s0 = graph()->NewNode(s_op, p1, d0);
ADD_NONE_ADDRESSING_OPERAND_USES(s0);
BaseWithIndexAndDisplacement32Matcher match95(graph()->NewNode(a_op, s0, b0));
CheckBaseWithIndexAndDisplacement(&match95, b0, 0, s0, NULL);
CheckBaseWithIndexAndDisplacement(&match95, b0, 0, s0, nullptr);
// (D15 + S0) -> [NULL, 0, s0, d15]
s0 = graph()->NewNode(s_op, p1, d0);
ADD_NONE_ADDRESSING_OPERAND_USES(s0);
BaseWithIndexAndDisplacement32Matcher match96(
graph()->NewNode(a_op, d15, s0));
CheckBaseWithIndexAndDisplacement(&match96, NULL, 0, s0, d15);
CheckBaseWithIndexAndDisplacement(&match96, nullptr, 0, s0, d15);
// (S0 + D15) -> [NULL, 0, s0, d15]
s0 = graph()->NewNode(s_op, p1, d0);
ADD_NONE_ADDRESSING_OPERAND_USES(s0);
BaseWithIndexAndDisplacement32Matcher match97(
graph()->NewNode(a_op, s0, d15));
CheckBaseWithIndexAndDisplacement(&match97, NULL, 0, s0, d15);
CheckBaseWithIndexAndDisplacement(&match97, nullptr, 0, s0, d15);
// (B0 + M2) -> [b0, 0, m2, NULL]
m2 = graph()->NewNode(m_op, p1, d2);
ADD_NONE_ADDRESSING_OPERAND_USES(m2);
BaseWithIndexAndDisplacement32Matcher match98(graph()->NewNode(a_op, b0, m2));
CheckBaseWithIndexAndDisplacement(&match98, b0, 0, m2, NULL);
CheckBaseWithIndexAndDisplacement(&match98, b0, 0, m2, nullptr);
// (M2 + B0) -> [b0, 0, m2, NULL]
m2 = graph()->NewNode(m_op, p1, d2);
ADD_NONE_ADDRESSING_OPERAND_USES(m2);
BaseWithIndexAndDisplacement32Matcher match99(graph()->NewNode(a_op, m2, b0));
CheckBaseWithIndexAndDisplacement(&match99, b0, 0, m2, NULL);
CheckBaseWithIndexAndDisplacement(&match99, b0, 0, m2, nullptr);
// (D15 + M2) -> [NULL, 0, m2, d15]
m2 = graph()->NewNode(m_op, p1, d2);
ADD_NONE_ADDRESSING_OPERAND_USES(m2);
BaseWithIndexAndDisplacement32Matcher match100(
graph()->NewNode(a_op, d15, m2));
CheckBaseWithIndexAndDisplacement(&match100, NULL, 0, m2, d15);
CheckBaseWithIndexAndDisplacement(&match100, nullptr, 0, m2, d15);
// (M2 + D15) -> [NULL, 0, m2, d15]
m2 = graph()->NewNode(m_op, p1, d2);
ADD_NONE_ADDRESSING_OPERAND_USES(m2);
BaseWithIndexAndDisplacement32Matcher match101(
graph()->NewNode(a_op, m2, d15));
CheckBaseWithIndexAndDisplacement(&match101, NULL, 0, m2, d15);
CheckBaseWithIndexAndDisplacement(&match101, nullptr, 0, m2, d15);
// (B0 + S1) -> [b0, 0, s1, NULL]
s1 = graph()->NewNode(s_op, p1, d1);
ADD_NONE_ADDRESSING_OPERAND_USES(s1);
BaseWithIndexAndDisplacement32Matcher match102(
graph()->NewNode(a_op, b0, s1));
CheckBaseWithIndexAndDisplacement(&match102, b0, 0, s1, NULL);
CheckBaseWithIndexAndDisplacement(&match102, b0, 0, s1, nullptr);
// (S1 + B0) -> [b0, 0, s1, NULL]
s1 = graph()->NewNode(s_op, p1, d1);
ADD_NONE_ADDRESSING_OPERAND_USES(s1);
BaseWithIndexAndDisplacement32Matcher match103(
graph()->NewNode(a_op, s1, b0));
CheckBaseWithIndexAndDisplacement(&match103, b0, 0, s1, NULL);
CheckBaseWithIndexAndDisplacement(&match103, b0, 0, s1, nullptr);
// (D15 + S1) -> [NULL, 0, s1, d15]
s1 = graph()->NewNode(s_op, p1, d1);
ADD_NONE_ADDRESSING_OPERAND_USES(s1);
BaseWithIndexAndDisplacement32Matcher match104(
graph()->NewNode(a_op, d15, s1));
CheckBaseWithIndexAndDisplacement(&match104, NULL, 0, s1, d15);
CheckBaseWithIndexAndDisplacement(&match104, nullptr, 0, s1, d15);
// (S1 + D15) -> [NULL, 0, s1, d15]
s1 = graph()->NewNode(s_op, p1, d1);
ADD_NONE_ADDRESSING_OPERAND_USES(s1);
BaseWithIndexAndDisplacement32Matcher match105(
graph()->NewNode(a_op, s1, d15));
CheckBaseWithIndexAndDisplacement(&match105, NULL, 0, s1, d15);
CheckBaseWithIndexAndDisplacement(&match105, nullptr, 0, s1, d15);
// (B0 + M4) -> [b0, 0, m4, NULL]
m4 = graph()->NewNode(m_op, p1, d4);
ADD_NONE_ADDRESSING_OPERAND_USES(m4);
BaseWithIndexAndDisplacement32Matcher match106(
graph()->NewNode(a_op, b0, m4));
CheckBaseWithIndexAndDisplacement(&match106, b0, 0, m4, NULL);
CheckBaseWithIndexAndDisplacement(&match106, b0, 0, m4, nullptr);
// (M4 + B0) -> [b0, 0, m4, NULL]
m4 = graph()->NewNode(m_op, p1, d4);
ADD_NONE_ADDRESSING_OPERAND_USES(m4);
BaseWithIndexAndDisplacement32Matcher match107(
graph()->NewNode(a_op, m4, b0));
CheckBaseWithIndexAndDisplacement(&match107, b0, 0, m4, NULL);
CheckBaseWithIndexAndDisplacement(&match107, b0, 0, m4, nullptr);
// (D15 + M4) -> [NULL, 0, m4, d15]
m4 = graph()->NewNode(m_op, p1, d4);
ADD_NONE_ADDRESSING_OPERAND_USES(m4);
BaseWithIndexAndDisplacement32Matcher match108(
graph()->NewNode(a_op, d15, m4));
CheckBaseWithIndexAndDisplacement(&match108, NULL, 0, m4, d15);
CheckBaseWithIndexAndDisplacement(&match108, nullptr, 0, m4, d15);
// (M4 + D15) -> [NULL, 0, m4, d15]
m4 = graph()->NewNode(m_op, p1, d4);
ADD_NONE_ADDRESSING_OPERAND_USES(m4);
BaseWithIndexAndDisplacement32Matcher match109(
graph()->NewNode(a_op, m4, d15));
CheckBaseWithIndexAndDisplacement(&match109, NULL, 0, m4, d15);
CheckBaseWithIndexAndDisplacement(&match109, nullptr, 0, m4, d15);
// (B0 + S2) -> [b0, 0, s2, NULL]
s2 = graph()->NewNode(s_op, p1, d2);
ADD_NONE_ADDRESSING_OPERAND_USES(s2);
BaseWithIndexAndDisplacement32Matcher match110(
graph()->NewNode(a_op, b0, s2));
CheckBaseWithIndexAndDisplacement(&match110, b0, 0, s2, NULL);
CheckBaseWithIndexAndDisplacement(&match110, b0, 0, s2, nullptr);
// (S2 + B0) -> [b0, 0, s2, NULL]
s2 = graph()->NewNode(s_op, p1, d2);
ADD_NONE_ADDRESSING_OPERAND_USES(s2);
BaseWithIndexAndDisplacement32Matcher match111(
graph()->NewNode(a_op, s2, b0));
CheckBaseWithIndexAndDisplacement(&match111, b0, 0, s2, NULL);
CheckBaseWithIndexAndDisplacement(&match111, b0, 0, s2, nullptr);
// (D15 + S2) -> [NULL, 0, s2, d15]
s2 = graph()->NewNode(s_op, p1, d2);
ADD_NONE_ADDRESSING_OPERAND_USES(s2);
BaseWithIndexAndDisplacement32Matcher match112(
graph()->NewNode(a_op, d15, s2));
CheckBaseWithIndexAndDisplacement(&match112, NULL, 0, s2, d15);
CheckBaseWithIndexAndDisplacement(&match112, nullptr, 0, s2, d15);
// (S2 + D15) -> [NULL, 0, s2, d15]
s2 = graph()->NewNode(s_op, p1, d2);
ADD_NONE_ADDRESSING_OPERAND_USES(s2);
BaseWithIndexAndDisplacement32Matcher match113(
graph()->NewNode(a_op, s2, d15));
CheckBaseWithIndexAndDisplacement(&match113, NULL, 0, s2, d15);
CheckBaseWithIndexAndDisplacement(&match113, nullptr, 0, s2, d15);
// (B0 + M8) -> [b0, 0, m8, NULL]
m8 = graph()->NewNode(m_op, p1, d8);
ADD_NONE_ADDRESSING_OPERAND_USES(m8);
BaseWithIndexAndDisplacement32Matcher match114(
graph()->NewNode(a_op, b0, m8));
CheckBaseWithIndexAndDisplacement(&match114, b0, 0, m8, NULL);
CheckBaseWithIndexAndDisplacement(&match114, b0, 0, m8, nullptr);
// (M8 + B0) -> [b0, 0, m8, NULL]
m8 = graph()->NewNode(m_op, p1, d8);
ADD_NONE_ADDRESSING_OPERAND_USES(m8);
BaseWithIndexAndDisplacement32Matcher match115(
graph()->NewNode(a_op, m8, b0));
CheckBaseWithIndexAndDisplacement(&match115, b0, 0, m8, NULL);
CheckBaseWithIndexAndDisplacement(&match115, b0, 0, m8, nullptr);
// (D15 + M8) -> [NULL, 0, m8, d15]
m8 = graph()->NewNode(m_op, p1, d8);
ADD_NONE_ADDRESSING_OPERAND_USES(m8);
BaseWithIndexAndDisplacement32Matcher match116(
graph()->NewNode(a_op, d15, m8));
CheckBaseWithIndexAndDisplacement(&match116, NULL, 0, m8, d15);
CheckBaseWithIndexAndDisplacement(&match116, nullptr, 0, m8, d15);
// (M8 + D15) -> [NULL, 0, m8, d15]
m8 = graph()->NewNode(m_op, p1, d8);
ADD_NONE_ADDRESSING_OPERAND_USES(m8);
BaseWithIndexAndDisplacement32Matcher match117(
graph()->NewNode(a_op, m8, d15));
CheckBaseWithIndexAndDisplacement(&match117, NULL, 0, m8, d15);
CheckBaseWithIndexAndDisplacement(&match117, nullptr, 0, m8, d15);
// (B0 + S3) -> [b0, 0, s3, NULL]
s3 = graph()->NewNode(s_op, p1, d3);
ADD_NONE_ADDRESSING_OPERAND_USES(s3);
BaseWithIndexAndDisplacement32Matcher match118(
graph()->NewNode(a_op, b0, s3));
CheckBaseWithIndexAndDisplacement(&match118, b0, 0, s3, NULL);
CheckBaseWithIndexAndDisplacement(&match118, b0, 0, s3, nullptr);
// (S3 + B0) -> [b0, 0, s3, NULL]
s3 = graph()->NewNode(s_op, p1, d3);
ADD_NONE_ADDRESSING_OPERAND_USES(s3);
BaseWithIndexAndDisplacement32Matcher match119(
graph()->NewNode(a_op, s3, b0));
CheckBaseWithIndexAndDisplacement(&match119, b0, 0, s3, NULL);
CheckBaseWithIndexAndDisplacement(&match119, b0, 0, s3, nullptr);
// (D15 + S3) -> [NULL, 0, s3, d15]
s3 = graph()->NewNode(s_op, p1, d3);
ADD_NONE_ADDRESSING_OPERAND_USES(s3);
BaseWithIndexAndDisplacement32Matcher match120(
graph()->NewNode(a_op, d15, s3));
CheckBaseWithIndexAndDisplacement(&match120, NULL, 0, s3, d15);
CheckBaseWithIndexAndDisplacement(&match120, nullptr, 0, s3, d15);
// (S3 + D15) -> [NULL, 0, s3, d15]
s3 = graph()->NewNode(s_op, p1, d3);
ADD_NONE_ADDRESSING_OPERAND_USES(s3);
BaseWithIndexAndDisplacement32Matcher match121(
graph()->NewNode(a_op, s3, d15));
CheckBaseWithIndexAndDisplacement(&match121, NULL, 0, s3, d15);
CheckBaseWithIndexAndDisplacement(&match121, nullptr, 0, s3, d15);
// (D15 + S3) + B0 -> [b0, 0, (D15 + S3), NULL]
s3 = graph()->NewNode(s_op, p1, d3);
......@@ -922,7 +922,7 @@ TEST_F(NodeMatcherTest, ScaledWithOffset32Matcher) {
ADD_NONE_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement32Matcher match122(
graph()->NewNode(a_op, temp, b0));
CheckBaseWithIndexAndDisplacement(&match122, b0, 0, temp, NULL);
CheckBaseWithIndexAndDisplacement(&match122, b0, 0, temp, nullptr);
// (B0 + D15) + S3 -> [p1, 3, (B0 + D15), NULL]
s3 = graph()->NewNode(s_op, p1, d3);
......@@ -930,7 +930,7 @@ TEST_F(NodeMatcherTest, ScaledWithOffset32Matcher) {
ADD_NONE_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement32Matcher match123(
graph()->NewNode(a_op, temp, s3));
CheckBaseWithIndexAndDisplacement(&match123, p1, 3, temp, NULL);
CheckBaseWithIndexAndDisplacement(&match123, p1, 3, temp, nullptr);
// (S3 + B0) + D15 -> [NULL, 0, (S3 + B0), d15]
s3 = graph()->NewNode(s_op, p1, d3);
......@@ -938,7 +938,7 @@ TEST_F(NodeMatcherTest, ScaledWithOffset32Matcher) {
ADD_NONE_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement32Matcher match124(
graph()->NewNode(a_op, temp, d15));
CheckBaseWithIndexAndDisplacement(&match124, NULL, 0, temp, d15);
CheckBaseWithIndexAndDisplacement(&match124, nullptr, 0, temp, d15);
// D15 + (S3 + B0) -> [NULL, 0, (S3 + B0), d15]
s3 = graph()->NewNode(s_op, p1, d3);
......@@ -946,7 +946,7 @@ TEST_F(NodeMatcherTest, ScaledWithOffset32Matcher) {
ADD_NONE_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement32Matcher match125(
graph()->NewNode(a_op, d15, temp));
CheckBaseWithIndexAndDisplacement(&match125, NULL, 0, temp, d15);
CheckBaseWithIndexAndDisplacement(&match125, nullptr, 0, temp, d15);
// B0 + (D15 + S3) -> [b0, 0, (D15 + S3), NULL]
s3 = graph()->NewNode(s_op, p1, d3);
......@@ -954,7 +954,7 @@ TEST_F(NodeMatcherTest, ScaledWithOffset32Matcher) {
ADD_NONE_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement32Matcher match126(
graph()->NewNode(a_op, b0, temp));
CheckBaseWithIndexAndDisplacement(&match126, b0, 0, temp, NULL);
CheckBaseWithIndexAndDisplacement(&match126, b0, 0, temp, nullptr);
// S3 + (B0 + D15) -> [p1, 3, (B0 + D15), NULL]
s3 = graph()->NewNode(s_op, p1, d3);
......@@ -962,7 +962,7 @@ TEST_F(NodeMatcherTest, ScaledWithOffset32Matcher) {
ADD_NONE_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement32Matcher match127(
graph()->NewNode(a_op, s3, temp));
CheckBaseWithIndexAndDisplacement(&match127, p1, 3, temp, NULL);
CheckBaseWithIndexAndDisplacement(&match127, p1, 3, temp, nullptr);
// S3 + (B0 - D15) -> [p1, 3, (B0 - D15), NULL]
s3 = graph()->NewNode(s_op, p1, d3);
......@@ -970,14 +970,14 @@ TEST_F(NodeMatcherTest, ScaledWithOffset32Matcher) {
ADD_NONE_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement32Matcher match128(
graph()->NewNode(a_op, s3, temp));
CheckBaseWithIndexAndDisplacement(&match128, p1, 3, temp, NULL);
CheckBaseWithIndexAndDisplacement(&match128, p1, 3, temp, nullptr);
// B0 + (B1 - D15) -> [b0, 0, (B1 - D15), NULL]
temp = graph()->NewNode(sub_op, b1, d15);
ADD_NONE_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement32Matcher match129(
graph()->NewNode(a_op, b0, temp));
CheckBaseWithIndexAndDisplacement(&match129, b0, 0, temp, NULL);
CheckBaseWithIndexAndDisplacement(&match129, b0, 0, temp, nullptr);
// (B0 - D15) + S3 -> [p1, 3, temp, NULL]
s3 = graph()->NewNode(s_op, p1, d3);
......@@ -985,21 +985,21 @@ TEST_F(NodeMatcherTest, ScaledWithOffset32Matcher) {
ADD_NONE_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement32Matcher match130(
graph()->NewNode(a_op, temp, s3));
CheckBaseWithIndexAndDisplacement(&match130, p1, 3, temp, NULL);
CheckBaseWithIndexAndDisplacement(&match130, p1, 3, temp, nullptr);
// (B0 + B1) + D15 -> [NULL, 0, (B0 + B1), d15]
temp = graph()->NewNode(a_op, b0, b1);
ADD_NONE_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement32Matcher match131(
graph()->NewNode(a_op, temp, d15));
CheckBaseWithIndexAndDisplacement(&match131, NULL, 0, temp, d15);
CheckBaseWithIndexAndDisplacement(&match131, nullptr, 0, temp, d15);
// D15 + (B0 + B1) -> [NULL, 0, (B0 + B1), d15]
temp = graph()->NewNode(a_op, b0, b1);
ADD_NONE_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement32Matcher match132(
graph()->NewNode(a_op, d15, temp));
CheckBaseWithIndexAndDisplacement(&match132, NULL, 0, temp, d15);
CheckBaseWithIndexAndDisplacement(&match132, nullptr, 0, temp, d15);
}
......@@ -1101,195 +1101,195 @@ TEST_F(NodeMatcherTest, ScaledWithOffset64Matcher) {
// (B0 + B1) -> [B0, 0, B1, NULL]
BaseWithIndexAndDisplacement64Matcher match1(graph()->NewNode(a_op, b0, b1));
CheckBaseWithIndexAndDisplacement(&match1, b1, 0, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match1, b1, 0, b0, nullptr);
// (B0 + D15) -> [NULL, 0, B0, D15]
BaseWithIndexAndDisplacement64Matcher match2(graph()->NewNode(a_op, b0, d15));
CheckBaseWithIndexAndDisplacement(&match2, NULL, 0, b0, d15);
CheckBaseWithIndexAndDisplacement(&match2, nullptr, 0, b0, d15);
BaseWithIndexAndDisplacement64Matcher match2_32(
graph()->NewNode(a_op, b0, d15_32));
CheckBaseWithIndexAndDisplacement(&match2_32, NULL, 0, b0, d15_32);
CheckBaseWithIndexAndDisplacement(&match2_32, nullptr, 0, b0, d15_32);
// (D15 + B0) -> [NULL, 0, B0, D15]
BaseWithIndexAndDisplacement64Matcher match3(graph()->NewNode(a_op, d15, b0));
CheckBaseWithIndexAndDisplacement(&match3, NULL, 0, b0, d15);
CheckBaseWithIndexAndDisplacement(&match3, nullptr, 0, b0, d15);
// (B0 + M1) -> [p1, 0, B0, NULL]
BaseWithIndexAndDisplacement64Matcher match4(graph()->NewNode(a_op, b0, m1));
CheckBaseWithIndexAndDisplacement(&match4, p1, 0, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match4, p1, 0, b0, nullptr);
// (M1 + B0) -> [p1, 0, B0, NULL]
m1 = graph()->NewNode(m_op, p1, d1);
BaseWithIndexAndDisplacement64Matcher match5(graph()->NewNode(a_op, m1, b0));
CheckBaseWithIndexAndDisplacement(&match5, p1, 0, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match5, p1, 0, b0, nullptr);
// (D15 + M1) -> [P1, 0, NULL, D15]
m1 = graph()->NewNode(m_op, p1, d1);
BaseWithIndexAndDisplacement64Matcher match6(graph()->NewNode(a_op, d15, m1));
CheckBaseWithIndexAndDisplacement(&match6, p1, 0, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match6, p1, 0, nullptr, d15);
// (M1 + D15) -> [P1, 0, NULL, D15]
m1 = graph()->NewNode(m_op, p1, d1);
BaseWithIndexAndDisplacement64Matcher match7(graph()->NewNode(a_op, m1, d15));
CheckBaseWithIndexAndDisplacement(&match7, p1, 0, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match7, p1, 0, nullptr, d15);
// (B0 + S0) -> [p1, 0, B0, NULL]
BaseWithIndexAndDisplacement64Matcher match8(graph()->NewNode(a_op, b0, s0));
CheckBaseWithIndexAndDisplacement(&match8, p1, 0, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match8, p1, 0, b0, nullptr);
// (S0 + B0) -> [p1, 0, B0, NULL]
s0 = graph()->NewNode(s_op, p1, d0);
BaseWithIndexAndDisplacement64Matcher match9(graph()->NewNode(a_op, s0, b0));
CheckBaseWithIndexAndDisplacement(&match9, p1, 0, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match9, p1, 0, b0, nullptr);
// (D15 + S0) -> [P1, 0, NULL, D15]
s0 = graph()->NewNode(s_op, p1, d0);
BaseWithIndexAndDisplacement64Matcher match10(
graph()->NewNode(a_op, d15, s0));
CheckBaseWithIndexAndDisplacement(&match10, p1, 0, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match10, p1, 0, nullptr, d15);
// (S0 + D15) -> [P1, 0, NULL, D15]
s0 = graph()->NewNode(s_op, p1, d0);
BaseWithIndexAndDisplacement64Matcher match11(
graph()->NewNode(a_op, s0, d15));
CheckBaseWithIndexAndDisplacement(&match11, p1, 0, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match11, p1, 0, nullptr, d15);
// (B0 + M2) -> [p1, 1, B0, NULL]
BaseWithIndexAndDisplacement64Matcher match12(graph()->NewNode(a_op, b0, m2));
CheckBaseWithIndexAndDisplacement(&match12, p1, 1, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match12, p1, 1, b0, nullptr);
// (M2 + B0) -> [p1, 1, B0, NULL]
m2 = graph()->NewNode(m_op, p1, d2);
BaseWithIndexAndDisplacement64Matcher match13(graph()->NewNode(a_op, m2, b0));
CheckBaseWithIndexAndDisplacement(&match13, p1, 1, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match13, p1, 1, b0, nullptr);
// (D15 + M2) -> [P1, 1, NULL, D15]
m2 = graph()->NewNode(m_op, p1, d2);
BaseWithIndexAndDisplacement64Matcher match14(
graph()->NewNode(a_op, d15, m2));
CheckBaseWithIndexAndDisplacement(&match14, p1, 1, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match14, p1, 1, nullptr, d15);
// (M2 + D15) -> [P1, 1, NULL, D15]
m2 = graph()->NewNode(m_op, p1, d2);
BaseWithIndexAndDisplacement64Matcher match15(
graph()->NewNode(a_op, m2, d15));
CheckBaseWithIndexAndDisplacement(&match15, p1, 1, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match15, p1, 1, nullptr, d15);
// (B0 + S1) -> [p1, 1, B0, NULL]
BaseWithIndexAndDisplacement64Matcher match16(graph()->NewNode(a_op, b0, s1));
CheckBaseWithIndexAndDisplacement(&match16, p1, 1, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match16, p1, 1, b0, nullptr);
// (S1 + B0) -> [p1, 1, B0, NULL]
s1 = graph()->NewNode(s_op, p1, d1);
BaseWithIndexAndDisplacement64Matcher match17(graph()->NewNode(a_op, s1, b0));
CheckBaseWithIndexAndDisplacement(&match17, p1, 1, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match17, p1, 1, b0, nullptr);
// (D15 + S1) -> [P1, 1, NULL, D15]
s1 = graph()->NewNode(s_op, p1, d1);
BaseWithIndexAndDisplacement64Matcher match18(
graph()->NewNode(a_op, d15, s1));
CheckBaseWithIndexAndDisplacement(&match18, p1, 1, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match18, p1, 1, nullptr, d15);
// (S1 + D15) -> [P1, 1, NULL, D15]
s1 = graph()->NewNode(s_op, p1, d1);
BaseWithIndexAndDisplacement64Matcher match19(
graph()->NewNode(a_op, s1, d15));
CheckBaseWithIndexAndDisplacement(&match19, p1, 1, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match19, p1, 1, nullptr, d15);
// (B0 + M4) -> [p1, 2, B0, NULL]
BaseWithIndexAndDisplacement64Matcher match20(graph()->NewNode(a_op, b0, m4));
CheckBaseWithIndexAndDisplacement(&match20, p1, 2, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match20, p1, 2, b0, nullptr);
// (M4 + B0) -> [p1, 2, B0, NULL]
m4 = graph()->NewNode(m_op, p1, d4);
BaseWithIndexAndDisplacement64Matcher match21(graph()->NewNode(a_op, m4, b0));
CheckBaseWithIndexAndDisplacement(&match21, p1, 2, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match21, p1, 2, b0, nullptr);
// (D15 + M4) -> [p1, 2, NULL, D15]
m4 = graph()->NewNode(m_op, p1, d4);
BaseWithIndexAndDisplacement64Matcher match22(
graph()->NewNode(a_op, d15, m4));
CheckBaseWithIndexAndDisplacement(&match22, p1, 2, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match22, p1, 2, nullptr, d15);
// (M4 + D15) -> [p1, 2, NULL, D15]
m4 = graph()->NewNode(m_op, p1, d4);
BaseWithIndexAndDisplacement64Matcher match23(
graph()->NewNode(a_op, m4, d15));
CheckBaseWithIndexAndDisplacement(&match23, p1, 2, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match23, p1, 2, nullptr, d15);
// (B0 + S2) -> [p1, 2, B0, NULL]
BaseWithIndexAndDisplacement64Matcher match24(graph()->NewNode(a_op, b0, s2));
CheckBaseWithIndexAndDisplacement(&match24, p1, 2, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match24, p1, 2, b0, nullptr);
// (S2 + B0) -> [p1, 2, B0, NULL]
s2 = graph()->NewNode(s_op, p1, d2);
BaseWithIndexAndDisplacement64Matcher match25(graph()->NewNode(a_op, s2, b0));
CheckBaseWithIndexAndDisplacement(&match25, p1, 2, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match25, p1, 2, b0, nullptr);
// (D15 + S2) -> [p1, 2, NULL, D15]
s2 = graph()->NewNode(s_op, p1, d2);
BaseWithIndexAndDisplacement64Matcher match26(
graph()->NewNode(a_op, d15, s2));
CheckBaseWithIndexAndDisplacement(&match26, p1, 2, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match26, p1, 2, nullptr, d15);
// (S2 + D15) -> [p1, 2, NULL, D15]
s2 = graph()->NewNode(s_op, p1, d2);
BaseWithIndexAndDisplacement64Matcher match27(
graph()->NewNode(a_op, s2, d15));
CheckBaseWithIndexAndDisplacement(&match27, p1, 2, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match27, p1, 2, nullptr, d15);
// (B0 + M8) -> [p1, 2, B0, NULL]
BaseWithIndexAndDisplacement64Matcher match28(graph()->NewNode(a_op, b0, m8));
CheckBaseWithIndexAndDisplacement(&match28, p1, 3, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match28, p1, 3, b0, nullptr);
// (M8 + B0) -> [p1, 2, B0, NULL]
m8 = graph()->NewNode(m_op, p1, d8);
BaseWithIndexAndDisplacement64Matcher match29(graph()->NewNode(a_op, m8, b0));
CheckBaseWithIndexAndDisplacement(&match29, p1, 3, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match29, p1, 3, b0, nullptr);
// (D15 + M8) -> [p1, 2, NULL, D15]
m8 = graph()->NewNode(m_op, p1, d8);
BaseWithIndexAndDisplacement64Matcher match30(
graph()->NewNode(a_op, d15, m8));
CheckBaseWithIndexAndDisplacement(&match30, p1, 3, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match30, p1, 3, nullptr, d15);
// (M8 + D15) -> [p1, 2, NULL, D15]
m8 = graph()->NewNode(m_op, p1, d8);
BaseWithIndexAndDisplacement64Matcher match31(
graph()->NewNode(a_op, m8, d15));
CheckBaseWithIndexAndDisplacement(&match31, p1, 3, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match31, p1, 3, nullptr, d15);
// (B0 + S3) -> [p1, 2, B0, NULL]
BaseWithIndexAndDisplacement64Matcher match32(graph()->NewNode(a_op, b0, s3));
CheckBaseWithIndexAndDisplacement(&match32, p1, 3, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match32, p1, 3, b0, nullptr);
// (S3 + B0) -> [p1, 2, B0, NULL]
s3 = graph()->NewNode(s_op, p1, d3);
BaseWithIndexAndDisplacement64Matcher match33(graph()->NewNode(a_op, s3, b0));
CheckBaseWithIndexAndDisplacement(&match33, p1, 3, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match33, p1, 3, b0, nullptr);
// (D15 + S3) -> [p1, 2, NULL, D15]
s3 = graph()->NewNode(s_op, p1, d3);
BaseWithIndexAndDisplacement64Matcher match34(
graph()->NewNode(a_op, d15, s3));
CheckBaseWithIndexAndDisplacement(&match34, p1, 3, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match34, p1, 3, nullptr, d15);
// (S3 + D15) -> [p1, 2, NULL, D15]
s3 = graph()->NewNode(s_op, p1, d3);
BaseWithIndexAndDisplacement64Matcher match35(
graph()->NewNode(a_op, s3, d15));
CheckBaseWithIndexAndDisplacement(&match35, p1, 3, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match35, p1, 3, nullptr, d15);
// 2 INPUT - NEGATIVE CASES
// (M3 + B1) -> [B0, 0, M3, NULL]
BaseWithIndexAndDisplacement64Matcher match36(graph()->NewNode(a_op, b1, m3));
CheckBaseWithIndexAndDisplacement(&match36, m3, 0, b1, NULL);
CheckBaseWithIndexAndDisplacement(&match36, m3, 0, b1, nullptr);
// (S4 + B1) -> [B0, 0, S4, NULL]
BaseWithIndexAndDisplacement64Matcher match37(graph()->NewNode(a_op, b1, s4));
CheckBaseWithIndexAndDisplacement(&match37, s4, 0, b1, NULL);
CheckBaseWithIndexAndDisplacement(&match37, s4, 0, b1, nullptr);
// 3 INPUT
......@@ -1405,209 +1405,209 @@ TEST_F(NodeMatcherTest, ScaledWithOffset64Matcher) {
m1 = graph()->NewNode(m_op, p1, d1);
ADD_ADDRESSING_OPERAND_USES(m1);
BaseWithIndexAndDisplacement64Matcher match54(graph()->NewNode(a_op, b0, m1));
CheckBaseWithIndexAndDisplacement(&match54, p1, 0, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match54, p1, 0, b0, nullptr);
// (M1 + B0) -> [p1, 0, B0, NULL]
m1 = graph()->NewNode(m_op, p1, d1);
ADD_ADDRESSING_OPERAND_USES(m1);
BaseWithIndexAndDisplacement64Matcher match55(graph()->NewNode(a_op, m1, b0));
CheckBaseWithIndexAndDisplacement(&match55, p1, 0, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match55, p1, 0, b0, nullptr);
// (D15 + M1) -> [P1, 0, NULL, D15]
m1 = graph()->NewNode(m_op, p1, d1);
ADD_ADDRESSING_OPERAND_USES(m1);
BaseWithIndexAndDisplacement64Matcher match56(
graph()->NewNode(a_op, d15, m1));
CheckBaseWithIndexAndDisplacement(&match56, p1, 0, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match56, p1, 0, nullptr, d15);
// (M1 + D15) -> [P1, 0, NULL, D15]
m1 = graph()->NewNode(m_op, p1, d1);
ADD_ADDRESSING_OPERAND_USES(m1);
BaseWithIndexAndDisplacement64Matcher match57(
graph()->NewNode(a_op, m1, d15));
CheckBaseWithIndexAndDisplacement(&match57, p1, 0, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match57, p1, 0, nullptr, d15);
// (B0 + S0) -> [p1, 0, B0, NULL]
s0 = graph()->NewNode(s_op, p1, d0);
ADD_ADDRESSING_OPERAND_USES(s0);
BaseWithIndexAndDisplacement64Matcher match58(graph()->NewNode(a_op, b0, s0));
CheckBaseWithIndexAndDisplacement(&match58, p1, 0, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match58, p1, 0, b0, nullptr);
// (S0 + B0) -> [p1, 0, B0, NULL]
s0 = graph()->NewNode(s_op, p1, d0);
ADD_ADDRESSING_OPERAND_USES(s0);
BaseWithIndexAndDisplacement64Matcher match59(graph()->NewNode(a_op, s0, b0));
CheckBaseWithIndexAndDisplacement(&match59, p1, 0, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match59, p1, 0, b0, nullptr);
// (D15 + S0) -> [P1, 0, NULL, D15]
s0 = graph()->NewNode(s_op, p1, d0);
ADD_ADDRESSING_OPERAND_USES(s0);
BaseWithIndexAndDisplacement64Matcher match60(
graph()->NewNode(a_op, d15, s0));
CheckBaseWithIndexAndDisplacement(&match60, p1, 0, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match60, p1, 0, nullptr, d15);
// (S0 + D15) -> [P1, 0, NULL, D15]
s0 = graph()->NewNode(s_op, p1, d0);
ADD_ADDRESSING_OPERAND_USES(s0);
BaseWithIndexAndDisplacement64Matcher match61(
graph()->NewNode(a_op, s0, d15));
CheckBaseWithIndexAndDisplacement(&match61, p1, 0, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match61, p1, 0, nullptr, d15);
// (B0 + M2) -> [p1, 1, B0, NULL]
m2 = graph()->NewNode(m_op, p1, d2);
ADD_ADDRESSING_OPERAND_USES(m2);
BaseWithIndexAndDisplacement64Matcher match62(graph()->NewNode(a_op, b0, m2));
CheckBaseWithIndexAndDisplacement(&match62, p1, 1, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match62, p1, 1, b0, nullptr);
// (M2 + B0) -> [p1, 1, B0, NULL]
m2 = graph()->NewNode(m_op, p1, d2);
ADD_ADDRESSING_OPERAND_USES(m2);
BaseWithIndexAndDisplacement64Matcher match63(graph()->NewNode(a_op, m2, b0));
CheckBaseWithIndexAndDisplacement(&match63, p1, 1, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match63, p1, 1, b0, nullptr);
// (D15 + M2) -> [P1, 1, NULL, D15]
m2 = graph()->NewNode(m_op, p1, d2);
ADD_ADDRESSING_OPERAND_USES(m2);
BaseWithIndexAndDisplacement64Matcher match64(
graph()->NewNode(a_op, d15, m2));
CheckBaseWithIndexAndDisplacement(&match64, p1, 1, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match64, p1, 1, nullptr, d15);
// (M2 + D15) -> [P1, 1, NULL, D15]
m2 = graph()->NewNode(m_op, p1, d2);
ADD_ADDRESSING_OPERAND_USES(m2);
BaseWithIndexAndDisplacement64Matcher match65(
graph()->NewNode(a_op, m2, d15));
CheckBaseWithIndexAndDisplacement(&match65, p1, 1, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match65, p1, 1, nullptr, d15);
// (B0 + S1) -> [p1, 1, B0, NULL]
s1 = graph()->NewNode(s_op, p1, d1);
ADD_ADDRESSING_OPERAND_USES(s1);
BaseWithIndexAndDisplacement64Matcher match66(graph()->NewNode(a_op, b0, s1));
CheckBaseWithIndexAndDisplacement(&match66, p1, 1, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match66, p1, 1, b0, nullptr);
// (S1 + B0) -> [p1, 1, B0, NULL]
s1 = graph()->NewNode(s_op, p1, d1);
ADD_ADDRESSING_OPERAND_USES(s1);
BaseWithIndexAndDisplacement64Matcher match67(graph()->NewNode(a_op, s1, b0));
CheckBaseWithIndexAndDisplacement(&match67, p1, 1, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match67, p1, 1, b0, nullptr);
// (D15 + S1) -> [P1, 1, NULL, D15]
s1 = graph()->NewNode(s_op, p1, d1);
ADD_ADDRESSING_OPERAND_USES(s1);
BaseWithIndexAndDisplacement64Matcher match68(
graph()->NewNode(a_op, d15, s1));
CheckBaseWithIndexAndDisplacement(&match68, p1, 1, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match68, p1, 1, nullptr, d15);
// (S1 + D15) -> [P1, 1, NULL, D15]
s1 = graph()->NewNode(s_op, p1, d1);
ADD_ADDRESSING_OPERAND_USES(s1);
BaseWithIndexAndDisplacement64Matcher match69(
graph()->NewNode(a_op, s1, d15));
CheckBaseWithIndexAndDisplacement(&match69, p1, 1, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match69, p1, 1, nullptr, d15);
// (B0 + M4) -> [p1, 2, B0, NULL]
m4 = graph()->NewNode(m_op, p1, d4);
ADD_ADDRESSING_OPERAND_USES(m4);
BaseWithIndexAndDisplacement64Matcher match70(graph()->NewNode(a_op, b0, m4));
CheckBaseWithIndexAndDisplacement(&match70, p1, 2, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match70, p1, 2, b0, nullptr);
// (M4 + B0) -> [p1, 2, B0, NULL]
m4 = graph()->NewNode(m_op, p1, d4);
ADD_ADDRESSING_OPERAND_USES(m4);
BaseWithIndexAndDisplacement64Matcher match71(graph()->NewNode(a_op, m4, b0));
CheckBaseWithIndexAndDisplacement(&match71, p1, 2, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match71, p1, 2, b0, nullptr);
// (D15 + M4) -> [p1, 2, NULL, D15]
m4 = graph()->NewNode(m_op, p1, d4);
ADD_ADDRESSING_OPERAND_USES(m4);
BaseWithIndexAndDisplacement64Matcher match72(
graph()->NewNode(a_op, d15, m4));
CheckBaseWithIndexAndDisplacement(&match72, p1, 2, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match72, p1, 2, nullptr, d15);
// (M4 + D15) -> [p1, 2, NULL, D15]
m4 = graph()->NewNode(m_op, p1, d4);
ADD_ADDRESSING_OPERAND_USES(m4);
BaseWithIndexAndDisplacement64Matcher match73(
graph()->NewNode(a_op, m4, d15));
CheckBaseWithIndexAndDisplacement(&match73, p1, 2, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match73, p1, 2, nullptr, d15);
// (B0 + S2) -> [p1, 2, B0, NULL]
s2 = graph()->NewNode(s_op, p1, d2);
ADD_ADDRESSING_OPERAND_USES(s2);
BaseWithIndexAndDisplacement64Matcher match74(graph()->NewNode(a_op, b0, s2));
CheckBaseWithIndexAndDisplacement(&match74, p1, 2, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match74, p1, 2, b0, nullptr);
// (S2 + B0) -> [p1, 2, B0, NULL]
s2 = graph()->NewNode(s_op, p1, d2);
ADD_ADDRESSING_OPERAND_USES(s2);
BaseWithIndexAndDisplacement64Matcher match75(graph()->NewNode(a_op, s2, b0));
CheckBaseWithIndexAndDisplacement(&match75, p1, 2, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match75, p1, 2, b0, nullptr);
// (D15 + S2) -> [p1, 2, NULL, D15]
s2 = graph()->NewNode(s_op, p1, d2);
ADD_ADDRESSING_OPERAND_USES(s2);
BaseWithIndexAndDisplacement64Matcher match76(
graph()->NewNode(a_op, d15, s2));
CheckBaseWithIndexAndDisplacement(&match76, p1, 2, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match76, p1, 2, nullptr, d15);
// (S2 + D15) -> [p1, 2, NULL, D15]
s2 = graph()->NewNode(s_op, p1, d2);
ADD_ADDRESSING_OPERAND_USES(s2);
BaseWithIndexAndDisplacement64Matcher match77(
graph()->NewNode(a_op, s2, d15));
CheckBaseWithIndexAndDisplacement(&match77, p1, 2, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match77, p1, 2, nullptr, d15);
// (B0 + M8) -> [p1, 2, B0, NULL]
m8 = graph()->NewNode(m_op, p1, d8);
ADD_ADDRESSING_OPERAND_USES(m8);
BaseWithIndexAndDisplacement64Matcher match78(graph()->NewNode(a_op, b0, m8));
CheckBaseWithIndexAndDisplacement(&match78, p1, 3, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match78, p1, 3, b0, nullptr);
// (M8 + B0) -> [p1, 2, B0, NULL]
m8 = graph()->NewNode(m_op, p1, d8);
ADD_ADDRESSING_OPERAND_USES(m8);
BaseWithIndexAndDisplacement64Matcher match79(graph()->NewNode(a_op, m8, b0));
CheckBaseWithIndexAndDisplacement(&match79, p1, 3, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match79, p1, 3, b0, nullptr);
// (D15 + M8) -> [p1, 2, NULL, D15]
m8 = graph()->NewNode(m_op, p1, d8);
ADD_ADDRESSING_OPERAND_USES(m8);
BaseWithIndexAndDisplacement64Matcher match80(
graph()->NewNode(a_op, d15, m8));
CheckBaseWithIndexAndDisplacement(&match80, p1, 3, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match80, p1, 3, nullptr, d15);
// (M8 + D15) -> [p1, 2, NULL, D15]
m8 = graph()->NewNode(m_op, p1, d8);
ADD_ADDRESSING_OPERAND_USES(m8);
BaseWithIndexAndDisplacement64Matcher match81(
graph()->NewNode(a_op, m8, d15));
CheckBaseWithIndexAndDisplacement(&match81, p1, 3, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match81, p1, 3, nullptr, d15);
// (B0 + S3) -> [p1, 2, B0, NULL]
s3 = graph()->NewNode(s_op, p1, d3);
ADD_ADDRESSING_OPERAND_USES(s3);
BaseWithIndexAndDisplacement64Matcher match82(graph()->NewNode(a_op, b0, s3));
CheckBaseWithIndexAndDisplacement(&match82, p1, 3, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match82, p1, 3, b0, nullptr);
// (S3 + B0) -> [p1, 2, B0, NULL]
s3 = graph()->NewNode(s_op, p1, d3);
ADD_ADDRESSING_OPERAND_USES(s3);
BaseWithIndexAndDisplacement64Matcher match83(graph()->NewNode(a_op, s3, b0));
CheckBaseWithIndexAndDisplacement(&match83, p1, 3, b0, NULL);
CheckBaseWithIndexAndDisplacement(&match83, p1, 3, b0, nullptr);
// (D15 + S3) -> [p1, 2, NULL, D15]
s3 = graph()->NewNode(s_op, p1, d3);
ADD_ADDRESSING_OPERAND_USES(s3);
BaseWithIndexAndDisplacement64Matcher match84(
graph()->NewNode(a_op, d15, s3));
CheckBaseWithIndexAndDisplacement(&match84, p1, 3, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match84, p1, 3, nullptr, d15);
// (S3 + D15) -> [p1, 2, NULL, D15]
s3 = graph()->NewNode(s_op, p1, d3);
ADD_ADDRESSING_OPERAND_USES(s3);
BaseWithIndexAndDisplacement64Matcher match85(
graph()->NewNode(a_op, s3, d15));
CheckBaseWithIndexAndDisplacement(&match85, p1, 3, NULL, d15);
CheckBaseWithIndexAndDisplacement(&match85, p1, 3, nullptr, d15);
// (D15 + S3) + B0 -> [p1, 2, b0, d15]
s3 = graph()->NewNode(s_op, p1, d3);
......@@ -1632,7 +1632,7 @@ TEST_F(NodeMatcherTest, ScaledWithOffset64Matcher) {
ADD_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement64Matcher match88(
graph()->NewNode(a_op, temp, d15));
CheckBaseWithIndexAndDisplacement(&match88, NULL, 0, temp, d15);
CheckBaseWithIndexAndDisplacement(&match88, nullptr, 0, temp, d15);
// D15 + (S3 + B0) -> [NULL, 0, (s3 + b0), d15]
// Avoid changing simple addressing to complex addressing
......@@ -1641,7 +1641,7 @@ TEST_F(NodeMatcherTest, ScaledWithOffset64Matcher) {
ADD_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement64Matcher match89(
graph()->NewNode(a_op, d15, temp));
CheckBaseWithIndexAndDisplacement(&match89, NULL, 0, temp, d15);
CheckBaseWithIndexAndDisplacement(&match89, nullptr, 0, temp, d15);
// B0 + (D15 + S3) -> [p1, 2, b0, d15]
s3 = graph()->NewNode(s_op, p1, d3);
......@@ -1691,7 +1691,7 @@ TEST_F(NodeMatcherTest, ScaledWithOffset64Matcher) {
ADD_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement64Matcher match95(
graph()->NewNode(a_op, temp, d15));
CheckBaseWithIndexAndDisplacement(&match95, NULL, 0, temp, d15);
CheckBaseWithIndexAndDisplacement(&match95, nullptr, 0, temp, d15);
// D15 + (B0 + B1) -> [NULL, 0, (b0 + b1), d15]
// Avoid changing simple addressing to complex addressing
......@@ -1699,7 +1699,7 @@ TEST_F(NodeMatcherTest, ScaledWithOffset64Matcher) {
ADD_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement64Matcher match96(
graph()->NewNode(a_op, d15, temp));
CheckBaseWithIndexAndDisplacement(&match96, NULL, 0, temp, d15);
CheckBaseWithIndexAndDisplacement(&match96, nullptr, 0, temp, d15);
// 5 INPUT - with none-addressing operand uses
......@@ -1707,223 +1707,223 @@ TEST_F(NodeMatcherTest, ScaledWithOffset64Matcher) {
m1 = graph()->NewNode(m_op, p1, d1);
ADD_NONE_ADDRESSING_OPERAND_USES(m1);
BaseWithIndexAndDisplacement64Matcher match97(graph()->NewNode(a_op, b0, m1));
CheckBaseWithIndexAndDisplacement(&match97, b0, 0, m1, NULL);
CheckBaseWithIndexAndDisplacement(&match97, b0, 0, m1, nullptr);
// (M1 + B0) -> [b0, 0, m1, NULL]
m1 = graph()->NewNode(m_op, p1, d1);
ADD_NONE_ADDRESSING_OPERAND_USES(m1);
BaseWithIndexAndDisplacement64Matcher match98(graph()->NewNode(a_op, m1, b0));
CheckBaseWithIndexAndDisplacement(&match98, b0, 0, m1, NULL);
CheckBaseWithIndexAndDisplacement(&match98, b0, 0, m1, nullptr);
// (D15 + M1) -> [NULL, 0, m1, d15]
m1 = graph()->NewNode(m_op, p1, d1);
ADD_NONE_ADDRESSING_OPERAND_USES(m1);
BaseWithIndexAndDisplacement64Matcher match99(
graph()->NewNode(a_op, d15, m1));
CheckBaseWithIndexAndDisplacement(&match99, NULL, 0, m1, d15);
CheckBaseWithIndexAndDisplacement(&match99, nullptr, 0, m1, d15);
// (M1 + D15) -> [NULL, 0, m1, d15]
m1 = graph()->NewNode(m_op, p1, d1);
ADD_NONE_ADDRESSING_OPERAND_USES(m1);
BaseWithIndexAndDisplacement64Matcher match100(
graph()->NewNode(a_op, m1, d15));
CheckBaseWithIndexAndDisplacement(&match100, NULL, 0, m1, d15);
CheckBaseWithIndexAndDisplacement(&match100, nullptr, 0, m1, d15);
// (B0 + S0) -> [b0, 0, s0, NULL]
s0 = graph()->NewNode(s_op, p1, d0);
ADD_NONE_ADDRESSING_OPERAND_USES(s0);
BaseWithIndexAndDisplacement64Matcher match101(
graph()->NewNode(a_op, b0, s0));
CheckBaseWithIndexAndDisplacement(&match101, b0, 0, s0, NULL);
CheckBaseWithIndexAndDisplacement(&match101, b0, 0, s0, nullptr);
// (S0 + B0) -> [b0, 0, s0, NULL]
s0 = graph()->NewNode(s_op, p1, d0);
ADD_NONE_ADDRESSING_OPERAND_USES(s0);
BaseWithIndexAndDisplacement64Matcher match102(
graph()->NewNode(a_op, s0, b0));
CheckBaseWithIndexAndDisplacement(&match102, b0, 0, s0, NULL);
CheckBaseWithIndexAndDisplacement(&match102, b0, 0, s0, nullptr);
// (D15 + S0) -> [NULL, 0, s0, d15]
s0 = graph()->NewNode(s_op, p1, d0);
ADD_NONE_ADDRESSING_OPERAND_USES(s0);
BaseWithIndexAndDisplacement64Matcher match103(
graph()->NewNode(a_op, d15, s0));
CheckBaseWithIndexAndDisplacement(&match103, NULL, 0, s0, d15);
CheckBaseWithIndexAndDisplacement(&match103, nullptr, 0, s0, d15);
// (S0 + D15) -> [NULL, 0, s0, d15]
s0 = graph()->NewNode(s_op, p1, d0);
ADD_NONE_ADDRESSING_OPERAND_USES(s0);
BaseWithIndexAndDisplacement64Matcher match104(
graph()->NewNode(a_op, s0, d15));
CheckBaseWithIndexAndDisplacement(&match104, NULL, 0, s0, d15);
CheckBaseWithIndexAndDisplacement(&match104, nullptr, 0, s0, d15);
// (B0 + M2) -> [b0, 0, m2, NULL]
m2 = graph()->NewNode(m_op, p1, d2);
ADD_NONE_ADDRESSING_OPERAND_USES(m2);
BaseWithIndexAndDisplacement64Matcher match105(
graph()->NewNode(a_op, b0, m2));
CheckBaseWithIndexAndDisplacement(&match105, b0, 0, m2, NULL);
CheckBaseWithIndexAndDisplacement(&match105, b0, 0, m2, nullptr);
// (M2 + B0) -> [b0, 0, m2, NULL]
m2 = graph()->NewNode(m_op, p1, d2);
ADD_NONE_ADDRESSING_OPERAND_USES(m2);
BaseWithIndexAndDisplacement64Matcher match106(
graph()->NewNode(a_op, m2, b0));
CheckBaseWithIndexAndDisplacement(&match106, b0, 0, m2, NULL);
CheckBaseWithIndexAndDisplacement(&match106, b0, 0, m2, nullptr);
// (D15 + M2) -> [NULL, 0, m2, d15]
m2 = graph()->NewNode(m_op, p1, d2);
ADD_NONE_ADDRESSING_OPERAND_USES(m2);
BaseWithIndexAndDisplacement64Matcher match107(
graph()->NewNode(a_op, d15, m2));
CheckBaseWithIndexAndDisplacement(&match107, NULL, 0, m2, d15);
CheckBaseWithIndexAndDisplacement(&match107, nullptr, 0, m2, d15);
// (M2 + D15) -> [NULL, 0, m2, d15]
m2 = graph()->NewNode(m_op, p1, d2);
ADD_NONE_ADDRESSING_OPERAND_USES(m2);
BaseWithIndexAndDisplacement64Matcher match108(
graph()->NewNode(a_op, m2, d15));
CheckBaseWithIndexAndDisplacement(&match108, NULL, 0, m2, d15);
CheckBaseWithIndexAndDisplacement(&match108, nullptr, 0, m2, d15);
// (B0 + S1) -> [b0, 0, s1, NULL]
s1 = graph()->NewNode(s_op, p1, d1);
ADD_NONE_ADDRESSING_OPERAND_USES(s1);
BaseWithIndexAndDisplacement64Matcher match109(
graph()->NewNode(a_op, b0, s1));
CheckBaseWithIndexAndDisplacement(&match109, b0, 0, s1, NULL);
CheckBaseWithIndexAndDisplacement(&match109, b0, 0, s1, nullptr);
// (S1 + B0) -> [b0, 0, s1, NULL]
s1 = graph()->NewNode(s_op, p1, d1);
ADD_NONE_ADDRESSING_OPERAND_USES(s1);
BaseWithIndexAndDisplacement64Matcher match110(
graph()->NewNode(a_op, s1, b0));
CheckBaseWithIndexAndDisplacement(&match110, b0, 0, s1, NULL);
CheckBaseWithIndexAndDisplacement(&match110, b0, 0, s1, nullptr);
// (D15 + S1) -> [NULL, 0, s1, d15]
s1 = graph()->NewNode(s_op, p1, d1);
ADD_NONE_ADDRESSING_OPERAND_USES(s1);
BaseWithIndexAndDisplacement64Matcher match111(
graph()->NewNode(a_op, d15, s1));
CheckBaseWithIndexAndDisplacement(&match111, NULL, 0, s1, d15);
CheckBaseWithIndexAndDisplacement(&match111, nullptr, 0, s1, d15);
// (S1 + D15) -> [NULL, 0, s1, d15]
s1 = graph()->NewNode(s_op, p1, d1);
ADD_NONE_ADDRESSING_OPERAND_USES(s1);
BaseWithIndexAndDisplacement64Matcher match112(
graph()->NewNode(a_op, s1, d15));
CheckBaseWithIndexAndDisplacement(&match112, NULL, 0, s1, d15);
CheckBaseWithIndexAndDisplacement(&match112, nullptr, 0, s1, d15);
// (B0 + M4) -> [b0, 0, m4, NULL]
m4 = graph()->NewNode(m_op, p1, d4);
ADD_NONE_ADDRESSING_OPERAND_USES(m4);
BaseWithIndexAndDisplacement64Matcher match113(
graph()->NewNode(a_op, b0, m4));
CheckBaseWithIndexAndDisplacement(&match113, b0, 0, m4, NULL);
CheckBaseWithIndexAndDisplacement(&match113, b0, 0, m4, nullptr);
// (M4 + B0) -> [b0, 0, m4, NULL]
m4 = graph()->NewNode(m_op, p1, d4);
ADD_NONE_ADDRESSING_OPERAND_USES(m4);
BaseWithIndexAndDisplacement64Matcher match114(
graph()->NewNode(a_op, m4, b0));
CheckBaseWithIndexAndDisplacement(&match114, b0, 0, m4, NULL);
CheckBaseWithIndexAndDisplacement(&match114, b0, 0, m4, nullptr);
// (D15 + M4) -> [NULL, 0, m4, d15]
m4 = graph()->NewNode(m_op, p1, d4);
ADD_NONE_ADDRESSING_OPERAND_USES(m4);
BaseWithIndexAndDisplacement64Matcher match115(
graph()->NewNode(a_op, d15, m4));
CheckBaseWithIndexAndDisplacement(&match115, NULL, 0, m4, d15);
CheckBaseWithIndexAndDisplacement(&match115, nullptr, 0, m4, d15);
// (M4 + D15) -> [NULL, 0, m4, d15]
m4 = graph()->NewNode(m_op, p1, d4);
ADD_NONE_ADDRESSING_OPERAND_USES(m4);
BaseWithIndexAndDisplacement64Matcher match116(
graph()->NewNode(a_op, m4, d15));
CheckBaseWithIndexAndDisplacement(&match116, NULL, 0, m4, d15);
CheckBaseWithIndexAndDisplacement(&match116, nullptr, 0, m4, d15);
// (B0 + S2) -> [b0, 0, s2, NULL]
s2 = graph()->NewNode(s_op, p1, d2);
ADD_NONE_ADDRESSING_OPERAND_USES(s2);
BaseWithIndexAndDisplacement64Matcher match117(
graph()->NewNode(a_op, b0, s2));
CheckBaseWithIndexAndDisplacement(&match117, b0, 0, s2, NULL);
CheckBaseWithIndexAndDisplacement(&match117, b0, 0, s2, nullptr);
// (S2 + B0) -> [b0, 0, s2, NULL]
s2 = graph()->NewNode(s_op, p1, d2);
ADD_NONE_ADDRESSING_OPERAND_USES(s2);
BaseWithIndexAndDisplacement64Matcher match118(
graph()->NewNode(a_op, s2, b0));
CheckBaseWithIndexAndDisplacement(&match118, b0, 0, s2, NULL);
CheckBaseWithIndexAndDisplacement(&match118, b0, 0, s2, nullptr);
// (D15 + S2) -> [NULL, 0, s2, d15]
s2 = graph()->NewNode(s_op, p1, d2);
ADD_NONE_ADDRESSING_OPERAND_USES(s2);
BaseWithIndexAndDisplacement64Matcher match119(
graph()->NewNode(a_op, d15, s2));
CheckBaseWithIndexAndDisplacement(&match119, NULL, 0, s2, d15);
CheckBaseWithIndexAndDisplacement(&match119, nullptr, 0, s2, d15);
// (S2 + D15) -> [NULL, 0, s2, d15]
s2 = graph()->NewNode(s_op, p1, d2);
ADD_NONE_ADDRESSING_OPERAND_USES(s2);
BaseWithIndexAndDisplacement64Matcher match120(
graph()->NewNode(a_op, s2, d15));
CheckBaseWithIndexAndDisplacement(&match120, NULL, 0, s2, d15);
CheckBaseWithIndexAndDisplacement(&match120, nullptr, 0, s2, d15);
// (B0 + M8) -> [b0, 0, m8, NULL]
m8 = graph()->NewNode(m_op, p1, d8);
ADD_NONE_ADDRESSING_OPERAND_USES(m8);
BaseWithIndexAndDisplacement64Matcher match121(
graph()->NewNode(a_op, b0, m8));
CheckBaseWithIndexAndDisplacement(&match121, b0, 0, m8, NULL);
CheckBaseWithIndexAndDisplacement(&match121, b0, 0, m8, nullptr);
// (M8 + B0) -> [b0, 0, m8, NULL]
m8 = graph()->NewNode(m_op, p1, d8);
ADD_NONE_ADDRESSING_OPERAND_USES(m8);
BaseWithIndexAndDisplacement64Matcher match122(
graph()->NewNode(a_op, m8, b0));
CheckBaseWithIndexAndDisplacement(&match122, b0, 0, m8, NULL);
CheckBaseWithIndexAndDisplacement(&match122, b0, 0, m8, nullptr);
// (D15 + M8) -> [NULL, 0, m8, d15]
m8 = graph()->NewNode(m_op, p1, d8);
ADD_NONE_ADDRESSING_OPERAND_USES(m8);
BaseWithIndexAndDisplacement64Matcher match123(
graph()->NewNode(a_op, d15, m8));
CheckBaseWithIndexAndDisplacement(&match123, NULL, 0, m8, d15);
CheckBaseWithIndexAndDisplacement(&match123, nullptr, 0, m8, d15);
// (M8 + D15) -> [NULL, 0, m8, d15]
m8 = graph()->NewNode(m_op, p1, d8);
ADD_NONE_ADDRESSING_OPERAND_USES(m8);
BaseWithIndexAndDisplacement64Matcher match124(
graph()->NewNode(a_op, m8, d15));
CheckBaseWithIndexAndDisplacement(&match124, NULL, 0, m8, d15);
CheckBaseWithIndexAndDisplacement(&match124, nullptr, 0, m8, d15);
// (B0 + S3) -> [b0, 0, s3, NULL]
s3 = graph()->NewNode(s_op, p1, d3);
ADD_NONE_ADDRESSING_OPERAND_USES(s3);
BaseWithIndexAndDisplacement64Matcher match125(
graph()->NewNode(a_op, b0, s3));
CheckBaseWithIndexAndDisplacement(&match125, b0, 0, s3, NULL);
CheckBaseWithIndexAndDisplacement(&match125, b0, 0, s3, nullptr);
// (S3 + B0) -> [b0, 0, s3, NULL]
s3 = graph()->NewNode(s_op, p1, d3);
ADD_NONE_ADDRESSING_OPERAND_USES(s3);
BaseWithIndexAndDisplacement64Matcher match126(
graph()->NewNode(a_op, s3, b0));
CheckBaseWithIndexAndDisplacement(&match126, b0, 0, s3, NULL);
CheckBaseWithIndexAndDisplacement(&match126, b0, 0, s3, nullptr);
// (D15 + S3) -> [NULL, 0, s3, d15]
s3 = graph()->NewNode(s_op, p1, d3);
ADD_NONE_ADDRESSING_OPERAND_USES(s3);
BaseWithIndexAndDisplacement64Matcher match127(
graph()->NewNode(a_op, d15, s3));
CheckBaseWithIndexAndDisplacement(&match127, NULL, 0, s3, d15);
CheckBaseWithIndexAndDisplacement(&match127, nullptr, 0, s3, d15);
// (S3 + D15) -> [NULL, 0, s3, d15]
s3 = graph()->NewNode(s_op, p1, d3);
ADD_NONE_ADDRESSING_OPERAND_USES(s3);
BaseWithIndexAndDisplacement64Matcher match128(
graph()->NewNode(a_op, s3, d15));
CheckBaseWithIndexAndDisplacement(&match128, NULL, 0, s3, d15);
CheckBaseWithIndexAndDisplacement(&match128, nullptr, 0, s3, d15);
// (D15 + S3) + B0 -> [b0, 0, (D15 + S3), NULL]
s3 = graph()->NewNode(s_op, p1, d3);
......@@ -1931,7 +1931,7 @@ TEST_F(NodeMatcherTest, ScaledWithOffset64Matcher) {
ADD_NONE_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement64Matcher match129(
graph()->NewNode(a_op, temp, b0));
CheckBaseWithIndexAndDisplacement(&match129, b0, 0, temp, NULL);
CheckBaseWithIndexAndDisplacement(&match129, b0, 0, temp, nullptr);
// (B0 + D15) + S3 -> [p1, 3, (B0 + D15), NULL]
s3 = graph()->NewNode(s_op, p1, d3);
......@@ -1939,7 +1939,7 @@ TEST_F(NodeMatcherTest, ScaledWithOffset64Matcher) {
ADD_NONE_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement64Matcher match130(
graph()->NewNode(a_op, temp, s3));
CheckBaseWithIndexAndDisplacement(&match130, p1, 3, temp, NULL);
CheckBaseWithIndexAndDisplacement(&match130, p1, 3, temp, nullptr);
// (S3 + B0) + D15 -> [NULL, 0, (S3 + B0), d15]
s3 = graph()->NewNode(s_op, p1, d3);
......@@ -1947,7 +1947,7 @@ TEST_F(NodeMatcherTest, ScaledWithOffset64Matcher) {
ADD_NONE_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement64Matcher match131(
graph()->NewNode(a_op, temp, d15));
CheckBaseWithIndexAndDisplacement(&match131, NULL, 0, temp, d15);
CheckBaseWithIndexAndDisplacement(&match131, nullptr, 0, temp, d15);
// D15 + (S3 + B0) -> [NULL, 0, (S3 + B0), d15]
s3 = graph()->NewNode(s_op, p1, d3);
......@@ -1955,7 +1955,7 @@ TEST_F(NodeMatcherTest, ScaledWithOffset64Matcher) {
ADD_NONE_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement64Matcher match132(
graph()->NewNode(a_op, d15, temp));
CheckBaseWithIndexAndDisplacement(&match132, NULL, 0, temp, d15);
CheckBaseWithIndexAndDisplacement(&match132, nullptr, 0, temp, d15);
// B0 + (D15 + S3) -> [b0, 0, (D15 + S3), NULL]
s3 = graph()->NewNode(s_op, p1, d3);
......@@ -1963,7 +1963,7 @@ TEST_F(NodeMatcherTest, ScaledWithOffset64Matcher) {
ADD_NONE_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement64Matcher match133(
graph()->NewNode(a_op, b0, temp));
CheckBaseWithIndexAndDisplacement(&match133, b0, 0, temp, NULL);
CheckBaseWithIndexAndDisplacement(&match133, b0, 0, temp, nullptr);
// S3 + (B0 + D15) -> [p1, 3, (B0 + D15), NULL]
s3 = graph()->NewNode(s_op, p1, d3);
......@@ -1971,7 +1971,7 @@ TEST_F(NodeMatcherTest, ScaledWithOffset64Matcher) {
ADD_NONE_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement64Matcher match134(
graph()->NewNode(a_op, s3, temp));
CheckBaseWithIndexAndDisplacement(&match134, p1, 3, temp, NULL);
CheckBaseWithIndexAndDisplacement(&match134, p1, 3, temp, nullptr);
// S3 + (B0 - D15) -> [p1, 3, (B0 - D15), NULL]
s3 = graph()->NewNode(s_op, p1, d3);
......@@ -1979,14 +1979,14 @@ TEST_F(NodeMatcherTest, ScaledWithOffset64Matcher) {
ADD_NONE_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement64Matcher match135(
graph()->NewNode(a_op, s3, temp));
CheckBaseWithIndexAndDisplacement(&match135, p1, 3, temp, NULL);
CheckBaseWithIndexAndDisplacement(&match135, p1, 3, temp, nullptr);
// B0 + (B1 - D15) -> [b0, 0, (B1 - D15), NULL]
temp = graph()->NewNode(sub_op, b1, d15);
ADD_NONE_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement64Matcher match136(
graph()->NewNode(a_op, b0, temp));
CheckBaseWithIndexAndDisplacement(&match136, b0, 0, temp, NULL);
CheckBaseWithIndexAndDisplacement(&match136, b0, 0, temp, nullptr);
// (B0 - D15) + S3 -> [p1, 3, temp, NULL]
s3 = graph()->NewNode(s_op, p1, d3);
......@@ -1994,21 +1994,21 @@ TEST_F(NodeMatcherTest, ScaledWithOffset64Matcher) {
ADD_NONE_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement64Matcher match137(
graph()->NewNode(a_op, temp, s3));
CheckBaseWithIndexAndDisplacement(&match137, p1, 3, temp, NULL);
CheckBaseWithIndexAndDisplacement(&match137, p1, 3, temp, nullptr);
// (B0 + B1) + D15 -> [NULL, 0, (B0 + B1), d15]
temp = graph()->NewNode(a_op, b0, b1);
ADD_NONE_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement64Matcher match138(
graph()->NewNode(a_op, temp, d15));
CheckBaseWithIndexAndDisplacement(&match138, NULL, 0, temp, d15);
CheckBaseWithIndexAndDisplacement(&match138, nullptr, 0, temp, d15);
// D15 + (B0 + B1) -> [NULL, 0, (B0 + B1), d15]
temp = graph()->NewNode(a_op, b0, b1);
ADD_NONE_ADDRESSING_OPERAND_USES(temp);
BaseWithIndexAndDisplacement64Matcher match139(
graph()->NewNode(a_op, d15, temp));
CheckBaseWithIndexAndDisplacement(&match139, NULL, 0, temp, d15);
CheckBaseWithIndexAndDisplacement(&match139, nullptr, 0, temp, d15);
}
TEST_F(NodeMatcherTest, BranchMatcher_match) {
......
test/unittests/compiler/node-test-utils.cc
View file @ 654a7cb3
......@@ -57,7 +57,7 @@ class TestNodeMatcher : public MatcherInterface<Node*> {
bool MatchAndExplain(Node* node,
MatchResultListener* listener) const override {
if (node == NULL) {
if (node == nullptr) {
*listener << "which is NULL";
return false;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment