Changeset 39043 in webkit for trunk/JavaScriptCore/assembler/MacroAssembler.h

Timestamp:

Dec 5, 2008, 2:14:11 PM (16 years ago)

Author:

[email protected]

Message:

2008-12-05 Gavin Barraclough <​[email protected]>

Reviewed by Geoff Garen.

Remove m_assembler from MacroAssembler::Jump.
Keeping a pointer allowed for some syntactic sugar - "link()" looks nicer
than "link(this)". But maintaining this doubles the size of Jump, which
is even more unfortunate for the JIT, since there are many large structures
holding JmpSrcs. Probably best to remove it.

​https://bugs.webkit.org/show_bug.cgi?id=22693

• assembler/MacroAssembler.h: (JSC::MacroAssembler::Jump::Jump): (JSC::MacroAssembler::Jump::link): (JSC::MacroAssembler::Jump::linkTo): (JSC::MacroAssembler::JumpList::link): (JSC::MacroAssembler::JumpList::linkTo): (JSC::MacroAssembler::jae32): (JSC::MacroAssembler::je32): (JSC::MacroAssembler::je16): (JSC::MacroAssembler::jg32): (JSC::MacroAssembler::jge32): (JSC::MacroAssembler::jl32): (JSC::MacroAssembler::jle32): (JSC::MacroAssembler::jnePtr): (JSC::MacroAssembler::jne32): (JSC::MacroAssembler::jnset32): (JSC::MacroAssembler::jset32): (JSC::MacroAssembler::jump): (JSC::MacroAssembler::jzSub32): (JSC::MacroAssembler::joAdd32): (JSC::MacroAssembler::call):
• wrec/WREC.cpp: (JSC::WREC::Generator::compileRegExp):
• wrec/WRECGenerator.cpp: (JSC::WREC::Generator::generateEnter): (JSC::WREC::Generator::generateBackreferenceQuantifier): (JSC::WREC::Generator::generateNonGreedyQuantifier): (JSC::WREC::Generator::generateGreedyQuantifier): (JSC::WREC::Generator::generatePatternCharacter): (JSC::WREC::Generator::generateCharacterClassInvertedRange): (JSC::WREC::Generator::generateCharacterClassInverted): (JSC::WREC::Generator::generateCharacterClass): (JSC::WREC::Generator::generateParenthesesAssertion): (JSC::WREC::Generator::generateParenthesesInvertedAssertion): (JSC::WREC::Generator::generateParenthesesNonGreedy): (JSC::WREC::Generator::generateParenthesesResetTrampoline): (JSC::WREC::Generator::generateAssertionBOL): (JSC::WREC::Generator::generateAssertionEOL): (JSC::WREC::Generator::generateAssertionWordBoundary): (JSC::WREC::Generator::generateBackreference): (JSC::WREC::Generator::terminateAlternative): (JSC::WREC::Generator::terminateDisjunction):
• wrec/WRECParser.h:

File:

• trunk/JavaScriptCore/assembler/MacroAssembler.h (modified) (23 diffs)

trunk/JavaScriptCore/assembler/MacroAssembler.h

@@ -168 +168 @@
     public:
         Jump()
-            : m_assembler(0)
-        {
-        }
-
-        Jump(X86Assembler& assembler, X86Assembler::JmpSrc jmp)
-            : m_assembler(&assembler)
-            , m_jmp(jmp)
         {
         }
         
