JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / bytecode / Opcode.cpp

diff --git a/bytecode/Opcode.cpp b/bytecode/Opcode.cpp
index 0adc76b28217a6024194f53c4d92cc847339e0bb..3efa3493422cd30937f85d0c0698343a1bbd359a 100644 (file)
--- a/bytecode/Opcode.cpp
+++ b/bytecode/Opcode.cpp
@@ -11,7 +11,7 @@
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.

- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3.  Neither the name of Apple Inc. ("Apple") nor the names of

  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *


@@ -31,8 +31,8 @@
 #include "Opcode.h"
 
 #if ENABLE(OPCODE_STATS)
 #include "Opcode.h"
 
 #if ENABLE(OPCODE_STATS)

-#include <stdio.h>
-#include <wtf/FixedArray.h>
+#include <array>
+#include <wtf/DataLog.h>

 #endif
 
 using namespace std;
 #endif
 
 using namespace std;


@@ -78,9 +78,9 @@ static int compareOpcodeIndices(const void* left, const void* right)
 
 static int compareOpcodePairIndices(const void* left, const void* right)
 {
 
 static int compareOpcodePairIndices(const void* left, const void* right)
 {

-    pair<int, int> leftPair = *(pair<int, int>*) left;
+    std::pair<int, int> leftPair = *(pair<int, int>*) left;

     long long leftValue = OpcodeStats::opcodePairCounts[leftPair.first][leftPair.second];
     long long leftValue = OpcodeStats::opcodePairCounts[leftPair.first][leftPair.second];

-    pair<int, int> rightPair = *(pair<int, int>*) right;
+    std::pair<int, int> rightPair = *(pair<int, int>*) right;

     long long rightValue = OpcodeStats::opcodePairCounts[rightPair.first][rightPair.second];
     
     if (leftValue < rightValue)
     long long rightValue = OpcodeStats::opcodePairCounts[rightPair.first][rightPair.second];
     
     if (leftValue < rightValue)


@@ -102,17 +102,17 @@ OpcodeStats::~OpcodeStats()
         for (int j = 0; j < numOpcodeIDs; ++j)
             totalInstructionPairs += opcodePairCounts[i][j];
 
         for (int j = 0; j < numOpcodeIDs; ++j)
             totalInstructionPairs += opcodePairCounts[i][j];
 

-    FixedArray<int, numOpcodeIDs> sortedIndices;
+    std::array<int, numOpcodeIDs> sortedIndices;

     for (int i = 0; i < numOpcodeIDs; ++i)
         sortedIndices[i] = i;
     qsort(sortedIndices.data(), numOpcodeIDs, sizeof(int), compareOpcodeIndices);
     
     for (int i = 0; i < numOpcodeIDs; ++i)
         sortedIndices[i] = i;
     qsort(sortedIndices.data(), numOpcodeIDs, sizeof(int), compareOpcodeIndices);
     

-    pair<int, int> sortedPairIndices[numOpcodeIDs * numOpcodeIDs];
-    pair<int, int>* currentPairIndex = sortedPairIndices;
+    std::pair<int, int> sortedPairIndices[numOpcodeIDs * numOpcodeIDs];
+    std::pair<int, int>* currentPairIndex = sortedPairIndices;

     for (int i = 0; i < numOpcodeIDs; ++i)
         for (int j = 0; j < numOpcodeIDs; ++j)
     for (int i = 0; i < numOpcodeIDs; ++i)
         for (int j = 0; j < numOpcodeIDs; ++j)

-            *(currentPairIndex++) = make_pair(i, j);
-    qsort(sortedPairIndices, numOpcodeIDs * numOpcodeIDs, sizeof(pair<int, int>), compareOpcodePairIndices);
+            *(currentPairIndex++) = std::make_pair(i, j);
+    qsort(sortedPairIndices, numOpcodeIDs * numOpcodeIDs, sizeof(std::pair<int, int>), compareOpcodePairIndices);

     
     dataLogF("\nExecuted opcode statistics\n"); 
     
     
     dataLogF("\nExecuted opcode statistics\n"); 
     


@@ -129,7 +129,7 @@ OpcodeStats::~OpcodeStats()
     dataLogF("2-opcode sequences by frequency: %lld\n\n", totalInstructions);
     
     for (int i = 0; i < numOpcodeIDs * numOpcodeIDs; ++i) {
     dataLogF("2-opcode sequences by frequency: %lld\n\n", totalInstructions);
     
     for (int i = 0; i < numOpcodeIDs * numOpcodeIDs; ++i) {

-        pair<int, int> indexPair = sortedPairIndices[i];
+        std::pair<int, int> indexPair = sortedPairIndices[i];

         long long count = opcodePairCounts[indexPair.first][indexPair.second];
         
         if (!count)
         long long count = opcodePairCounts[indexPair.first][indexPair.second];
         
         if (!count)


@@ -150,7 +150,7 @@ OpcodeStats::~OpcodeStats()
         dataLogF("\n%s:%s %lld - %.2f%%\n", opcodeNames[index], padOpcodeName((OpcodeID)index, 28), opcodeCount, opcodeProportion * 100.0);
 
         for (int j = 0; j < numOpcodeIDs * numOpcodeIDs; ++j) {
         dataLogF("\n%s:%s %lld - %.2f%%\n", opcodeNames[index], padOpcodeName((OpcodeID)index, 28), opcodeCount, opcodeProportion * 100.0);
 
         for (int j = 0; j < numOpcodeIDs * numOpcodeIDs; ++j) {

-            pair<int, int> indexPair = sortedPairIndices[j];
+            std::pair<int, int> indexPair = sortedPairIndices[j];

             long long pairCount = opcodePairCounts[indexPair.first][indexPair.second];
             double pairProportion = ((double) pairCount) / ((double) totalInstructionPairs);
         
             long long pairCount = opcodePairCounts[indexPair.first][indexPair.second];
             double pairProportion = ((double) pairCount) / ((double) totalInstructionPairs);