Changeset 36244 in webkit for trunk/JavaScriptCore/VM/CodeBlock.cpp

Timestamp:

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

Author:

[email protected]

Message:

Merge squirrelfish-extreme to trunk.

File:

• trunk/JavaScriptCore/VM/CodeBlock.cpp (modified) (5 diffs)

trunk/JavaScriptCore/VM/CodeBlock.cpp

@@ -274 +274 @@
         size_t i = 0;
         do {
-            printStructureIDs(&instructions[structureIDInstructions[i]]);
-            ++i;
+             printStructureIDs(&instructions[structureIDInstructions[i]]);
+             ++i;
         } while (i < structureIDInstructions.size());
     }
-
+ 
     if (exceptionHandlers.size()) {
         printf("\nException Handlers:\n");
@@ -318 +318 @@
                 UChar ch = static_cast<UChar>(entry + characterSwitchJumpTables[i].min);
                 printf("\t\t\"%s\" => %04d\n", UString(&ch, 1).ascii(), *iter);
-            }
+        }
             printf("      }\n");
             ++i;
@@ -329 +329 @@
         do {
             printf("  %1d = {\n", i);
-            StringJumpTable::const_iterator end = stringSwitchJumpTables[i].end();
-            for (StringJumpTable::const_iterator iter = stringSwitchJumpTables[i].begin(); iter != end; ++iter)
-                printf("\t\t\"%s\" => %04d\n", UString(iter->first).ascii(), iter->second);
+            StringJumpTable::StringOffsetTable::const_iterator end = stringSwitchJumpTables[i].offsetTable.end();
+            for (StringJumpTable::StringOffsetTable::const_iterator iter = stringSwitchJumpTables[i].offsetTable.begin(); iter != end; ++iter)
+                printf("\t\t\"%s\" => %04d\n", UString(iter->first).ascii(), iter->second.branchOffset);
             printf("      }\n");
             ++i;
@@ -821 +821 @@
     for (size_t i = 0; i < size; ++i)
         derefStructureIDs(&instructions[structureIDInstructions[i]]);
+
+    size = structureIDAccessStubs.size();
+    for (size_t i = 0; i < size; ++i)
+        fastFree(structureIDAccessStubs[i]);
+
+#if ENABLE(CTI)
+    if (ctiCode)
+        fastFree(ctiCode);
+#endif
 }
 
@@ -913 +922 @@
 }
 
+void* CodeBlock::nativeExceptionCodeForHandlerVPC(const Instruction* handlerVPC)
+{
+    Vector<HandlerInfo>::iterator ptr = exceptionHandlers.begin(); 
+    Vector<HandlerInfo>::iterator end = exceptionHandlers.end();
+    
+    for (; ptr != end; ++ptr) {
+        Instruction*target = instructions.begin() + ptr->target;
+        if (handlerVPC == target)
+            return ptr->nativeCode;
+    }
+
+    return 0;
+}
+
 int CodeBlock::lineNumberForVPC(const Instruction* vPC)
 {