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

Timestamp:

Sep 4, 2008, 2:29:26 AM (17 years ago)

Author:

[email protected]

Message:

Fix the 64-bit build.

• VM/CodeBlock.cpp:

(KJS::CodeBlock::printStructureID): Store the instruction offset into an unsigned local
to avoid a warning related to format specifiers.
(KJS::CodeBlock::printStructureIDs): Ditto.

File:

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

trunk/JavaScriptCore/VM/CodeBlock.cpp

@@ -178 +178 @@
 void CodeBlock::printStructureID(const char* name, const Instruction* vPC, int operand) const
 {
-    printf("  [%4d] %s: %s\n", vPC - instructions.begin(), name, pointerToSourceString(vPC[operand].u.structureID).UTF8String().c_str());
+    unsigned instructionOffset = vPC - instructions.begin();
+    printf("  [%4d] %s: %s\n", instructionOffset, name, pointerToSourceString(vPC[operand].u.structureID).UTF8String().c_str());
 }
 
@@ -184 +185 @@
 {
     Machine* machine = globalData->machine;
+    unsigned instructionOffset = vPC - instructions.begin();
 
     if (vPC[0].u.opcode == machine->getOpcode(op_get_by_id)) {
@@ -194 +196 @@
     }
     if (vPC[0].u.opcode == machine->getOpcode(op_get_by_id_proto)) {
-        printf("  [%4d] %s: %s, %s\n", vPC - instructions.begin(), "get_by_id_proto", pointerToSourceString(vPC[4].u.structureID).UTF8String().c_str(), pointerToSourceString(vPC[5].u.structureID).UTF8String().c_str());
+        printf("  [%4d] %s: %s, %s\n", instructionOffset, "get_by_id_proto", pointerToSourceString(vPC[4].u.structureID).UTF8String().c_str(), pointerToSourceString(vPC[5].u.structureID).UTF8String().c_str());
         return;
     }
     if (vPC[0].u.opcode == machine->getOpcode(op_get_by_id_chain)) {
-        printf("  [%4d] %s: %s, %s\n", vPC - instructions.begin(), "get_by_id_chain", pointerToSourceString(vPC[4].u.structureID).UTF8String().c_str(), pointerToSourceString(vPC[5].u.structureIDChain).UTF8String().c_str());
+        printf("  [%4d] %s: %s, %s\n", instructionOffset, "get_by_id_chain", pointerToSourceString(vPC[4].u.structureID).UTF8String().c_str(), pointerToSourceString(vPC[5].u.structureIDChain).UTF8String().c_str());
         return;
     }