Changeset 39577 in webkit for trunk/JavaScriptCore

Timestamp:

Jan 3, 2009, 10:19:44 PM (16 years ago)

Author:

[email protected]

Message:

2009-01-03 Sam Weinig <​[email protected]>

Reviewed by Oliver Hunt.

Change the pcVector from storing native code pointers to storing offsets
from the base pointer. This will allow us to generate the pcVector on demand
for exceptions.

• bytecode/CodeBlock.h: (JSC::PC::PC): (JSC::getNativePCOffset): (JSC::CodeBlock::getBytecodeIndex):
• jit/JIT.cpp: (JSC::JIT::privateCompile):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/CodeBlock.h (modified) (3 diffs)
• jit/JIT.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-01-03  Sam Weinig  <[email protected]>
+
+        Reviewed by Oliver Hunt.
+
+        Change the pcVector from storing native code pointers to storing offsets
+        from the base pointer. This will allow us to generate the pcVector on demand
+        for exceptions.
+
+        * bytecode/CodeBlock.h:
+        (JSC::PC::PC):
+        (JSC::getNativePCOffset):
+        (JSC::CodeBlock::getBytecodeIndex):
+        * jit/JIT.cpp:
+        (JSC::JIT::privateCompile):
+
 2009-01-02  Oliver Hunt  <[email protected]>
 

trunk/JavaScriptCore/bytecode/CodeBlock.h

@@ -152 +152 @@
 
     struct PC {
-        PC(void* nativePC, unsigned bytecodeIndex)
-            : nativePC(nativePC)
+        PC(ptrdiff_t nativePCOffset, unsigned bytecodeIndex)
+            : nativePCOffset(nativePCOffset)
             , bytecodeIndex(bytecodeIndex)
         {
         }
-        
-        void* nativePC;
+
+        ptrdiff_t nativePCOffset;
         unsigned bytecodeIndex;
     };
@@ -174 +174 @@
     }
 
-    inline void* getNativePC(PC* pc)
+    inline ptrdiff_t getNativePCOffset(PC* pc)
     {
-        return pc->nativePC;
+        return pc->nativePCOffset;
     }
 
@@ -300 +300 @@
         unsigned getBytecodeIndex(void* nativePC)
         {
-            return binaryChop<PC, void*, getNativePC>(m_pcVector.begin(), m_pcVector.size(), nativePC)->bytecodeIndex;
+            ptrdiff_t nativePCOffset = reinterpret_cast<void**>(nativePC) - reinterpret_cast<void**>(m_jitCode.code);
+            return binaryChop<PC, ptrdiff_t, getNativePCOffset>(m_pcVector.begin(), m_pcVector.size(), nativePCOffset)->bytecodeIndex;
         }
 

trunk/JavaScriptCore/jit/JIT.cpp

@@ -1639 +1639 @@
         if (iter->to)
             patchBuffer.link(iter->from, iter->to);
-        m_codeBlock->pcVector().append(PC(patchBuffer.addressOf(iter->from), iter->bytecodeIndex));
+        m_codeBlock->pcVector().append(PC(reinterpret_cast<void**>(patchBuffer.addressOf(iter->from)) - reinterpret_cast<void**>(code), iter->bytecodeIndex));
     }