12bf2042a6
* i686-register-fixes.patch: The specific fix from upstream. * get-rid-of-ts_origin.patch: This cleanup from upstream also avoids the issue and is extensively tested elsewhere so included. * python-greenlet.spec: Reference the two upstream patches and exclude the tests on the ppc64 platform where the issue still remains.
63 lines
2.0 KiB
Diff
63 lines
2.0 KiB
Diff
# HG changeset patch
|
|
# User Alexey Borzenkov <snaury@gmail.com>
|
|
# Date 1313701525 -14400
|
|
# Node ID 25bf29f4d3b79b026c1c05787bb741a8e7ef2229
|
|
# Parent c0bf397a723d4b61d7ef78cf575dea4c0fdb527e
|
|
Fix compilation and register problems on some i386 configurations
|
|
|
|
diff -r c0bf397a723d4b61d7ef78cf575dea4c0fdb527e -r 25bf29f4d3b79b026c1c05787bb741a8e7ef2229 platform/switch_x86_unix.h
|
|
--- a/platform/switch_x86_unix.h Thu Aug 18 02:44:20 2011 +0400
|
|
+++ b/platform/switch_x86_unix.h Fri Aug 19 01:05:25 2011 +0400
|
|
@@ -2,6 +2,8 @@
|
|
* this is the internal transfer function.
|
|
*
|
|
* HISTORY
|
|
+ * 19-Aug-11 Alexey Borzenkov <snaury@gmail.com>
|
|
+ * Correctly save ebp, ebx and cw
|
|
* 07-Sep-05 (py-dev mailing list discussion)
|
|
* removed 'ebx' from the register-saved. !!!! WARNING !!!!
|
|
* It means that this file can no longer be compiled statically!
|
|
@@ -34,18 +36,13 @@
|
|
static int
|
|
slp_switch(void)
|
|
{
|
|
+ void *ebp, *ebx;
|
|
+ unsigned short cw;
|
|
register int *stackref, stsizediff;
|
|
- /* !!!!WARNING!!!! need to add "ebx" in the next line, as well as in the
|
|
- * last line of this function, if this header file is meant to be compiled
|
|
- * non-dynamically!
|
|
- */
|
|
- __asm__ volatile ("" : : :
|
|
- "esi",
|
|
- "edi"
|
|
-#ifdef __MINGW32__
|
|
- , "ebx"
|
|
-#endif
|
|
- );
|
|
+ __asm__ volatile ("" : : : "esi", "edi");
|
|
+ __asm__ volatile ("fstcw %0" : "=m" (cw));
|
|
+ __asm__ volatile ("movl %%ebp, %0" : "=m" (ebp));
|
|
+ __asm__ volatile ("movl %%ebx, %0" : "=m" (ebx));
|
|
__asm__ ("movl %%esp, %0" : "=g" (stackref));
|
|
{
|
|
SLP_SAVE_STATE(stackref, stsizediff);
|
|
@@ -57,13 +54,10 @@
|
|
);
|
|
SLP_RESTORE_STATE();
|
|
}
|
|
- __asm__ volatile ("" : : :
|
|
- "esi",
|
|
- "edi"
|
|
-#ifdef __MINGW32__
|
|
- , "ebx"
|
|
-#endif
|
|
- );
|
|
+ __asm__ volatile ("movl %0, %%ebx" : : "m" (ebx));
|
|
+ __asm__ volatile ("movl %0, %%ebp" : : "m" (ebp));
|
|
+ __asm__ volatile ("fldcw %0" : : "m" (cw));
|
|
+ __asm__ volatile ("" : : : "esi", "edi");
|
|
return 0;
|
|
}
|
|
|