Changeset 39370 in webkit for trunk/JavaScriptCore/interpreter/Interpreter.cpp

Timestamp:

Dec 17, 2008, 7:38:10 PM (16 years ago)

Author:

[email protected]

Message:

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

Reviewed by Sam Weinig.

print("Hello, 64-bit jitted world!");
Get hello-world working through the JIT, on x86-64.

• assembler/X86Assembler.h:

Fix encoding of opcode + RegisterID format instructions for 64-bit.

• interpreter/Interpreter.cpp:
• interpreter/Interpreter.h:

Make VoidPtrPair actually be a pair of void*s.
(Possibly should make this change for 32-bit Mac platforms, too - but won't change 32-bit behaviour in this patch).

• jit/JIT.cpp:
• jit/JIT.h:

Provide names for the timeoutCheckRegister & callFrameRegister on x86-64,
force x86-64 ctiTrampoline arguments onto the stack,
implement the asm trampolines for x86-64,
implement the restoreArgumentReference methods for x86-64 calling conventions.

• jit/JITCall.cpp:
• jit/JITInlineMethods.h:
• wtf/Platform.h:

Add switch settings to ENABLE(JIT), on PLATFORM(X86_64) (currently still disabled).

File:

• trunk/JavaScriptCore/interpreter/Interpreter.cpp (modified) (10 diffs)

trunk/JavaScriptCore/interpreter/Interpreter.cpp

@@ -4211 +4211 @@
 #endif
 
+#if USE(CTI_ARGUMENT)
+#define SETUP_VL_ARGS
+#else
+#define SETUP_VL_ARGS va_list vl_args; va_start(vl_args, args)
+#endif
+
 #ifndef NDEBUG
 
@@ -4240 +4246 @@
 };
 
-#define CTI_STACK_HACK() va_list vl_args; va_start(vl_args, args); StackHack stackHack(&CTI_RETURN_ADDRESS_SLOT)
+#define CTI_STACK_HACK() SETUP_VL_ARGS; StackHack stackHack(&CTI_RETURN_ADDRESS_SLOT)
 #define CTI_SET_RETURN_ADDRESS(address) stackHack.savedReturnAddress = address
 #define CTI_RETURN_ADDRESS stackHack.savedReturnAddress
@@ -4246 +4252 @@
 #else
 
-#define CTI_STACK_HACK() va_list vl_args; va_start(vl_args, args)
+#define CTI_STACK_HACK() SETUP_VL_ARGS
 #define CTI_SET_RETURN_ADDRESS(address) ctiSetReturnAddress(&CTI_RETURN_ADDRESS_SLOT, address);
 #define CTI_RETURN_ADDRESS CTI_RETURN_ADDRESS_SLOT
@@ -4277 +4283 @@
     do { \
         VM_THROW_EXCEPTION_AT_END(); \
-        VoidPtrPairValue pair = {{ 0, 0 }}; \
-        return pair.i; \
+        RETURN_PAIR(0, 0); \
     } while (0)
 #define VM_THROW_EXCEPTION_AT_END() \
@@ -4849 +4854 @@
             ARG_setCallFrame(oldCallFrame);
             throwStackOverflowError(oldCallFrame, ARG_globalData, ARG_returnAddress2, CTI_RETURN_ADDRESS);
-            VoidPtrPairValue pair = {{ 0, 0 }};
-            return pair.i;
+            RETURN_PAIR(0, 0);
         }
 
@@ -4861 +4865 @@
     }
 
-    VoidPtrPairValue pair = {{ newCodeBlock, callFrame }};
-    return pair.i;
+    RETURN_PAIR(newCodeBlock, callFrame);
 }
 
@@ -5161 +5164 @@
             CHECK_FOR_EXCEPTION_AT_END();
 
-            VoidPtrPairValue pair = {{ thisObj, asPointer(result) }};
-            return pair.i;
+            RETURN_PAIR(thisObj, asPointer(result));
         }
         ++iter;
@@ -5442 +5444 @@
     CHECK_FOR_EXCEPTION_AT_END();
 
-    VoidPtrPairValue pair = {{ asPointer(number), asPointer(jsNumber(ARG_globalData, number->uncheckedGetNumber() + 1)) }};
-    return pair.i;
+    RETURN_PAIR(asPointer(number), asPointer(jsNumber(ARG_globalData, number->uncheckedGetNumber() + 1)));
 }
 
@@ -5558 +5559 @@
             CHECK_FOR_EXCEPTION_AT_END();
 
-            VoidPtrPairValue pair = {{ base, asPointer(result) }};
-            return pair.i;
+            RETURN_PAIR(base, asPointer(result));
         }
         ++iter;
@@ -5627 +5627 @@
     CHECK_FOR_EXCEPTION_AT_END();
 
-    VoidPtrPairValue pair = {{ asPointer(number), asPointer(jsNumber(ARG_globalData, number->uncheckedGetNumber() - 1)) }};
-    return pair.i;
+    RETURN_PAIR(asPointer(number), asPointer(jsNumber(ARG_globalData, number->uncheckedGetNumber() - 1)));
 }