Changeset 43839 in webkit for trunk/JavaScriptCore/bytecode

Timestamp:

May 18, 2009, 1:22:52 PM (16 years ago)

Author:

[email protected]

Message:

2009-05-18 Jan Michael Alonzo <​[email protected]>

Reviewed by Xan Lopez.

[Gtk] Various autotools build refactoring and fixes
​https://bugs.webkit.org/show_bug.cgi?id=25286

Add -no-install and -no-fast-install to programs and tests that we
don't install. Also remove -O2 since this is already handled at
configure time.

• GNUmakefile.am:

Location:

trunk/JavaScriptCore/bytecode

Files:

• CodeBlock.cpp (modified) (3 diffs)
• CodeBlock.h (modified) (4 diffs)

trunk/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -1464 +1464 @@
 #if ENABLE(JIT)
             JIT::compile(m_globalData, &newCodeBlock);
-            ASSERT(newFunctionBody->generatedJITCode().size() == ownerNode()->generatedJITCode().size());
+            ASSERT(newCodeBlock.m_jitCode.codeSize == m_jitCode.codeSize);
 #endif
 
@@ -1485 +1485 @@
 #if ENABLE(JIT)
             JIT::compile(m_globalData, &newCodeBlock);
-            ASSERT(newEvalBody->generatedJITCode().size() == ownerNode()->generatedJITCode().size());
+            ASSERT(newCodeBlock.m_jitCode.codeSize == m_jitCode.codeSize);
 #endif
 
@@ -1679 +1679 @@
 
 #if ENABLE(JIT)
-void CodeBlock::setJITCode(JITCode jitCode)
-{
-    ownerNode()->setJITCode(jitCode);
+void CodeBlock::setJITCode(JITCodeRef& jitCode)
+{
+    m_jitCode = jitCode;
 #if !ENABLE(OPCODE_SAMPLING)
     if (!BytecodeGenerator::dumpsGeneratedCode())

trunk/JavaScriptCore/bytecode/CodeBlock.h

@@ -64 +64 @@
     };
 
+#if ENABLE(JIT)
+    // The code, and the associated pool from which it was allocated.
+    struct JITCodeRef {
+        JITCode code;
+#ifndef NDEBUG
+        unsigned codeSize;
+#endif
+        RefPtr<ExecutablePool> executablePool;
+
+        JITCodeRef()
+            : code(0)
+#ifndef NDEBUG
+            , codeSize(0)
+#endif
+        {
+        }
+        
+        JITCodeRef(void* code, PassRefPtr<ExecutablePool> executablePool)
+            : code(code)
+#ifndef NDEBUG
+            , codeSize(0)
+#endif
+            , executablePool(executablePool)
+        {
+        }
+    };
+#endif
+
     struct ExpressionRangeInfo {
         enum {
@@ -285 +313 @@
         {
             reparseForExceptionInfoIfNecessary(callFrame);
-            return binaryChop<CallReturnOffsetToBytecodeIndex, unsigned, getCallReturnOffset>(m_exceptionInfo->m_callReturnIndexVector.begin(), m_exceptionInfo->m_callReturnIndexVector.size(), ownerNode()->generatedJITCode().offsetOf(nativePC))->bytecodeIndex;
+            return binaryChop<CallReturnOffsetToBytecodeIndex, unsigned, getCallReturnOffset>(m_exceptionInfo->m_callReturnIndexVector.begin(), m_exceptionInfo->m_callReturnIndexVector.size(), m_jitCode.code.offsetOf(nativePC))->bytecodeIndex;
         }
         
@@ -300 +328 @@
 
 #if ENABLE(JIT)
-        void setJITCode(JITCode);
-        ExecutablePool* executablePool() { return ownerNode()->getExecutablePool(); }
+        void setJITCode(JITCodeRef& jitCode);
+        JITCode jitCode() { return m_jitCode.code; }
+        ExecutablePool* executablePool() { return m_jitCode.executablePool.get(); }
 #endif
 
@@ -445 +474 @@
         unsigned m_instructionCount;
 #endif
+#if ENABLE(JIT)
+        JITCodeRef m_jitCode;
+#endif
 
         int m_thisRegister;