Changeset 36418 in webkit for trunk/JavaScriptCore/VM/CodeBlock.h

Timestamp:

Sep 14, 2008, 7:18:13 PM (17 years ago)

Author:

[email protected]

Message:

2008-09-14 Maciej Stachowiak <​[email protected]>

Reviewed by Cameron Zwarich.

• split the "prototype" lookup for hasInstance into opcode stream so it can be cached

~5% speedup on v8 earley-boyer test

• API/JSCallbackObject.h: Add a parameter for the pre-looked-up prototype.
• API/JSCallbackObjectFunctions.h: (JSC::::hasInstance): Ditto.
• API/JSValueRef.cpp: (JSValueIsInstanceOfConstructor): Look up and pass in prototype.
• JavaScriptCore.exp:
• VM/CTI.cpp: (JSC::CTI::privateCompileMainPass): Pass along prototype.
• VM/CodeBlock.cpp: (JSC::CodeBlock::dump): Print third arg.
• VM/CodeGenerator.cpp: (JSC::CodeGenerator::emitInstanceOf): Implement this, now that there is a third argument.
• VM/CodeGenerator.h:
• VM/Machine.cpp: (JSC::Machine::privateExecute): Pass along the prototype. (JSC::Machine::cti_op_instanceof): ditto
• kjs/JSObject.cpp: (JSC::JSObject::hasInstance): Expect to get a pre-looked-up prototype.
• kjs/JSObject.h:
• kjs/nodes.cpp: (JSC::InstanceOfNode::emitCode): Emit a get_by_id of the prototype property and pass that register to instanceof.
• kjs/nodes.h:

File:

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

trunk/JavaScriptCore/VM/CodeBlock.h

@@ -77 +77 @@
     };
 
+    struct StructureStubInfo {
+        StructureStubInfo(unsigned opcodeIndex)
+            : opcodeIndex(opcodeIndex)
+            , stubRoutine(0)
+            , callReturnLocation(0)
+            , hotPathBegin(0)
+        {
+        }
+    
+        unsigned opcodeIndex;
+        void* stubRoutine;
+        void* callReturnLocation;
+        void* hotPathBegin;
+    };
+
     struct StringJumpTable {
         typedef HashMap<RefPtr<UString::Rep>, OffsetLocation> StringOffsetTable;
@@ -200 +215 @@
         void derefStructureIDs(Instruction* vPC) const;
 
+        StructureStubInfo& getStubInfo(void* returnAddress)
+        {
+            // FIXME: would a binary chop be faster here?
+            for (unsigned i = 0; i < structureIDInstructions.size(); ++i) {
+                if (structureIDInstructions[i].callReturnLocation == returnAddress)
+                    return structureIDInstructions[i];
+            }
+            
+            ASSERT_NOT_REACHED();
+            // keep the compiler happy.
+            static StructureStubInfo duff(0);
+            return duff;
+        }
+
         ScopeNode* ownerNode;
         JSGlobalData* globalData;
@@ -219 +248 @@
 
         Vector<Instruction> instructions;
-        Vector<size_t> structureIDInstructions;
-        Vector<void*> structureIDAccessStubs;
+        Vector<StructureStubInfo> structureIDInstructions;
 
         // Constant pool