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

Timestamp:

Sep 22, 2008, 6:59:06 AM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

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

Reviewed by Dave Hyatt.

Based on initial work by Darin Adler.

• replace masqueradesAsUndefined virtual method with a flag in TypeInfo
• use this to JIT inline code for eq_null and neq_null ​https://bugs.webkit.org/show_bug.cgi?id=20823

0.5% speedup on SunSpider
~4% speedup on Richards benchmark

• VM/CTI.cpp: (JSC::CTI::privateCompileMainPass):
• VM/Machine.cpp: (JSC::jsTypeStringForValue): (JSC::jsIsObjectType): (JSC::Machine::privateExecute): (JSC::Machine::cti_op_is_undefined):
• VM/Machine.h:
• kjs/JSCell.h:
• kjs/JSValue.h:
• kjs/StringObjectThatMasqueradesAsUndefined.h: (JSC::StringObjectThatMasqueradesAsUndefined::create): (JSC::StringObjectThatMasqueradesAsUndefined::createStructureID):
• kjs/StructureID.h: (JSC::StructureID::mutableTypeInfo):
• kjs/TypeInfo.h: (JSC::TypeInfo::TypeInfo): (JSC::TypeInfo::masqueradesAsUndefined):
• kjs/operations.cpp: (JSC::equal):
• masm/X86Assembler.h: (JSC::X86Assembler::): (JSC::X86Assembler::setne_r): (JSC::X86Assembler::setnz_r): (JSC::X86Assembler::testl_i32m):

WebCore:

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

Reviewed by Dave Hyatt.

Based on initial work by Darin Adler.

• replace masqueradesAsUndefined virtual method with a flag in TypeInfo
• use this to JIT inline code for eq_null and neq_null ​https://bugs.webkit.org/show_bug.cgi?id=20823

• WebCore.xcodeproj/project.pbxproj:
• WebCore.vcproj/WebCore.vcproj:
• bindings/js/JSCSSStyleDeclarationCustom.cpp: (WebCore::JSCSSStyleDeclaration::nameGetter):
• bindings/js/JSHTMLAllCollection.cpp: Added. (WebCore::):
• bindings/js/JSHTMLAllCollection.h: (WebCore::JSHTMLAllCollection::createStructureID): (WebCore::JSHTMLAllCollection::toBoolean):

File:

• trunk/JavaScriptCore/VM/CTI.cpp (modified) (1 diff)

trunk/JavaScriptCore/VM/CTI.cpp

@@ -1591 +1591 @@
         }
         case op_eq_null: {
-            emitGetPutArg(instruction[i + 2].u.operand, 0, X86::ecx);
-            emitCall(i, Machine::cti_op_eq_null);
-            emitPutResult(instruction[i + 1].u.operand);
+            unsigned dst = instruction[i + 1].u.operand;
+            unsigned src1 = instruction[i + 2].u.operand;
+
+            emitGetArg(src1, X86::eax);
+            m_jit.testl_i32r(JSImmediate::TagMask, X86::eax);
+            X86Assembler::JmpSrc isImmediate = m_jit.emitUnlinkedJnz();
+
+            m_jit.movl_mr(OBJECT_OFFSET(JSCell, m_structureID), X86::eax, X86::ecx);
+            m_jit.testl_i32m(MasqueradesAsUndefined, OBJECT_OFFSET(StructureID, m_typeInfo.m_flags), X86::ecx);
+            m_jit.setnz_r(X86::eax);
+
+            X86Assembler::JmpSrc wasNotImmediate = m_jit.emitUnlinkedJmp();
+
+            m_jit.link(isImmediate, m_jit.label());
+
+            m_jit.movl_i32r(~JSImmediate::ExtendedTagBitUndefined, X86::ecx);
+            m_jit.andl_rr(X86::eax, X86::ecx);
+            m_jit.cmpl_i32r(JSImmediate::FullTagTypeNull, X86::ecx);
+            m_jit.sete_r(X86::eax);
+
+            m_jit.link(wasNotImmediate, m_jit.label());
+
+            m_jit.movzbl_rr(X86::eax, X86::eax);
+            emitTagAsBoolImmediate(X86::eax);
+            emitPutResult(dst);
+
             i += 3;
             break;
         }
         case op_neq_null: {
-            emitGetPutArg(instruction[i + 2].u.operand, 0, X86::ecx);
-            emitCall(i, Machine::cti_op_neq_null);
-            emitPutResult(instruction[i + 1].u.operand);
+            unsigned dst = instruction[i + 1].u.operand;
+            unsigned src1 = instruction[i + 2].u.operand;
+
+            emitGetArg(src1, X86::eax);
+            m_jit.testl_i32r(JSImmediate::TagMask, X86::eax);
+            X86Assembler::JmpSrc isImmediate = m_jit.emitUnlinkedJnz();
+
+            m_jit.movl_mr(OBJECT_OFFSET(JSCell, m_structureID), X86::eax, X86::ecx);
+            m_jit.testl_i32m(MasqueradesAsUndefined, OBJECT_OFFSET(StructureID, m_typeInfo.m_flags), X86::ecx);
+            m_jit.setz_r(X86::eax);
+
+            X86Assembler::JmpSrc wasNotImmediate = m_jit.emitUnlinkedJmp();
+
+            m_jit.link(isImmediate, m_jit.label());
+
+            m_jit.movl_i32r(~JSImmediate::ExtendedTagBitUndefined, X86::ecx);
+            m_jit.andl_rr(X86::eax, X86::ecx);
+            m_jit.cmpl_i32r(JSImmediate::FullTagTypeNull, X86::ecx);
+            m_jit.setne_r(X86::eax);
+
+            m_jit.link(wasNotImmediate, m_jit.label());
+
+            m_jit.movzbl_rr(X86::eax, X86::eax);
+            emitTagAsBoolImmediate(X86::eax);
+            emitPutResult(dst);
+
             i += 3;
             break;