Changeset 39020 in webkit for trunk/JavaScriptCore/assembler/X86Assembler.h

Timestamp:

Dec 4, 2008, 10:58:40 PM (16 years ago)

Author:

[email protected]

Message:

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

Reviewed by Geoff Garen.

Start porting the JIT to use the MacroAssembler.

​https://bugs.webkit.org/show_bug.cgi?id=22671
No change in performance.

• assembler/MacroAssembler.h: (JSC::MacroAssembler::Jump::operator X86Assembler::JmpSrc): (JSC::MacroAssembler::add32): (JSC::MacroAssembler::and32): (JSC::MacroAssembler::lshift32): (JSC::MacroAssembler::rshift32): (JSC::MacroAssembler::storePtr): (JSC::MacroAssembler::store32): (JSC::MacroAssembler::poke): (JSC::MacroAssembler::move): (JSC::MacroAssembler::compareImm32ForBranchEquality): (JSC::MacroAssembler::jnePtr): (JSC::MacroAssembler::jnset32): (JSC::MacroAssembler::jset32): (JSC::MacroAssembler::jzeroSub32): (JSC::MacroAssembler::joverAdd32): (JSC::MacroAssembler::call):
• assembler/X86Assembler.h: (JSC::X86Assembler::shll_i8r):
• jit/JIT.cpp: (JSC::JIT::privateCompileMainPass): (JSC::JIT::privateCompile): (JSC::JIT::privateCompileCTIMachineTrampolines):
• jit/JIT.h:
• jit/JITArithmetic.cpp: (JSC::JIT::compileBinaryArithOp):
• jit/JITInlineMethods.h: (JSC::JIT::emitGetVirtualRegister): (JSC::JIT::emitPutCTIArg): (JSC::JIT::emitPutCTIArgConstant): (JSC::JIT::emitGetCTIArg): (JSC::JIT::emitPutCTIArgFromVirtualRegister): (JSC::JIT::emitPutCTIParam): (JSC::JIT::emitGetCTIParam): (JSC::JIT::emitPutToCallFrameHeader): (JSC::JIT::emitPutImmediateToCallFrameHeader): (JSC::JIT::emitGetFromCallFrameHeader): (JSC::JIT::emitPutVirtualRegister): (JSC::JIT::emitInitRegister): (JSC::JIT::emitNakedCall): (JSC::JIT::restoreArgumentReference): (JSC::JIT::restoreArgumentReferenceForTrampoline): (JSC::JIT::emitCTICall): (JSC::JIT::checkStructure): (JSC::JIT::emitJumpSlowCaseIfNotJSCell): (JSC::JIT::emitJumpSlowCaseIfNotImmNum): (JSC::JIT::emitJumpSlowCaseIfNotImmNums): (JSC::JIT::emitFastArithDeTagImmediate): (JSC::JIT::emitFastArithDeTagImmediateJumpIfZero): (JSC::JIT::emitFastArithReTagImmediate): (JSC::JIT::emitFastArithPotentiallyReTagImmediate): (JSC::JIT::emitFastArithImmToInt): (JSC::JIT::emitFastArithIntToImmOrSlowCase): (JSC::JIT::emitFastArithIntToImmNoCheck): (JSC::JIT::emitTagAsBoolImmediate):
• jit/JITPropertyAccess.cpp: (JSC::JIT::privateCompilePutByIdTransition):

File:

• trunk/JavaScriptCore/assembler/X86Assembler.h (modified) (8 diffs)

trunk/JavaScriptCore/assembler/X86Assembler.h

@@ -115 +115 @@
         PRE_SSE_F2                      = 0xF2,
         OP_HLT                          = 0xF4,
+        OP_GROUP3_EbIb                  = 0xF6,
         OP_GROUP3_Ev                    = 0xF7,
         OP_GROUP3_EvIz                  = 0xF7, // OP_GROUP3_Ev has an immediate, when instruction is a test. 
@@ -391 +392 @@
 #endif
 
+    void cmpl_i8m(int imm, RegisterID dst)
+    {
+        m_buffer.putByte(OP_GROUP1_EvIb);
+        modRm_opm(GROUP1_OP_CMP, dst);
+        m_buffer.putByte(imm);
+    }
+
+    void cmpl_i8m(int imm, int offset, RegisterID dst)
+    {
+        m_buffer.putByte(OP_GROUP1_EvIb);
+        modRm_opm(GROUP1_OP_CMP, dst, offset);
+        m_buffer.putByte(imm);
+    }
+
     void cmpl_i8m(int imm, int offset, RegisterID base, RegisterID index, int scale)
     {
@@ -495 +510 @@
         m_buffer.putByte(OP_SUB_GvEv);
         modRm_rm(dst, base, offset);
+    }
+
+    void testb_i8r(int imm, RegisterID dst)
+    {
+        m_buffer.ensureSpace(maxInstructionSize);
+        m_buffer.putByteUnchecked(OP_GROUP3_EbIb);
+        modRm_opr_Unchecked(GROUP3_OP_TEST, dst);
+        m_buffer.putByteUnchecked(imm);
     }
 
@@ -556 +579 @@
     }
 
-    void shl_i8r(int imm, RegisterID dst)
+    void shll_i8r(int imm, RegisterID dst)
     {
         if (imm == 1) {
@@ -720 +743 @@
     }
 
+    void movl_i32m(int imm, RegisterID base)
+    {
+        m_buffer.ensureSpace(maxInstructionSize);
+        m_buffer.putByteUnchecked(OP_GROUP11_EvIz);
+        modRm_opm_Unchecked(GROUP11_MOV, base);
+        m_buffer.putIntUnchecked(imm);
+    }
+
     void movl_i32m(int imm, int offset, RegisterID base)
     {
@@ -1090 +1121 @@
     }
 
-#if USE(CTI_ARGUMENT)
-    void restoreArgumentReference()
-    {
-#if USE(FAST_CALL_CTI_ARGUMENT)
-        movl_rr(X86::esp, X86::ecx);
-#else
-        movl_rm(X86::esp, 0, X86::esp);
-#endif
-    }
-
-    void restoreArgumentReferenceForTrampoline()
-    {
-#if USE(FAST_CALL_CTI_ARGUMENT)
-        movl_rr(X86::esp, X86::ecx);
-        addl_i32r(4, X86::ecx);
-#endif
-    }
-#else
-    void restoreArgumentReference() {}
-    void restoreArgumentReferenceForTrampoline() {}
-#endif
-
 private:
     void modRm_rr(RegisterID reg, RegisterID rm)
@@ -1131 +1140 @@
     }
 #endif
+
+    void modRm_rm_Unchecked(RegisterID reg, RegisterID base)
+    {
+        if (base == X86::esp) {
+            m_buffer.putByteUnchecked(MODRM(0, reg, X86::hasSib));
+            m_buffer.putByteUnchecked(SIB(0, X86::noScale, X86::esp));
+        } else {
+            m_buffer.putByteUnchecked(MODRM(0, reg, base));
+        }
+    }
 
     void modRm_rm(RegisterID reg, RegisterID base)
@@ -1213 +1232 @@
     }
 
+    void modRm_opm_Unchecked(OpcodeID opcodeID, RegisterID base)
+    {
+        modRm_rm_Unchecked(static_cast<RegisterID>(opcodeID), base);
+    }
+
     void modRm_opm_Unchecked(OpcodeID opcodeID, RegisterID base, int offset)
     {