Changeset 38219 in webkit for trunk/JavaScriptCore/bytecompiler

Timestamp:

Nov 7, 2008, 1:22:41 AM (17 years ago)

Author:

[email protected]

Message:

2008-11-07 Cameron Zwarich <​[email protected]>

Reviewed by Alexey Proskuryakov.

Rename the m_nextGlobal, m_nextParameter, and m_nextConstant member
variables of CodeGenerator to m_nextGlobalIndex, m_nextParameterIndex,
and m_nextConstantIndex respectively. This is to distinguish these from
member variables like m_lastConstant, which are actually RefPtrs to
Registers.

• bytecompiler/CodeGenerator.cpp: (JSC::CodeGenerator::addGlobalVar): (JSC::CodeGenerator::allocateConstants): (JSC::CodeGenerator::CodeGenerator): (JSC::CodeGenerator::addParameter): (JSC::CodeGenerator::addConstant):
• bytecompiler/CodeGenerator.h:

Location:

trunk/JavaScriptCore/bytecompiler

Files:

• CodeGenerator.cpp (modified) (9 diffs)
• CodeGenerator.h (modified) (1 diff)

trunk/JavaScriptCore/bytecompiler/CodeGenerator.cpp

@@ -166 +166 @@
 bool CodeGenerator::addGlobalVar(const Identifier& ident, bool isConstant, RegisterID*& r0)
 {
-    int index = m_nextGlobal;
+    int index = m_nextGlobalIndex;
     SymbolTableEntry newEntry(index, isConstant ? ReadOnly : 0);
     pair<SymbolTable::iterator, bool> result = symbolTable().add(ident.ustring().rep(), newEntry);
@@ -173 +173 @@
         index = result.first->second.getIndex();
     else {
-        --m_nextGlobal;
+        --m_nextGlobalIndex;
         m_globals.append(index + m_globalVarStorageOffset);
     }
@@ -187 +187 @@
         return;
     
-    m_nextConstant = m_calleeRegisters.size();
+    m_nextConstantIndex = m_calleeRegisters.size();
 
     for (size_t i = 0; i < count; ++i)
@@ -205 +205 @@
     , m_dynamicScopeDepth(0)
     , m_codeType(GlobalCode)
-    , m_nextGlobal(-1)
+    , m_nextGlobalIndex(-1)
     , m_globalData(&scopeChain.globalObject()->globalExec()->globalData())
     , m_lastOpcodeID(op_end)
@@ -237 +237 @@
     if (canOptimizeNewGlobals) {
         // Shift new symbols so they get stored prior to existing symbols.
-        m_nextGlobal -= symbolTable->size();
+        m_nextGlobalIndex -= symbolTable->size();
 
         for (size_t i = 0; i < functionStack.size(); ++i) {
@@ -322 +322 @@
     const Identifier* parameters = functionBody->parameters();
     size_t parameterCount = functionBody->parameterCount();
-    m_nextParameter = -RegisterFile::CallFrameHeaderSize - parameterCount - 1;
+    m_nextParameterIndex = -RegisterFile::CallFrameHeaderSize - parameterCount - 1;
     m_parameters.resize(1 + parameterCount); // reserve space for "this"
 
     // Add "this" as a parameter
-    m_thisRegister.setIndex(m_nextParameter);
-    ++m_nextParameter;
+    m_thisRegister.setIndex(m_nextParameterIndex);
+    ++m_nextParameterIndex;
     ++m_codeBlock->numParameters;
 
@@ -371 +371 @@
     UString::Rep* rep = ident.ustring().rep();
     if (!m_functions.contains(rep)) {
-        symbolTable().set(rep, m_nextParameter);
-        RegisterID& parameter = registerFor(m_nextParameter);
-        parameter.setIndex(m_nextParameter);
+        symbolTable().set(rep, m_nextParameterIndex);
+        RegisterID& parameter = registerFor(m_nextParameterIndex);
+        parameter.setIndex(m_nextParameterIndex);
         result = &parameter;
     }
@@ -379 +379 @@
     // To maintain the calling convention, we have to allocate unique space for
     // each parameter, even if the parameter doesn't make it into the symbol table.
-    ++m_nextParameter;
+    ++m_nextParameterIndex;
     ++m_codeBlock->numParameters;
     return result;
@@ -684 +684 @@
 RegisterID* CodeGenerator::addConstant(JSValue* v)
 {
-    pair<JSValueMap::iterator, bool> result = m_jsValueMap.add(v, m_nextConstant);
+    pair<JSValueMap::iterator, bool> result = m_jsValueMap.add(v, m_nextConstantIndex);
     if (result.second) {
-        RegisterID& constant = m_calleeRegisters[m_nextConstant];
+        RegisterID& constant = m_calleeRegisters[m_nextConstantIndex];
         
-        ++m_nextConstant;
+        ++m_nextConstantIndex;
 
         m_codeBlock->constantRegisters.append(v);

trunk/JavaScriptCore/bytecompiler/CodeGenerator.h

@@ -426 +426 @@
         Vector<SwitchInfo> m_switchContextStack;
 
-        int m_nextGlobal;
-        int m_nextParameter;
-        int m_nextConstant;
+        int m_nextGlobalIndex;
+        int m_nextParameterIndex;
+        int m_nextConstantIndex;
 
         int m_globalVarStorageOffset;