Changeset 36244 in webkit for trunk/JavaScriptCore/kjs/ExecState.h

Timestamp:

Sep 6, 2008, 10:44:58 PM (17 years ago)

Author:

[email protected]

Message:

Merge squirrelfish-extreme to trunk.

File:

• trunk/JavaScriptCore/kjs/ExecState.h (modified) (3 diffs)

trunk/JavaScriptCore/kjs/ExecState.h

@@ -47 +47 @@
     // Passed as the first argument to most functions.
     class ExecState : Noncopyable {
+#if ENABLE(CTI)
+        friend class CTI;
+#endif
         friend class Machine;
         friend class DebuggerCallFrame;
-
     public:
         ExecState(JSGlobalObject*, JSObject* globalThisValue, ScopeChainNode* globalScopeChain);
@@ -71 +73 @@
         JSValue** exceptionSlot() { return &m_exception; }
         bool hadException() const { return !!m_exception; }
+#if ENABLE(CTI)
+        void setCTIReturnAddress(void* ctiRA) { m_ctiReturnAddress = ctiRA; }
+        void* ctiReturnAddress() const { return m_ctiReturnAddress; }
+#endif
 
         JSGlobalData& globalData() { return *m_globalData; }
@@ -102 +108 @@
 
         JSValue* m_exception;
-
+#if ENABLE(CTI)
+        void* m_ctiReturnAddress;
+#endif
         JSGlobalData* m_globalData;