Title: [161061] branches/jsCStack/Source/_javascript_Core
- Revision
- 161061
- Author
- msab...@apple.com
- Date
- 2013-12-24 16:41:59 -0800 (Tue, 24 Dec 2013)
Log Message
CStack Branch: ecma/ExecutionContexts/10.1.4-2.js test fails
https://bugs.webkit.org/show_bug.cgi?id=126213
Reviewed by Filip Pizlo.
Fixed setting and restoring of stack pointer in JIT::compileCallEval()
and its slow path. Changed the exception check to simplify when the stack
pointer is set to the before call versus after the call values.
* jit/JITCall.cpp:
(JSC::JIT::compileCallEval):
(JSC::JIT::compileCallEvalSlowCase):
(JSC::JIT::compileOpCall):
Modified Paths
Diff
Modified: branches/jsCStack/Source/_javascript_Core/ChangeLog (161060 => 161061)
--- branches/jsCStack/Source/_javascript_Core/ChangeLog 2013-12-24 21:06:22 UTC (rev 161060)
+++ branches/jsCStack/Source/_javascript_Core/ChangeLog 2013-12-25 00:41:59 UTC (rev 161061)
@@ -1,3 +1,19 @@
+2013-12-24 Michael Saboff <msab...@apple.com>
+
+ CStack Branch: ecma/ExecutionContexts/10.1.4-2.js test fails
+ https://bugs.webkit.org/show_bug.cgi?id=126213
+
+ Reviewed by Filip Pizlo.
+
+ Fixed setting and restoring of stack pointer in JIT::compileCallEval()
+ and its slow path. Changed the exception check to simplify when the stack
+ pointer is set to the before call versus after the call values.
+
+ * jit/JITCall.cpp:
+ (JSC::JIT::compileCallEval):
+ (JSC::JIT::compileCallEvalSlowCase):
+ (JSC::JIT::compileOpCall):
+
2013-12-23 Michael Saboff <msab...@apple.com>
CStack Branch: throwExceptionFromCallSlowPathGenerator() shouldn't pop frame
Modified: branches/jsCStack/Source/_javascript_Core/jit/JITCall.cpp (161060 => 161061)
--- branches/jsCStack/Source/_javascript_Core/jit/JITCall.cpp 2013-12-24 21:06:22 UTC (rev 161060)
+++ branches/jsCStack/Source/_javascript_Core/jit/JITCall.cpp 2013-12-25 00:41:59 UTC (rev 161061)
@@ -127,12 +127,16 @@
{
addPtr(TrustedImm32(-static_cast<ptrdiff_t>(sizeof(CallerFrameAndPC))), stackPointerRegister, regT1);
callOperationNoExceptionCheck(operationCallEval, regT1);
- // Recalculate newCallFrame and put in regT1 for possible use in slow case
- addPtr(TrustedImm32(-JSStack::CallerFrameAndPCSize * static_cast<int>(sizeof(Register))), stackPointerRegister, regT1);
+
+ Jump noException = emitExceptionCheck(InvertedExceptionCheck);
+ addPtr(TrustedImm32(stackPointerOffsetFor(m_codeBlock) * sizeof(Register)), callFrameRegister, stackPointerRegister);
+ exceptionCheck(jump());
+
+ noException.link(this);
+ addSlowCase(branch64(Equal, regT0, TrustedImm64(JSValue::encode(JSValue()))));
+
addPtr(TrustedImm32(stackPointerOffsetFor(m_codeBlock) * sizeof(Register)), callFrameRegister, stackPointerRegister);
checkStackPointerAlignment();
- exceptionCheck(); // Do exception check now that the caller stack has been restored
- addSlowCase(branch64(Equal, regT0, TrustedImm64(JSValue::encode(JSValue()))));
sampleCodeBlock(m_codeBlock);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
