Diff
Modified: branches/jsCStack/Source/_javascript_Core/ChangeLog (160830 => 160831)
--- branches/jsCStack/Source/_javascript_Core/ChangeLog 2013-12-19 15:24:10 UTC (rev 160830)
+++ branches/jsCStack/Source/_javascript_Core/ChangeLog 2013-12-19 15:48:36 UTC (rev 160831)
@@ -1,3 +1,29 @@
+2013-12-19 Michael Saboff <[email protected]>
+
+ CStack Branch: Remove "AndAlloc" from sizeAndAllocFrameForVarargs and friends
+ https://bugs.webkit.org/show_bug.cgi?id=125980
+
+ Reviewed by Mark Lam.
+
+ Renamed sizeAndAllocFrameForVarargs to sizeFrameForVarargs along with
+ removing "and alloc" from all related callers. This was done because
+ sizeAndAllocFrameForVarargs, didn't really allocate but just sized the
+ new call frame.
+
+ * interpreter/Interpreter.cpp:
+ (JSC::sizeFrameForVarargs):
+ * interpreter/Interpreter.h:
+ * jit/JITCall.cpp:
+ (JSC::JIT::compileLoadVarargs):
+ * jit/JITCall32_64.cpp:
+ (JSC::JIT::compileLoadVarargs):
+ * jit/JITOperations.cpp:
+ * jit/JITOperations.h:
+ * llint/LLIntSlowPaths.cpp:
+ (JSC::LLInt::LLINT_SLOW_PATH_DECL):
+ * llint/LLIntSlowPaths.h:
+ * llint/LowLevelInterpreter.asm:
+
2013-12-18 Mark Lam <[email protected]>
CStack: Rename functions in JSStack to fit WebKit Coding Style.
Modified: branches/jsCStack/Source/_javascript_Core/interpreter/Interpreter.cpp (160830 => 160831)
--- branches/jsCStack/Source/_javascript_Core/interpreter/Interpreter.cpp 2013-12-19 15:24:10 UTC (rev 160830)
+++ branches/jsCStack/Source/_javascript_Core/interpreter/Interpreter.cpp 2013-12-19 15:48:36 UTC (rev 160831)
@@ -154,7 +154,7 @@
return interpreter->execute(eval, callFrame, thisValue, callerScopeChain);
}
-CallFrame* sizeAndAllocFrameForVarargs(CallFrame* callFrame, JSStack* stack, JSValue arguments, int firstFreeRegister)
+CallFrame* sizeFrameForVarargs(CallFrame* callFrame, JSStack* stack, JSValue arguments, int firstFreeRegister)
{
if (!arguments) { // f.apply(x, arguments), with arguments unmodified.
unsigned argumentCountIncludingThis = callFrame->argumentCountIncludingThis();
Modified: branches/jsCStack/Source/_javascript_Core/interpreter/Interpreter.h (160830 => 160831)
--- branches/jsCStack/Source/_javascript_Core/interpreter/Interpreter.h 2013-12-19 15:24:10 UTC (rev 160830)
+++ branches/jsCStack/Source/_javascript_Core/interpreter/Interpreter.h 2013-12-19 15:48:36 UTC (rev 160831)
@@ -286,7 +286,7 @@
};
JSValue eval(CallFrame*);
- CallFrame* sizeAndAllocFrameForVarargs(CallFrame*, JSStack*, JSValue, int);
+ CallFrame* sizeFrameForVarargs(CallFrame*, JSStack*, JSValue, int);
void loadVarargs(CallFrame*, CallFrame*, JSValue, JSValue);
} // namespace JSC
Modified: branches/jsCStack/Source/_javascript_Core/jit/JITCall.cpp (160830 => 160831)
--- branches/jsCStack/Source/_javascript_Core/jit/JITCall.cpp 2013-12-19 15:24:10 UTC (rev 160830)
+++ branches/jsCStack/Source/_javascript_Core/jit/JITCall.cpp 2013-12-19 15:48:36 UTC (rev 160831)
@@ -110,7 +110,7 @@
slowCase.link(this);
emitGetVirtualRegister(arguments, regT1);
- callOperation(operationSizeAndAllocFrameForVarargs, regT1, firstFreeRegister);
+ callOperation(operationSizeFrameForVarargs, regT1, firstFreeRegister);
move(returnValueGPR, stackPointerRegister);
emitGetVirtualRegister(thisValue, regT1);
emitGetVirtualRegister(arguments, regT2);
Modified: branches/jsCStack/Source/_javascript_Core/jit/JITCall32_64.cpp (160830 => 160831)
--- branches/jsCStack/Source/_javascript_Core/jit/JITCall32_64.cpp 2013-12-19 15:24:10 UTC (rev 160830)
+++ branches/jsCStack/Source/_javascript_Core/jit/JITCall32_64.cpp 2013-12-19 15:48:36 UTC (rev 160831)
@@ -185,7 +185,7 @@
slowCase.link(this);
emitLoad(arguments, regT1, regT0);
- callOperation(operationSizeAndAllocFrameForVarargs, regT1, regT0, firstFreeRegister);
+ callOperation(operationSizeFrameForVarargs, regT1, regT0, firstFreeRegister);
move(returnValueGPR, regT5);
emitLoad(thisValue, regT1, regT0);
emitLoad(arguments, regT3, regT2);
Modified: branches/jsCStack/Source/_javascript_Core/jit/JITOperations.cpp (160830 => 160831)
--- branches/jsCStack/Source/_javascript_Core/jit/JITOperations.cpp 2013-12-19 15:24:10 UTC (rev 160830)
+++ branches/jsCStack/Source/_javascript_Core/jit/JITOperations.cpp 2013-12-19 15:48:36 UTC (rev 160831)
@@ -1526,13 +1526,13 @@
return JSValue::encode(jsBoolean(result));
}
-CallFrame* JIT_OPERATION operationSizeAndAllocFrameForVarargs(ExecState* exec, EncodedJSValue encodedArguments, int32_t firstFreeRegister)
+CallFrame* JIT_OPERATION operationSizeFrameForVarargs(ExecState* exec, EncodedJSValue encodedArguments, int32_t firstFreeRegister)
{
VM& vm = exec->vm();
NativeCallFrameTracer tracer(&vm, exec);
JSStack* stack = &exec->interpreter()->stack();
JSValue arguments = JSValue::decode(encodedArguments);
- CallFrame* newCallFrame = sizeAndAllocFrameForVarargs(exec, stack, arguments, firstFreeRegister);
+ CallFrame* newCallFrame = sizeFrameForVarargs(exec, stack, arguments, firstFreeRegister);
return newCallFrame;
}
Modified: branches/jsCStack/Source/_javascript_Core/jit/JITOperations.h (160830 => 160831)
--- branches/jsCStack/Source/_javascript_Core/jit/JITOperations.h 2013-12-19 15:24:10 UTC (rev 160830)
+++ branches/jsCStack/Source/_javascript_Core/jit/JITOperations.h 2013-12-19 15:48:36 UTC (rev 160831)
@@ -268,7 +268,7 @@
EncodedJSValue JIT_OPERATION operationDeleteById(ExecState*, EncodedJSValue base, const Identifier*) WTF_INTERNAL;
JSCell* JIT_OPERATION operationGetPNames(ExecState*, JSObject*) WTF_INTERNAL;
EncodedJSValue JIT_OPERATION operationInstanceOf(ExecState*, EncodedJSValue, EncodedJSValue proto) WTF_INTERNAL;
-CallFrame* JIT_OPERATION operationSizeAndAllocFrameForVarargs(ExecState*, EncodedJSValue arguments, int32_t firstFreeRegister) WTF_INTERNAL;
+CallFrame* JIT_OPERATION operationSizeFrameForVarargs(ExecState*, EncodedJSValue arguments, int32_t firstFreeRegister) WTF_INTERNAL;
CallFrame* JIT_OPERATION operationLoadVarargs(ExecState*, CallFrame*, EncodedJSValue thisValue, EncodedJSValue arguments) WTF_INTERNAL;
EncodedJSValue JIT_OPERATION operationToObject(ExecState*, EncodedJSValue) WTF_INTERNAL;
Modified: branches/jsCStack/Source/_javascript_Core/llint/LLIntSlowPaths.cpp (160830 => 160831)
--- branches/jsCStack/Source/_javascript_Core/llint/LLIntSlowPaths.cpp 2013-12-19 15:24:10 UTC (rev 160830)
+++ branches/jsCStack/Source/_javascript_Core/llint/LLIntSlowPaths.cpp 2013-12-19 15:48:36 UTC (rev 160831)
@@ -1111,13 +1111,13 @@
return genericCall(exec, pc, CodeForConstruct);
}
-LLINT_SLOW_PATH_DECL(slow_path_size_and_alloc_frame_for_varargs)
+LLINT_SLOW_PATH_DECL(slow_path_size_frame_for_varargs)
{
LLINT_BEGIN();
// This needs to:
// - Set up a call frame while respecting the variable arguments.
- ExecState* execCallee = sizeAndAllocFrameForVarargs(exec, &vm.interpreter->stack(),
+ ExecState* execCallee = sizeFrameForVarargs(exec, &vm.interpreter->stack(),
LLINT_OP_C(4).jsValue(), pc[5].u.operand);
LLINT_CALL_CHECK_EXCEPTION(exec);
Modified: branches/jsCStack/Source/_javascript_Core/llint/LLIntSlowPaths.h (160830 => 160831)
--- branches/jsCStack/Source/_javascript_Core/llint/LLIntSlowPaths.h 2013-12-19 15:24:10 UTC (rev 160830)
+++ branches/jsCStack/Source/_javascript_Core/llint/LLIntSlowPaths.h 2013-12-19 15:48:36 UTC (rev 160831)
@@ -100,7 +100,7 @@
LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_new_func_exp);
LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_call);
LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_construct);
-LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_size_and_alloc_frame_for_varargs);
+LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_size_frame_for_varargs);
LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_call_varargs);
LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_call_eval);
LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_tear_off_activation);
Modified: branches/jsCStack/Source/_javascript_Core/llint/LowLevelInterpreter.asm (160830 => 160831)
--- branches/jsCStack/Source/_javascript_Core/llint/LowLevelInterpreter.asm 2013-12-19 15:24:10 UTC (rev 160830)
+++ branches/jsCStack/Source/_javascript_Core/llint/LowLevelInterpreter.asm 2013-12-19 15:48:36 UTC (rev 160831)
@@ -798,7 +798,7 @@
_llint_op_call_varargs:
traceExecution()
- callSlowPath(_llint_slow_path_size_and_alloc_frame_for_varargs)
+ callSlowPath(_llint_slow_path_size_frame_for_varargs)
branchIfException(_llint_throw_from_slow_path_trampoline)
# calleeFrame in t1
move t1, sp
