Changeset 43431 in webkit for trunk/JavaScriptCore/jit/JITStubs.cpp

Timestamp:

May 9, 2009, 1:24:49 AM (16 years ago)

Author:

[email protected]

Message:

2009-05-09 Geoffrey Garen <​[email protected]>

Reviewed by Gavin Barraclough.

Changed all our JIT stubs so that they return a maximum of 1 JS value or
two non-JS pointers, and do all other value returning through out
parameters, in preparation for 64bit JS values on a 32bit system.

Stubs that used to return two JSValues now return one JSValue and take
and out parameter specifying where in the register array the second
value should go.

SunSpider reports no change.

• jit/JIT.cpp: (JSC::JIT::privateCompileMainPass):
• jit/JITArithmetic.cpp: (JSC::JIT::compileFastArithSlow_op_post_inc): (JSC::JIT::compileFastArithSlow_op_post_dec):
• jit/JITStubs.cpp: (JSC::JITStubs::cti_op_call_arityCheck): (JSC::JITStubs::cti_op_resolve_func): (JSC::JITStubs::cti_op_post_inc): (JSC::JITStubs::cti_op_resolve_with_base): (JSC::JITStubs::cti_op_post_dec):
• jit/JITStubs.h: (JSC::):

File:

• trunk/JavaScriptCore/jit/JITStubs.cpp (modified) (12 diffs)

trunk/JavaScriptCore/jit/JITStubs.cpp

@@ -1026 +1026 @@
             stackFrame.callFrame = oldCallFrame;
             throwStackOverflowError(oldCallFrame, stackFrame.globalData, stackFrame.args[1].returnAddress(), STUB_RETURN_ADDRESS);
-            RETURN_PAIR(0, 0);
+            RETURN_POINTER_PAIR(0, 0);
         }
 
@@ -1037 +1037 @@
     }
 
-    RETURN_PAIR(newCodeBlock, callFrame);
+    RETURN_POINTER_PAIR(newCodeBlock, callFrame);
 }
 
@@ -1385 +1385 @@
 }
 
-VoidPtrPair JITStubs::cti_op_resolve_func(STUB_ARGS_DECLARATION)
+EncodedJSValue JITStubs::cti_op_resolve_func(STUB_ARGS_DECLARATION)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1416 +1416 @@
             CHECK_FOR_EXCEPTION_AT_END();
 
-            RETURN_PAIR(thisObj, JSValue::encode(result));
+            callFrame->registers()[stackFrame.args[1].int32()] = JSValue(thisObj);
+            return JSValue::encode(result);
         }
         ++iter;
@@ -1425 +1426 @@
     stackFrame.globalData->exception = createUndefinedVariableError(callFrame, ident, vPCIndex, codeBlock);
     VM_THROW_EXCEPTION_AT_END();
-    RETURN_PAIR(0, 0);
+    return JSValue::encode(JSValue());
 }
 
@@ -1817 +1818 @@
 }
 
-VoidPtrPair JITStubs::cti_op_post_inc(STUB_ARGS_DECLARATION)
+EncodedJSValue JITStubs::cti_op_post_inc(STUB_ARGS_DECLARATION)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1828 +1829 @@
     CHECK_FOR_EXCEPTION_AT_END();
 
-    RETURN_PAIR(JSValue::encode(number), JSValue::encode(jsNumber(stackFrame.globalData, number.uncheckedGetNumber() + 1)));
+    callFrame->registers()[stackFrame.args[1].int32()] = jsNumber(stackFrame.globalData, number.uncheckedGetNumber() + 1);
+    return JSValue::encode(number);
 }
 
@@ -1920 +1922 @@
 }
 
-VoidPtrPair JITStubs::cti_op_resolve_with_base(STUB_ARGS_DECLARATION)
+EncodedJSValue JITStubs::cti_op_resolve_with_base(STUB_ARGS_DECLARATION)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1943 +1945 @@
             CHECK_FOR_EXCEPTION_AT_END();
 
-            RETURN_PAIR(base, JSValue::encode(result));
+            callFrame->registers()[stackFrame.args[1].int32()] = JSValue(base);
+            return JSValue::encode(result);
         }
         ++iter;
@@ -1952 +1955 @@
     stackFrame.globalData->exception = createUndefinedVariableError(callFrame, ident, vPCIndex, codeBlock);
     VM_THROW_EXCEPTION_AT_END();
-    RETURN_PAIR(0, 0);
+    return JSValue::encode(JSValue());
 }
 
@@ -2001 +2004 @@
 }
 
-VoidPtrPair JITStubs::cti_op_post_dec(STUB_ARGS_DECLARATION)
+EncodedJSValue JITStubs::cti_op_post_dec(STUB_ARGS_DECLARATION)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2012 +2015 @@
     CHECK_FOR_EXCEPTION_AT_END();
 
-    RETURN_PAIR(JSValue::encode(number), JSValue::encode(jsNumber(stackFrame.globalData, number.uncheckedGetNumber() - 1)));
+    callFrame->registers()[stackFrame.args[1].int32()] = jsNumber(stackFrame.globalData, number.uncheckedGetNumber() - 1);
+    return JSValue::encode(number);
 }