Changeset 34372 in webkit for trunk/JavaScriptCore/VM/CodeGenerator.h

Timestamp:

Jun 4, 2008, 10:36:55 PM (17 years ago)

Author:

[email protected]

Message:

2008-06-04 Sam Weinig <​[email protected]>

Reviewed by Maciej Stachowiak.

Big cleanup of formatting and whitespace.

File:

• trunk/JavaScriptCore/VM/CodeGenerator.h (modified) (15 diffs)

trunk/JavaScriptCore/VM/CodeGenerator.h

@@ -38 +38 @@
 #include "Machine.h"
 #include "RegisterID.h"
+#include "SegmentedVector.h"
 #include "SymbolTable.h"
-#include "SegmentedVector.h"
 #include "debugger.h"
 #include "nodes.h"
@@ -64 +64 @@
         RegisterID* retAddrDst;
     };
-    
+
     struct ControlFlowContext {
         bool isFinallyBlock;
         FinallyContext finallyContext;
     };
-    
+
     class CodeGenerator {
     public:
         typedef DeclarationStacks::VarStack VarStack;
         typedef DeclarationStacks::FunctionStack FunctionStack;
-        
+
         static void setDumpsGeneratedCode(bool dumpsGeneratedCode);
-        
+
         CodeGenerator(ProgramNode*, const Debugger*, const ScopeChain&, SymbolTable*, CodeBlock*, VarStack&, FunctionStack&, bool canCreateGlobals);
         CodeGenerator(FunctionBodyNode*, const Debugger*, const ScopeChain&, SymbolTable*, CodeBlock*);
@@ -96 +96 @@
 
         // Searches the scope chain in an attempt to  statically locate the requested
-        // property.  Returns false if for any reason the property cannot be safely 
+        // property.  Returns false if for any reason the property cannot be safely
         // optimised at all.  Otherwise it will return the index and depth of the
-        // VariableObject that defines the property.  If the property cannot be found 
+        // VariableObject that defines the property.  If the property cannot be found
         // statically, depth will contain the depth of the scope chain where dynamic
         // lookup must begin.
@@ -133 +133 @@
 
         // Returns the place to write the final output of an operation.
-        RegisterID* finalDestination(RegisterID* originalDst, RegisterID* tempDst = 0) 
-        { 
+        RegisterID* finalDestination(RegisterID* originalDst, RegisterID* tempDst = 0)
+        {
             if (originalDst)
                 return originalDst;
             if (tempDst && tempDst->isTemporary())
                 return tempDst;
-            return newTemporary(); 
-        }
-        
-        RegisterID* destinationForAssignResult(RegisterID* dst) { 
-            if (dst && m_codeBlock->needsFullScopeChain) 
+            return newTemporary();
+        }
+
+        RegisterID* destinationForAssignResult(RegisterID* dst)
+        {
+            if (dst && m_codeBlock->needsFullScopeChain)
                 return dst->isTemporary() ? dst : newTemporary();
             return 0;
@@ -151 +152 @@
         RegisterID* moveToDestinationIfNeeded(RegisterID* dst, RegisterID* src) { return (dst && dst != src) ? emitMove(dst, src) : src; }
 
-
         PassRefPtr<LabelID> newLabel();
-        
+
         // The emitNode functions are just syntactic sugar for calling
         // Node::emitCode. They're the only functions that accept a NULL register.
-        RegisterID* emitNode(RegisterID* dst, Node* n) {
+        RegisterID* emitNode(RegisterID* dst, Node* n)
+        {
             // Node::emitCode assumes that dst, if provided, is either a local or a referenced temporary.
             ASSERT(!dst || !dst->isTemporary() || dst->refCount());
@@ -183 +184 @@
                 return dst;
             }
-            
+
             return PassRefPtr<RegisterID>(emitNode(n));
         }
@@ -190 +191 @@
         RegisterID* emitLoad(RegisterID* dst, double);
         RegisterID* emitLoad(RegisterID* dst, JSValue*);
-        
+
         RegisterID* emitNewObject(RegisterID* dst);
         RegisterID* emitNewArray(RegisterID* dst);
@@ -266 +267 @@
         PassRefPtr<LabelID> emitJumpSubroutine(RegisterID* retAddrDst, LabelID*);
         void emitSubroutineReturn(RegisterID* retAddrSrc);
-        
+
         RegisterID* emitGetPropertyNames(RegisterID* dst, RegisterID* base);
         RegisterID* emitNextPropertyName(RegisterID* dst, RegisterID* iter, LabelID* target);
@@ -273 +274 @@
         void emitThrow(RegisterID*);
         RegisterID* emitNewError(RegisterID* dst, ErrorType type, JSValue* message);
-        
+
         RegisterID* emitPushScope(RegisterID* scope);
         void emitPopScope();
-        
+
         void emitDebugHook(DebugHookID, int firstLine, int lastLine);
 
         int scopeDepth() { return m_dynamicScopeDepth + m_finallyDepth; }
-        
+
         void pushFinallyContext(LabelID* target, RegisterID* returnAddrDst);
         void popFinallyContext();
@@ -290 +291 @@
         JumpContext* jumpContextForBreak(const Identifier&);
 
-
         CodeType codeType() const { return m_codeType; }
+
     private:
         PassRefPtr<LabelID> emitComplexJumpScopes(LabelID* target, ControlFlowContext* topScope, ControlFlowContext* bottomScope);
@@ -300 +301 @@
 
         typedef HashMap<JSValue*, unsigned, DefaultHash<JSValue*>::Hash, JSValueHashTraits> JSValueMap;
-        
+
         struct IdentifierMapIndexHashTraits {
             typedef int TraitType;
@@ -316 +317 @@
         // Maps a register index in the symbol table to a RegisterID index in m_locals.
         int localsIndex(int registerIndex) { return -registerIndex - 1; }
-        
+
         // Returns the RegisterID corresponding to ident.
         RegisterID* addVar(const Identifier& ident, bool isConstant)
@@ -335 +336 @@
         unsigned addConstant(JSValue*);
         unsigned addRegExp(RegExp* r);
-        
+
         Vector<Instruction>& instructions() { return m_codeBlock->instructions; }
         SymbolTable& symbolTable() { return *m_symbolTable; }
         Vector<HandlerInfo>& exceptionHandlers() { return m_codeBlock->exceptionHandlers; }
-        
+
         bool shouldOptimizeLocals() { return (m_codeType != EvalCode) && !m_dynamicScopeDepth; }
         bool canOptimizeNonLocals() { return (m_codeType == FunctionCode) && !m_dynamicScopeDepth && !m_codeBlock->usesEval; }
 
         bool m_shouldEmitDebugHooks;
-        
+
         const ScopeChain* m_scopeChain;
         SymbolTable* m_symbolTable;
-        
+
         ScopeNode* m_scopeNode;
         CodeBlock* m_codeBlock;
-        
+
         HashSet<RefPtr<UString::Rep>, IdentifierRepHash> m_functions;
         RegisterID m_thisRegister;
@@ -359 +360 @@
         int m_dynamicScopeDepth;
         CodeType m_codeType;
-        
+
         Vector<JumpContext> m_jumpContextStack;
         int m_continueDepth;
@@ -373 +374 @@
         CommonIdentifiers* m_propertyNames;
 
-#ifndef NDEBUG        
+#ifndef NDEBUG
         static bool s_dumpsGeneratedCode;
 #endif