Changeset 34372 in webkit for trunk/JavaScriptCore/VM/Machine.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/Machine.h (modified) (8 diffs)

trunk/JavaScriptCore/VM/Machine.h

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
- 
+
 #ifndef Machine_h
 #define Machine_h
@@ -32 +32 @@
 #include "Opcode.h"
 #include "RegisterFileStack.h"
+#include <kjs/list.h>
 #include <wtf/HashMap.h>
-#include <kjs/list.h>
 
 namespace KJS {
@@ -46 +46 @@
     class RegisterFileStack;
     class ScopeChainNode;
-    
+
     enum DebugHookID {
         WillExecuteProgram,
@@ -60 +60 @@
     class Machine {
     public:
-        enum { CallerCodeBlock = 0, 
-               ReturnVPC, 
-               CallerScopeChain, 
-               CallerRegisterOffset, 
-               ReturnValueRegister,
-               ArgumentStartRegister,
-               ArgumentCount,
-               CalledAsConstructor,
-               Callee,
-               OptionalCalleeActivation,
-               CallFrameHeaderSize};
-        
+        enum {
+            CallerCodeBlock = 0,
+            ReturnVPC,
+            CallerScopeChain,
+            CallerRegisterOffset,
+            ReturnValueRegister,
+            ArgumentStartRegister,
+            ArgumentCount,
+            CalledAsConstructor,
+            Callee,
+            OptionalCalleeActivation,
+            CallFrameHeaderSize
+        };
+
         enum { ProgramCodeThisRegister = -1 };
 
         Machine();
-        
-        Opcode getOpcode(OpcodeID id) {
+
+        Opcode getOpcode(OpcodeID id)
+        {
             #if HAVE(COMPUTED_GOTO)
-                return m_opcodeTable[id]; 
+                return m_opcodeTable[id];
             #else
                 return id;
@@ -84 +87 @@
         }
 
-        OpcodeID getOpcodeID(Opcode opcode) {
+        OpcodeID getOpcodeID(Opcode opcode)
+        {
             #if HAVE(COMPUTED_GOTO)
                 ASSERT(isOpcode(opcode));
@@ -94 +98 @@
 
         bool isOpcode(Opcode opcode);
-        
+
         JSValue* execute(ProgramNode*, ExecState*, ScopeChainNode*, JSObject* thisObj, RegisterFileStack*, JSValue** exception);
         JSValue* execute(FunctionBodyNode*, ExecState*, FunctionImp*, JSObject* thisObj, const List& args, RegisterFileStack*, ScopeChainNode*, JSValue** exception);
         JSValue* execute(EvalNode*, ExecState*, JSObject* thisObj, RegisterFile*, int registerOffset, ScopeChainNode*, JSValue** exception);
         JSValue* execute(EvalNode*, ExecState*, JSObject* thisObj, RegisterFileStack*, ScopeChainNode*, JSValue** exception);
-        
+
         JSValue* retrieveArguments(ExecState*, FunctionImp*) const;
         JSValue* retrieveCaller(ExecState*, FunctionImp*) const;
-        
+
         void getFunctionAndArguments(Register** registerBase, Register* callFrame, FunctionImp*&, Register*& argv, int& argc);
-        
+
     private:
-        typedef enum { Normal, InitializeAndReturn } ExecutionFlag;
+        enum ExecutionFlag { Normal, InitializeAndReturn };
 
         ALWAYS_INLINE void setScopeChain(ExecState* exec, ScopeChainNode*&, ScopeChainNode*);
@@ -113 +117 @@
         NEVER_INLINE bool unwindCallFrame(ExecState*, JSValue*, Register**, const Instruction*&, CodeBlock*&, JSValue**&, ScopeChainNode*&, Register*&);
         NEVER_INLINE Instruction* throwException(ExecState*, JSValue*, Register**, const Instruction*, CodeBlock*&, JSValue**&, ScopeChainNode*&, Register*&);
-        
+
         bool getCallFrame(ExecState*, FunctionImp*, Register**& registerBase, int& callFrameOffset) const;
 
@@ -120 +124 @@
         void dumpCallFrame(const CodeBlock*, ScopeChainNode*, RegisterFile*, const Register*);
         void dumpRegisters(const CodeBlock*, RegisterFile*, const Register*);
-        
+
         bool isGlobalCallFrame(Register** registerBase, const Register* r) const { return (*registerBase) == r; }
 
         int m_reentryDepth;
-#if HAVE(COMPUTED_GOTO)        
+#if HAVE(COMPUTED_GOTO)
         Opcode m_opcodeTable[numOpcodeIDs]; // Maps OpcodeID => Opcode for compiling
         HashMap<Opcode, OpcodeID> m_opcodeIDTable; // Maps Opcode => OpcodeID for decompiling
 #endif
     };
-    
+
     Machine& machine();