[C++11] Use 'nullptr'.

[oota-llvm.git] / utils / PerfectShuffle / PerfectShuffle.cpp

diff --git a/utils/PerfectShuffle/PerfectShuffle.cpp b/utils/PerfectShuffle/PerfectShuffle.cpp
index 7a42d02f8b646f499f33ebc44440cbc813b50364..f80d88563168f5219dfecd1627012e9d95dcaf66 100644 (file)
--- a/utils/PerfectShuffle/PerfectShuffle.cpp
+++ b/utils/PerfectShuffle/PerfectShuffle.cpp
@@ -14,10 +14,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <iostream>
-#include <vector>
 #include <cassert>
 #include <cstdlib>
+#include <iomanip>
+#include <iostream>
+#include <vector>
 struct Operator;
 
 // Masks are 4-nibble hex numbers.  Values 0-7 in any nibble means that it takes
@@ -218,10 +219,10 @@ static void EvaluateOps(unsigned short Elt, unsigned short Vals[],
 int main() {
   // Seed the table with accesses to the LHS and RHS.
   ShufTab[0x0123].Cost = 0;
-  ShufTab[0x0123].Op = 0;
+  ShufTab[0x0123].Op = nullptr;
   ShufTab[0x0123].Arg0 = 0x0123;
   ShufTab[0x4567].Cost = 0;
-  ShufTab[0x4567].Op = 0;
+  ShufTab[0x4567].Op = nullptr;
   ShufTab[0x4567].Arg0 = 0x4567;
 
   // Seed the first-level of shuffles, shuffles whose inputs are the input to
@@ -400,7 +401,7 @@ int main() {
     // LHS, and 13 bits of RHS = 32 bits.
     unsigned Val = (CostSat << 30) | (OpNum << 26) | (LHS << 13) | RHS;
 
-    std::cout << "  " << Val << "U,\t// ";
+    std::cout << "  " << std::setw(10) << Val << "U, // ";
     PrintMask(i, std::cout);
     std::cout << ": Cost " << ShufTab[i].Cost;
     std::cout << " " << (ShufTab[i].Op ? ShufTab[i].Op->getName() : "copy");
@@ -545,27 +546,27 @@ vext<2> the_vext2("vext2", OP_VEXT2);
 vext<3> the_vext3("vext3", OP_VEXT3);
 
 struct vuzpl : public Operator {
-  vuzpl() : Operator(0x1032, "vuzpl", OP_VUZPL, 2) {}
+  vuzpl() : Operator(0x0246, "vuzpl", OP_VUZPL, 2) {}
 } the_vuzpl;
 
 struct vuzpr : public Operator {
-  vuzpr() : Operator(0x4602, "vuzpr", OP_VUZPR, 2) {}
+  vuzpr() : Operator(0x1357, "vuzpr", OP_VUZPR, 2) {}
 } the_vuzpr;
 
 struct vzipl : public Operator {
-  vzipl() : Operator(0x6273, "vzipl", OP_VZIPL, 2) {}
+  vzipl() : Operator(0x0415, "vzipl", OP_VZIPL, 2) {}
 } the_vzipl;
 
 struct vzipr : public Operator {
-  vzipr() : Operator(0x4051, "vzipr", OP_VZIPR, 2) {}
+  vzipr() : Operator(0x2637, "vzipr", OP_VZIPR, 2) {}
 } the_vzipr;
 
 struct vtrnl : public Operator {
-  vtrnl() : Operator(0x5173, "vtrnl", OP_VTRNL, 2) {}
+  vtrnl() : Operator(0x0426, "vtrnl", OP_VTRNL, 2) {}
 } the_vtrnl;
 
 struct vtrnr : public Operator {
-  vtrnr() : Operator(0x4062, "vtrnr", OP_VTRNR, 2) {}
+  vtrnr() : Operator(0x1537, "vtrnr", OP_VTRNR, 2) {}
 } the_vtrnr;
 
 #endif