Changeset 36755 in webkit for trunk/JavaScriptCore/VM/CTI.cpp

Timestamp:

Sep 21, 2008, 8:15:52 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

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

Reviewed by Darin.

• introduce a TypeInfo class, for holding per-type (in the C++ class sense) date in StructureID ​https://bugs.webkit.org/show_bug.cgi?id=20981

• JavaScriptCore.exp:
• JavaScriptCore.xcodeproj/project.pbxproj:
• VM/CTI.cpp: (JSC::CTI::privateCompileMainPass): (JSC::CTI::privateCompilePutByIdTransition):
• VM/Machine.cpp: (JSC::jsIsObjectType): (JSC::Machine::Machine):
• kjs/AllInOneFile.cpp:
• kjs/JSCell.h: (JSC::JSCell::isObject): (JSC::JSCell::isString):
• kjs/JSGlobalData.cpp: (JSC::JSGlobalData::JSGlobalData):
• kjs/JSGlobalObject.cpp: (JSC::JSGlobalObject::reset):
• kjs/JSGlobalObject.h: (JSC::StructureID::prototypeForLookup):
• kjs/JSNumberCell.h: (JSC::JSNumberCell::createStructureID):
• kjs/JSObject.cpp: (JSC::JSObject::createInheritorID):
• kjs/JSObject.h: (JSC::JSObject::createStructureID):
• kjs/JSString.h: (JSC::JSString::createStructureID):
• kjs/NativeErrorConstructor.cpp: (JSC::NativeErrorConstructor::NativeErrorConstructor):
• kjs/RegExpConstructor.cpp:
• kjs/RegExpMatchesArray.h: Added. (JSC::RegExpMatchesArray::getOwnPropertySlot): (JSC::RegExpMatchesArray::put): (JSC::RegExpMatchesArray::deleteProperty): (JSC::RegExpMatchesArray::getPropertyNames):
• kjs/StructureID.cpp: (JSC::StructureID::StructureID): (JSC::StructureID::addPropertyTransition): (JSC::StructureID::toDictionaryTransition): (JSC::StructureID::changePrototypeTransition): (JSC::StructureID::getterSetterTransition):
• kjs/StructureID.h: (JSC::StructureID::create): (JSC::StructureID::typeInfo):
• kjs/TypeInfo.h: Added. (JSC::TypeInfo::TypeInfo): (JSC::TypeInfo::type):

WebCore:

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

Reviewed by Darin.

• introduce a TypeInfo class, for holding per-type (in the C++ class sense) date in StructureID ​https://bugs.webkit.org/show_bug.cgi?id=20981

• bindings/js/JSAudioConstructor.cpp: (WebCore::JSAudioConstructor::JSAudioConstructor):
• bindings/js/JSCSSStyleDeclarationCustom.cpp: (WebCore::JSCSSStyleDeclaration::nameGetter):
• bindings/js/JSDOMBinding.cpp: (WebCore::createDOMStructure):
• bindings/js/JSDOMBinding.h: (WebCore::getDOMStructure):
• bindings/js/JSDOMWindowShell.cpp: (WebCore::JSDOMWindowShell::JSDOMWindowShell): (WebCore::JSDOMWindowShell::setWindow):
• bindings/js/JSEventTargetNode.cpp: (WebCore::JSEventTargetNode::createPrototype):
• bindings/js/JSHTMLOptionElementConstructor.cpp: (WebCore::JSHTMLOptionElementConstructor::JSHTMLOptionElementConstructor):
• bindings/js/JSImageConstructor.cpp: (WebCore::JSImageConstructor::JSImageConstructor):
• bindings/js/JSXMLHttpRequestConstructor.cpp: (WebCore::JSXMLHttpRequestConstructor::JSXMLHttpRequestConstructor):
• bindings/js/JSXSLTProcessorConstructor.cpp: (WebCore::JSXSLTProcessorConstructor::JSXSLTProcessorConstructor):
• bindings/scripts/CodeGeneratorJS.pm:

File:

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

trunk/JavaScriptCore/VM/CTI.cpp

@@ -923 +923 @@
             X86Assembler::JmpSrc isImmediate = m_jit.emitUnlinkedJne();
             m_jit.movl_mr(OBJECT_OFFSET(JSCell, m_structureID), X86::eax, X86::ecx);
-            m_jit.cmpl_i32m(ObjectType, OBJECT_OFFSET(StructureID, m_type), X86::ecx);
+            m_jit.cmpl_i32m(ObjectType, OBJECT_OFFSET(StructureID, m_typeInfo) + OBJECT_OFFSET(TypeInfo, m_type), X86::ecx);
             X86Assembler::JmpSrc isObject = m_jit.emitUnlinkedJe();
 
@@ -2409 +2409 @@
     m_jit.movl_mr(OBJECT_OFFSET(JSCell, m_structureID), X86::eax, X86::ecx);
     // proto(ecx) = baseObject->structureID()->prototype()
-    m_jit.cmpl_i32m(ObjectType, OBJECT_OFFSET(StructureID, m_type), X86::ecx);
+    m_jit.cmpl_i32m(ObjectType, OBJECT_OFFSET(StructureID, m_typeInfo) + OBJECT_OFFSET(TypeInfo, m_type), X86::ecx);
     failureCases.append(m_jit.emitUnlinkedJne());
     m_jit.movl_mr(OBJECT_OFFSET(StructureID, m_prototype), X86::ecx, X86::ecx);
@@ -2424 +2424 @@
         
         m_jit.movl_mr(OBJECT_OFFSET(JSCell, m_structureID), X86::ecx, X86::ecx);
-        m_jit.cmpl_i32m(ObjectType, OBJECT_OFFSET(StructureID, m_type), X86::ecx);
+        m_jit.cmpl_i32m(ObjectType, OBJECT_OFFSET(StructureID, m_typeInfo) + OBJECT_OFFSET(TypeInfo, m_type), X86::ecx);
         failureCases.append(m_jit.emitUnlinkedJne());
         m_jit.movl_mr(OBJECT_OFFSET(StructureID, m_prototype), X86::ecx, X86::ecx);