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

Timestamp:

Dec 8, 2008, 6:10:41 PM (16 years ago)

Author:

[email protected]

Message:

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

Reviewed by Geoff Garen.

Expand MacroAssembler to support more operations, required by the JIT.

Generally adds more operations and permutations of operands to the existing
interface. Rename 'jset' to 'jnz' and 'jnset' to 'jz', which seem clearer,
and require that immediate pointer operands (though not pointer addresses to
load and store instructions) are wrapped in a ImmPtr() type, akin to Imm32().

No performance impact.

• assembler/MacroAssembler.h: (JSC::MacroAssembler::): (JSC::MacroAssembler::ImmPtr::ImmPtr): (JSC::MacroAssembler::add32): (JSC::MacroAssembler::and32): (JSC::MacroAssembler::or32): (JSC::MacroAssembler::sub32): (JSC::MacroAssembler::xor32): (JSC::MacroAssembler::loadPtr): (JSC::MacroAssembler::load32): (JSC::MacroAssembler::storePtr): (JSC::MacroAssembler::store32): (JSC::MacroAssembler::poke): (JSC::MacroAssembler::move): (JSC::MacroAssembler::testImm32): (JSC::MacroAssembler::jae32): (JSC::MacroAssembler::jb32): (JSC::MacroAssembler::jePtr): (JSC::MacroAssembler::je32): (JSC::MacroAssembler::jnePtr): (JSC::MacroAssembler::jne32): (JSC::MacroAssembler::jnzPtr): (JSC::MacroAssembler::jnz32): (JSC::MacroAssembler::jzPtr): (JSC::MacroAssembler::jz32): (JSC::MacroAssembler::joSub32): (JSC::MacroAssembler::jump): (JSC::MacroAssembler::sete32): (JSC::MacroAssembler::setne32): (JSC::MacroAssembler::setnz32): (JSC::MacroAssembler::setz32):
• assembler/X86Assembler.h: (JSC::X86Assembler::addl_mr): (JSC::X86Assembler::andl_i8r): (JSC::X86Assembler::cmpl_rm): (JSC::X86Assembler::cmpl_mr): (JSC::X86Assembler::cmpl_i8m): (JSC::X86Assembler::subl_mr): (JSC::X86Assembler::testl_i32m): (JSC::X86Assembler::xorl_i32r): (JSC::X86Assembler::movl_rm): (JSC::X86Assembler::modRm_opmsib):
• jit/JIT.cpp: (JSC::JIT::privateCompileMainPass):
• jit/JITInlineMethods.h: (JSC::JIT::emitGetVirtualRegister): (JSC::JIT::emitPutCTIArgConstant): (JSC::JIT::emitPutCTIParam): (JSC::JIT::emitPutImmediateToCallFrameHeader): (JSC::JIT::emitInitRegister): (JSC::JIT::checkStructure): (JSC::JIT::emitJumpIfJSCell): (JSC::JIT::emitJumpIfNotJSCell): (JSC::JIT::emitJumpSlowCaseIfNotImmNum):

File:

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

trunk/JavaScriptCore/assembler/X86Assembler.h

@@ -320 +320 @@
 #endif
 
+    void addl_mr(RegisterID base, RegisterID dst)
+    {
+        m_buffer.putByte(OP_ADD_GvEv);
+        modRm_rm(dst, base);
+    }
+
     void addl_mr(int offset, RegisterID base, RegisterID dst)
     {
@@ -330 +336 @@
         m_buffer.putByte(OP_AND_EvGv);
         modRm_rr(src, dst);
+    }
+
+    void andl_i8r(int imm, RegisterID dst)
+    {
+        m_buffer.putByte(OP_GROUP1_EvIb);
+        modRm_opr(GROUP1_OP_AND, dst);
+        m_buffer.putByte(imm);
     }
 
@@ -352 +365 @@
     }
 
+    void cmpl_rm(RegisterID src, RegisterID base)
+    {
+        m_buffer.putByte(OP_CMP_EvGv);
+        modRm_rm(src, base);
+    }
+
     void cmpl_rm(RegisterID src, int offset, RegisterID base)
     {
         m_buffer.putByte(OP_CMP_EvGv);
         modRm_rm(src, base, offset);
+    }
+
+    void cmpl_mr(RegisterID base, RegisterID dst)
+    {
+        m_buffer.putByte(OP_CMP_GvEv);
+        modRm_rm(dst, base);
     }
 
@@ -408 +433 @@
     }
 
+    void cmpl_i8m(int imm, RegisterID base, RegisterID index, int scale)
+    {
+        m_buffer.putByte(OP_GROUP1_EvIb);
+        modRm_opmsib(GROUP1_OP_CMP, base, index, scale);
+        m_buffer.putByte(imm);
+    }
+
     void cmpl_i8m(int imm, int offset, RegisterID base, RegisterID index, int scale)
     {
@@ -506 +538 @@
         modRm_opr(GROUP1_OP_SUB, dst);
         m_buffer.putInt(imm);
+    }
+
+    void subl_mr(RegisterID base, RegisterID dst)
+    {
+        m_buffer.putByte(OP_SUB_GvEv);
+        modRm_rm(dst, base);
     }
 
@@ -544 +582 @@
     }
 
+    void testl_i32m(int imm, RegisterID base, RegisterID index, int scale)
+    {
+        m_buffer.putByte(OP_GROUP3_EvIz);
+        modRm_opmsib(GROUP3_OP_TEST, base, index, scale);
+        m_buffer.putInt(imm);
+    }
+
+    void testl_i32m(int imm, int offset, RegisterID base, RegisterID index, int scale)
+    {
+        m_buffer.putByte(OP_GROUP3_EvIz);
+        modRm_opmsib(GROUP3_OP_TEST, base, index, scale, offset);
+        m_buffer.putInt(imm);
+    }
+
     void testl_rr(RegisterID src, RegisterID dst)
     {
@@ -555 +607 @@
         modRm_opr(GROUP1_OP_XOR, dst);
         m_buffer.putByte(imm);
+    }
+
+    void xorl_i32r(int imm, RegisterID dst)
+    {
+        m_buffer.putByte(OP_GROUP1_EvIz);
+        modRm_opr(GROUP1_OP_XOR, dst);
+        m_buffer.putInt(imm);
     }
 
@@ -732 +791 @@
 #endif
 
+    void movl_rm(RegisterID src, RegisterID base, RegisterID index, int scale)
+    {
+        m_buffer.putByte(OP_MOV_EvGv);
+        modRm_rmsib(src, base, index, scale);
+    }
+    
     void movl_rm(RegisterID src, int offset, RegisterID base, RegisterID index, int scale)
     {
@@ -1261 +1326 @@
     }
 
+    void modRm_opmsib(OpcodeID opcodeID, RegisterID base, RegisterID index, int scale)
+    {
+        modRm_rmsib(static_cast<RegisterID>(opcodeID), base, index, scale);
+    }
+
     AssemblerBuffer m_buffer;
 };