Changeset 39284 in webkit for trunk/JavaScriptCore/bytecode/CodeBlock.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/bytecode/CodeBlock.h (modified) (3 diffs)

trunk/JavaScriptCore/bytecode/CodeBlock.h

@@ -63 +63 @@
     };
 
+    // The code, and the associated pool from which it was allocated.
+    struct JITCodeRef {
+        void* code;
+        RefPtr<ExecutablePool> executablePool;
+        
+        JITCodeRef()
+            : code(0)
+        {
+        }
+        
+        JITCodeRef(void* code, PassRefPtr<ExecutablePool> executablePool)
+            : code(code)
+            , executablePool(executablePool)
+        {
+        }
+    };
+
     struct ExpressionRangeInfo {
         enum {
@@ -277 +294 @@
 
 #if ENABLE(JIT)
-        void setJITCode(void* jitCode) { m_jitCode = jitCode; }
-        void* jitCode() { return m_jitCode; }
-        ExecutablePool* executablePool() { return m_executablePool.get(); }
-        void setExecutablePool(ExecutablePool* pool) { m_executablePool = pool; }
+        void setJITCode(JITCodeRef& jitCode) { m_jitCode = jitCode; }
+        void* jitCode() { return m_jitCode.code; }
+        ExecutablePool* executablePool() { return m_jitCode.executablePool.get(); }
 #endif
 
@@ -408 +424 @@
         Vector<Instruction> m_instructions;
 #if ENABLE(JIT)
-        void* m_jitCode;
-        RefPtr<ExecutablePool> m_executablePool;
+        JITCodeRef m_jitCode;
 #endif