Title: [160477] branches/jsCStack/Source/_javascript_Core
- Revision
- 160477
- Author
- [email protected]
- Date
- 2013-12-11 22:38:56 -0800 (Wed, 11 Dec 2013)
Log Message
CStack Branch: Set stack pointer in OSR exit handler
https://bugs.webkit.org/show_bug.cgi?id=125617
Not yet reviewed.
Set the stack pointer off of the callFrameRegister just like at the top of the function.
* dfg/DFGOSRExitCompilerCommon.cpp:
(JSC::DFG::adjustAndJumpToTarget):
Modified Paths
Diff
Modified: branches/jsCStack/Source/_javascript_Core/ChangeLog (160476 => 160477)
--- branches/jsCStack/Source/_javascript_Core/ChangeLog 2013-12-12 04:01:26 UTC (rev 160476)
+++ branches/jsCStack/Source/_javascript_Core/ChangeLog 2013-12-12 06:38:56 UTC (rev 160477)
@@ -1,3 +1,15 @@
+2013-12-11 Michael Saboff <[email protected]>
+
+ CStack Branch: Set stack pointer in OSR exit handler
+ https://bugs.webkit.org/show_bug.cgi?id=125617
+
+ Not yet reviewed.
+
+ Set the stack pointer off of the callFrameRegister just like at the top of the function.
+
+ * dfg/DFGOSRExitCompilerCommon.cpp:
+ (JSC::DFG::adjustAndJumpToTarget):
+
2013-12-11 Mark Lam <[email protected]>
Introducing MaxFrameExtentForSlowPathCall.h.
Modified: branches/jsCStack/Source/_javascript_Core/dfg/DFGOSRExitCompilerCommon.cpp (160476 => 160477)
--- branches/jsCStack/Source/_javascript_Core/dfg/DFGOSRExitCompilerCommon.cpp 2013-12-12 04:01:26 UTC (rev 160476)
+++ branches/jsCStack/Source/_javascript_Core/dfg/DFGOSRExitCompilerCommon.cpp 2013-12-12 06:38:56 UTC (rev 160477)
@@ -30,6 +30,7 @@
#include "Arguments.h"
#include "DFGOperations.h"
+#include "JIT.h"
#include "JSCJSValueInlines.h"
#include "Operations.h"
@@ -173,7 +174,9 @@
ASSERT(mapping->m_bytecodeIndex == exit.m_codeOrigin.bytecodeIndex);
void* jumpTarget = baselineCodeBlock->jitCode()->executableAddressAtOffset(mapping->m_machineCodeOffset);
-
+
+ jit.addPtr(AssemblyHelpers::TrustedImm32(-JIT::frameRegisterCountFor(baselineCodeBlock) * sizeof(Register)), GPRInfo::callFrameRegister, AssemblyHelpers::stackPointerRegister);
+
jit.move(AssemblyHelpers::TrustedImmPtr(jumpTarget), GPRInfo::regT2);
jit.jump(GPRInfo::regT2);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
