Changeset 40004 in webkit for trunk/JavaScriptCore/jit/JIT.cpp

Timestamp:

Jan 16, 2009, 8:57:56 PM (16 years ago)

Author:

[email protected]

Message:

2009-01-16 Gavin Barraclough <​[email protected]>

Reviewed by Oliver Hunt.

On x86-64 jit, cache JSImmedate::TagMask & JSImmedate::TagTypeNumber in
registers, save reloading them every time they're used.

Draws x86-64 jit performance close to that of i386 jit.

• assembler/MacroAssembler.h: (JSC::MacroAssembler::subPtr): (JSC::MacroAssembler::jnzPtr): (JSC::MacroAssembler::jzPtr):
• jit/JIT.cpp: (JSC::JIT::privateCompileMainPass):
• jit/JIT.h:
• jit/JITArithmetic.cpp: (JSC::JIT::compileBinaryArithOpSlowCase):
• jit/JITInlineMethods.h: (JSC::JIT::emitJumpIfJSCell): (JSC::JIT::emitJumpIfNotJSCell): (JSC::JIT::emitJumpIfImmediateNumber): (JSC::JIT::emitJumpIfNotImmediateNumber): (JSC::JIT::emitJumpIfImmediateInteger): (JSC::JIT::emitJumpIfNotImmediateInteger): (JSC::JIT::emitFastArithIntToImmNoCheck):

File:

• trunk/JavaScriptCore/jit/JIT.cpp (modified) (5 diffs)

trunk/JavaScriptCore/jit/JIT.cpp

@@ -45 +45 @@
 namespace JSC {
 
-COMPILE_ASSERT(STUB_ARGS_code == 0xC, STUB_ARGS_code_is_C);
-COMPILE_ASSERT(STUB_ARGS_callFrame == 0xE, STUB_ARGS_callFrame_is_E);
-
 #if COMPILER(GCC) && PLATFORM(X86)
+
+COMPILE_ASSERT(STUB_ARGS_code == 0x0C, STUB_ARGS_code_is_0x0C);
+COMPILE_ASSERT(STUB_ARGS_callFrame == 0x0E, STUB_ARGS_callFrame_is_0x0E);
 
 #if PLATFORM(DARWIN)
@@ -99 +99 @@
 #elif COMPILER(GCC) && PLATFORM(X86_64)
 
+COMPILE_ASSERT(STUB_ARGS_code == 0x10, STUB_ARGS_code_is_0x10);
+COMPILE_ASSERT(STUB_ARGS_callFrame == 0x12, STUB_ARGS_callFrame_is_0x12);
+
 #if PLATFORM(DARWIN)
 #define SYMBOL_STRING(name) "_" #name
@@ -112 +115 @@
     "pushq %r12" "\n"
     "pushq %r13" "\n"
+    "pushq %r14" "\n"
+    "pushq %r15" "\n"
     "pushq %rbx" "\n"
-    "subq $0x38, %rsp" "\n"
+    "subq $0x48, %rsp" "\n"
     "movq $512, %r12" "\n"
-    "movq 0x70(%rsp), %r13" "\n" // Ox70 = 0x0E * 8, 0x0E = STUB_ARGS_callFrame (see assertion above)
-    "call *0x60(%rsp)" "\n" // Ox60 = 0x0C * 8, 0x0C = STUB_ARGS_code (see assertion above)
-    "addq $0x38, %rsp" "\n"
+    "movq $0xFFFF000000000000, %r14" "\n"
+    "movq $0xFFFF000000000002, %r15" "\n"
+    "movq 0x90(%rsp), %r13" "\n" // Ox90 = 0x12 * 8, 0x12 = STUB_ARGS_callFrame (see assertion above)
+    "call *0x80(%rsp)" "\n" // Ox80 = 0x10 * 8, 0x10 = STUB_ARGS_code (see assertion above)
+    "addq $0x48, %rsp" "\n"
     "popq %rbx" "\n"
+    "popq %r15" "\n"
+    "popq %r14" "\n"
     "popq %r13" "\n"
     "popq %r12" "\n"
@@ -134 +143 @@
 #error "JIT_STUB_ARGUMENT configuration not supported."
 #endif
-    "addq $0x38, %rsp" "\n"
+    "addq $0x48, %rsp" "\n"
     "popq %rbx" "\n"
+    "popq %r15" "\n"
+    "popq %r14" "\n"
     "popq %r13" "\n"
     "popq %r12" "\n"
@@ -935 +946 @@
             emitCTICall(Interpreter::cti_op_throw);
 #if PLATFORM(X86_64)
-            addPtr(Imm32(0x38), X86::esp);
+            addPtr(Imm32(0x48), X86::esp);
             pop(X86::ebx);
+            pop(X86::r15);
+            pop(X86::r14);
             pop(X86::r13);
             pop(X86::r12);