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

Timestamp:

Dec 13, 2008, 3:58:58 PM (16 years ago)

Author:

[email protected]

Message:

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

Reviewed by Cameron Zwarich.

Port the remainder of the JIT, bar calling convention related code, and code
implementing optimizations which can be disabled, to use the MacroAssembler.

• assembler/MacroAssembler.h: (JSC::MacroAssembler::DataLabelPtr::DataLabelPtr): (JSC::MacroAssembler::RepatchBuffer::RepatchBuffer): (JSC::MacroAssembler::RepatchBuffer::link): (JSC::MacroAssembler::RepatchBuffer::addressOf): (JSC::MacroAssembler::RepatchBuffer::setPtr): (JSC::MacroAssembler::addPtr): (JSC::MacroAssembler::lshift32): (JSC::MacroAssembler::mod32): (JSC::MacroAssembler::rshift32): (JSC::MacroAssembler::storePtrWithRepatch): (JSC::MacroAssembler::jnzPtr): (JSC::MacroAssembler::jzPtr): (JSC::MacroAssembler::jump): (JSC::MacroAssembler::label):
• assembler/X86Assembler.h: (JSC::X86Assembler::): (JSC::X86Assembler::xchgl_rr): (JSC::X86Assembler::jmp_m): (JSC::X86Assembler::repatchAddress): (JSC::X86Assembler::getRelocatedAddress):
• bytecode/CodeBlock.cpp: (JSC::CodeBlock::CodeBlock):
• bytecode/CodeBlock.h: (JSC::JITCodeRef::JITCodeRef): (JSC::CodeBlock::setJITCode): (JSC::CodeBlock::jitCode): (JSC::CodeBlock::executablePool):
• jit/JIT.cpp: (JSC::JIT::privateCompileMainPass): (JSC::JIT::privateCompileLinkPass): (JSC::JIT::privateCompile): (JSC::JIT::privateCompileCTIMachineTrampolines):
• jit/JIT.h: (JSC::CallRecord::CallRecord): (JSC::JumpTable::JumpTable): (JSC::JIT::emitCTICall): (JSC::JIT::JSRInfo::JSRInfo):
• jit/JITArithmetic.cpp:
• jit/JITCall.cpp:
• jit/JITInlineMethods.h: (JSC::JIT::emitNakedCall): (JSC::JIT::emitCTICall_internal): (JSC::JIT::checkStructure): (JSC::JIT::emitFastArithDeTagImmediateJumpIfZero): (JSC::JIT::addSlowCase): (JSC::JIT::addJump): (JSC::JIT::emitJumpSlowToHot):
• jit/JITPropertyAccess.cpp: (JSC::JIT::privateCompileGetByIdChainList): (JSC::JIT::privateCompileGetByIdChain):

File:

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

trunk/JavaScriptCore/assembler/X86Assembler.h

@@ -98 +98 @@
         OP_GROUP1_EvIb                  = 0x83,
         OP_TEST_EvGv                    = 0x85,
+        OP_XCHG_EvGv                    = 0x87,
         OP_MOV_EvGv                     = 0x89,
         OP_MOV_GvEv                     = 0x8B,
@@ -658 +659 @@
     }
 
+    void xchgl_rr(RegisterID src, RegisterID dst)
+    {
+        m_buffer.putByte(OP_XCHG_EvGv);
+        modRm_rr(src, dst);
+    }
+
     void imull_rr(RegisterID src, RegisterID dst)
     {
@@ -858 +865 @@
     }
     
+    void jmp_m(RegisterID base)
+    {
+        m_buffer.putByte(OP_GROUP5_Ev);
+        modRm_opm(GROUP5_OP_JMPN, base);
+    }
+    
     void jmp_m(int offset, RegisterID base)
     {
@@ -1126 +1139 @@
     }
     
-    static void linkAbsoluteAddress(void* code, JmpDst useOffset, JmpDst address)
-    {
-        ASSERT(useOffset.m_offset != -1);
-        ASSERT(address.m_offset != -1);
+    static void repatchAddress(void* code, JmpDst position, void* value)
+    {
+        ASSERT(position.m_offset != -1);
         
-        reinterpret_cast<int*>(reinterpret_cast<ptrdiff_t>(code) + useOffset.m_offset)[-1] = reinterpret_cast<ptrdiff_t>(code) + address.m_offset;
+        reinterpret_cast<void**>(reinterpret_cast<ptrdiff_t>(code) + position.m_offset)[-1] = value;
     }
     
@@ -1146 +1158 @@
     }
     
-    static void* getRelocatedAddress(void* code, JmpDst jump)
-    {
-        return reinterpret_cast<void*>(reinterpret_cast<ptrdiff_t>(code) + jump.m_offset);
+    static void* getRelocatedAddress(void* code, JmpDst destination)
+    {
+        ASSERT(destination.m_offset != -1);
+
+        return reinterpret_cast<void*>(reinterpret_cast<ptrdiff_t>(code) + destination.m_offset);
     }