-        void link()
-        {
-            ASSERT(m_assembler);
-            m_assembler->link(m_jmp, m_assembler->label());
+        Jump(X86Assembler::JmpSrc jmp)
+            : m_jmp(jmp)
+        {
         }
         
-        void linkTo(Label label)
-        {
-            ASSERT(m_assembler);
-            m_assembler->link(m_jmp, label.m_label);
+        void link(MacroAssembler* masm)
+        {
+            masm->m_assembler.link(m_jmp, masm->m_assembler.label());
+        }
+        
+        void linkTo(Label label, MacroAssembler* masm)
+        {
+            masm->m_assembler.link(m_jmp, label.m_label);
         }
         
@@ -197 +193 @@
 
     private:
-        X86Assembler* m_assembler;
         X86Assembler::JmpSrc m_jmp;
     };
@@ -207 +202 @@
     class JumpList {
     public:
-        void link()
+        void link(MacroAssembler* masm)
         {
             size_t size = m_jumps.size();
             for (size_t i = 0; i < size; ++i)
-                m_jumps[i].link();
+                m_jumps[i].link(masm);
             m_jumps.clear();
         }
         
-        void linkTo(Label label)
+        void linkTo(Label label, MacroAssembler* masm)
         {
             size_t size = m_jumps.size();
             for (size_t i = 0; i < size; ++i)
-                m_jumps[i].linkTo(label);
+                m_jumps[i].linkTo(label, masm);
             m_jumps.clear();
         }
@@ -564 +559 @@
     {
         compareImm32ForBranch(left, right.m_value);
-        return Jump(m_assembler, m_assembler.jae());
+        return Jump(m_assembler.jae());
     }
     
@@ -570 +565 @@
     {
         m_assembler.cmpl_rr(op1, op2);
-        return Jump(m_assembler, m_assembler.je());
+        return Jump(m_assembler.je());
     }
     
@@ -576 +571 @@
     {
         m_assembler.cmpl_rm(op1, op2.offset, op2.base);
-        return Jump(m_assembler, m_assembler.je());
+        return Jump(m_assembler.je());
     }
     
@@ -582 +577 @@
     {
         compareImm32ForBranchEquality(reg, imm.m_value);
-        return Jump(m_assembler, m_assembler.je());
+        return Jump(m_assembler.je());
     }
     
@@ -592 +587 @@
             m_assembler.cmpw_rm(op1, op2.offset, op2.base, op2.index, op2.scale);
 
-        return Jump(m_assembler, m_assembler.je());
+        return Jump(m_assembler.je());
     }
     
@@ -598 +593 @@
     {
         m_assembler.cmpl_rr(right, left);
-        return Jump(m_assembler, m_assembler.jg());
+        return Jump(m_assembler.jg());
     }
     
@@ -604 +599 @@
     {
         m_assembler.cmpl_rr(right, left);
-        return Jump(m_assembler, m_assembler.jge());
+        return Jump(m_assembler.jge());
     }
 
@@ -610 +605 @@
     {
         compareImm32ForBranch(left, right.m_value);
-        return Jump(m_assembler, m_assembler.jge());
+        return Jump(m_assembler.jge());
     }
     
@@ -616 +611 @@
     {
         compareImm32ForBranch(left, right.m_value);
-        return Jump(m_assembler, m_assembler.jl());
+        return Jump(m_assembler.jl());
     }
 
@@ -622 +617 @@
     {
         m_assembler.cmpl_rr(right, left);
-        return Jump(m_assembler, m_assembler.jle());
+        return Jump(m_assembler.jle());
     }
     
@@ -628 +623 @@
     {
         compareImm32ForBranch(left, right.m_value);
-        return Jump(m_assembler, m_assembler.jle());
+        return Jump(m_assembler.jle());
     }
 
@@ -635 +630 @@
     {
         compareImm32ForBranchEquality(address, reinterpret_cast<uint32_t>(ptr));
-        return Jump(m_assembler, m_assembler.jne());
+        return Jump(m_assembler.jne());
     }
 #endif
@@ -642 +637 @@
     {
         m_assembler.cmpl_rr(op1, op2);
-        return Jump(m_assembler, m_assembler.jne());
+        return Jump(m_assembler.jne());
     }
 
@@ -648 +643 @@
     {
         compareImm32ForBranchEquality(reg, imm.m_value);
-        return Jump(m_assembler, m_assembler.jne());
+        return Jump(m_assembler.jne());
     }
 
@@ -658 +653 @@
         else
             m_assembler.testl_i32r(imm.m_value, reg);
-        return Jump(m_assembler, m_assembler.je());
+        return Jump(m_assembler.je());
     }
 
@@ -668 +663 @@
         else
             m_assembler.testl_i32r(imm.m_value, reg);
-        return Jump(m_assembler, m_assembler.jne());
+        return Jump(m_assembler.jne());
     }
 
     Jump jump()
     {
-        return Jump(m_assembler, m_assembler.jmp());
+        return Jump(m_assembler.jmp());
     }
 
@@ -699 +694 @@
     void je32(Imm32 imm, RegisterID op2, Label target)
     {
-        je32(imm, op2).linkTo(target);
+        je32(imm, op2).linkTo(target, this);
     }
 
     void je16(RegisterID op1, BaseIndex op2, Label target)
     {
-        je16(op1, op2).linkTo(target);
+        je16(op1, op2).linkTo(target, this);
     }
     
     void jl32(RegisterID left, Imm32 right, Label target)
     {
-        jl32(left, right).linkTo(target);
+        jl32(left, right).linkTo(target, this);
     }
     
     void jle32(RegisterID left, RegisterID right, Label target)
     {
-        jle32(left, right).linkTo(target);
+        jle32(left, right).linkTo(target, this);
     }
     
     void jne32(RegisterID op1, RegisterID op2, Label target)
     {
-        jne32(op1, op2).linkTo(target);
+        jne32(op1, op2).linkTo(target, this);
     }
 
     void jne32(Imm32 imm, RegisterID op2, Label target)
     {
-        jne32(imm, op2).linkTo(target);
+        jne32(imm, op2).linkTo(target, this);
     }
 
@@ -749 +744 @@
         else
             m_assembler.subl_i32r(imm.m_value, dest);
-        return Jump(m_assembler, m_assembler.je());
+        return Jump(m_assembler.je());
     }
     
@@ -755 +750 @@
     {
         m_assembler.addl_rr(src, dest);
-        return Jump(m_assembler, m_assembler.jo());
+        return Jump(m_assembler.jo());
     }
     
@@ -768 +763 @@
     Jump call()
     {
-        return Jump(m_assembler, m_assembler.call());
+        return Jump(m_assembler.call());
     }
 
     Jump call(RegisterID target)
     {
-        return Jump(m_assembler, m_assembler.call(target));
+        return Jump(m_assembler.call(target));
     }