Title: [138522] trunk/Source/_javascript_Core
- Revision
- 138522
- Author
- o...@webkit.org
- Date
- 2012-12-27 23:37:08 -0800 (Thu, 27 Dec 2012)
Log Message
Unreviwed holiday ARM and SH4 buildfixes after r138516.
* jit/ThunkGenerators.cpp:
(JSC::nativeForGenerator):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (138521 => 138522)
--- trunk/Source/_javascript_Core/ChangeLog 2012-12-28 03:53:46 UTC (rev 138521)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-12-28 07:37:08 UTC (rev 138522)
@@ -1,3 +1,10 @@
+2012-12-27 Csaba Osztrogonác <o...@webkit.org>
+
+ Unreviwed holiday ARM and SH4 buildfixes after r138516.
+
+ * jit/ThunkGenerators.cpp:
+ (JSC::nativeForGenerator):
+
2012-12-26 Filip Pizlo <fpi...@apple.com>
All JIT stubs should go through the getCTIStub API
Modified: trunk/Source/_javascript_Core/jit/ThunkGenerators.cpp (138521 => 138522)
--- trunk/Source/_javascript_Core/jit/ThunkGenerators.cpp 2012-12-28 03:53:46 UTC (rev 138521)
+++ trunk/Source/_javascript_Core/jit/ThunkGenerators.cpp 2012-12-28 07:37:08 UTC (rev 138522)
@@ -290,7 +290,7 @@
jit.loadPtr(JSInterfaceJIT::Address(ARMRegisters::r1, JSFunction::offsetOfExecutable()), JSInterfaceJIT::regT2);
jit.call(JSInterfaceJIT::Address(JSInterfaceJIT::regT2, executableOffsetToFunction));
- jit.restoreReturnAddressBeforeReturn(regT3);
+ jit.restoreReturnAddressBeforeReturn(JSInterfaceJIT::regT3);
#elif CPU(SH4)
// Load caller frame's scope chain into this callframe so that whatever we call can
@@ -308,7 +308,7 @@
jit.emitGetFromCallFrameHeaderPtr(JSStack::Callee, JSInterfaceJIT::regT5);
jit.move(JSInterfaceJIT::regT2, JSInterfaceJIT::callFrameRegister); // Eagerly restore caller frame register to avoid loading from stack.
- jit.loadPtr(JSInterfaceJIT::Address(regT5, JSFunction::offsetOfExecutable()), JSInterfaceJIT::regT2);
+ jit.loadPtr(JSInterfaceJIT::Address(JSInterfaceJIT::regT5, JSFunction::offsetOfExecutable()), JSInterfaceJIT::regT2);
jit.call(JSInterfaceJIT::Address(JSInterfaceJIT::regT2, executableOffsetToFunction), JSInterfaceJIT::regT0);
jit.restoreReturnAddressBeforeReturn(JSInterfaceJIT::regT3);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
