Changeset 39252 in webkit for trunk/JavaScriptCore/bytecode/CodeBlock.cpp

Timestamp:

Dec 12, 2008, 1:31:33 PM (16 years ago)

Author:

[email protected]

Message:

2008-12-12 Sam Weinig <​[email protected]>

Reviewed by Geoffrey Garen.

Change exception information accessors to take offsets into the bytecode
instruction buffer instead of pointers so that they can work even even
if the bytecode buffer is purged.

• bytecode/CodeBlock.cpp: (JSC::instructionOffsetForNth): (JSC::CodeBlock::handlerForBytecodeOffset): (JSC::CodeBlock::lineNumberForBytecodeOffset): (JSC::CodeBlock::expressionRangeForBytecodeOffset):
• bytecode/CodeBlock.h:
• bytecode/SamplingTool.cpp: (JSC::SamplingTool::dump):
• interpreter/Interpreter.cpp: (JSC::Interpreter::throwException): (JSC::Interpreter::privateExecute): (JSC::Interpreter::retrieveLastCaller):
• jit/JIT.cpp: (JSC::JIT::privateCompileMainPass):
• runtime/ExceptionHelpers.cpp: (JSC::createUndefinedVariableError): (JSC::createInvalidParamError): (JSC::createNotAConstructorError): (JSC::createNotAFunctionError): (JSC::createNotAnObjectError):

File:

• trunk/JavaScriptCore/bytecode/CodeBlock.cpp (modified) (10 diffs)

trunk/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -209 +209 @@
     while (i < instructions.size()) {
         OpcodeID currentOpcode = exec->interpreter()->getOpcodeID(instructions[i].u.opcode);
-        if (predicate(exec->interpreter()->getOpcodeID(instructions[i].u.opcode))) {
+        if (predicate(currentOpcode)) {
             if (!--nth)
                 return i;
@@ -1331 +1331 @@
 }
 
-HandlerInfo* CodeBlock::handlerForVPC(const Instruction* vPC)
+HandlerInfo* CodeBlock::handlerForBytecodeOffset(unsigned bytecodeOffset)
 {
     if (!m_rareData)
         return 0;
 
-    unsigned addressOffset = vPC - m_instructions.begin();
-    ASSERT(addressOffset < m_instructions.size());
+    ASSERT(bytecodeOffset < m_instructions.size());
     
     Vector<HandlerInfo>& exceptionHandlers = m_rareData->m_exceptionHandlers;
@@ -1343 +1342 @@
         // Handlers are ordered innermost first, so the first handler we encounter
         // that contains the source address is the correct handler to use.
-        if (exceptionHandlers[i].start <= addressOffset && exceptionHandlers[i].end >= addressOffset)
+        if (exceptionHandlers[i].start <= bytecodeOffset && exceptionHandlers[i].end >= bytecodeOffset)
             return &exceptionHandlers[i];
     }
@@ -1350 +1349 @@
 }
 
-int CodeBlock::lineNumberForVPC(const Instruction* vPC)
-{
-    unsigned instructionOffset = vPC - m_instructions.begin();
-    ASSERT(instructionOffset < m_instructions.size());
+int CodeBlock::lineNumberForBytecodeOffset(unsigned bytecodeOffset)
+{
+    ASSERT(bytecodeOffset < m_instructions.size());
 
     if (!m_lineInfo.size())
@@ -1362 +1360 @@
     while (low < high) {
         int mid = low + (high - low) / 2;
-        if (m_lineInfo[mid].instructionOffset <= instructionOffset)
+        if (m_lineInfo[mid].instructionOffset <= bytecodeOffset)
             low = mid + 1;
         else
@@ -1373 +1371 @@
 }
 
-int CodeBlock::expressionRangeForVPC(const Instruction* vPC, int& divot, int& startOffset, int& endOffset)
-{
-    unsigned instructionOffset = vPC - m_instructions.begin();
-    ASSERT(instructionOffset < m_instructions.size());
+int CodeBlock::expressionRangeForBytecodeOffset(unsigned bytecodeOffset, int& divot, int& startOffset, int& endOffset)
+{
+    ASSERT(bytecodeOffset < m_instructions.size());
 
     if (!m_expressionInfo.size()) {
@@ -1383 +1380 @@
         endOffset = 0;
         divot = 0;
-        return lineNumberForVPC(vPC);
+        return lineNumberForBytecodeOffset(bytecodeOffset);
     }
 
@@ -1390 +1387 @@
     while (low < high) {
         int mid = low + (high - low) / 2;
-        if (m_expressionInfo[mid].instructionOffset <= instructionOffset)
+        if (m_expressionInfo[mid].instructionOffset <= bytecodeOffset)
             low = mid + 1;
         else
@@ -1401 +1398 @@
         endOffset = 0;
         divot = 0;
-        return lineNumberForVPC(vPC);
+        return lineNumberForBytecodeOffset(bytecodeOffset);
     }
 
@@ -1407 +1404 @@
     endOffset = m_expressionInfo[low - 1].endOffset;
     divot = m_expressionInfo[low - 1].divotPoint + m_sourceOffset;
-    return lineNumberForVPC(vPC);
+    return lineNumberForBytecodeOffset(bytecodeOffset);
 }