ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Fix the initial FPU control word on 32-bit too.

This commit is contained in:
Alexandre Julliard 2010-06-22 11:19:02 +02:00
parent 58a698882d
commit 0db65fd36e
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/kernel32/tests/thread.c
View File

@ -1329,6 +1329,8 @@ static void test_ThreadErrorMode(void)
pSetThreadErrorMode(oldmode, NULL); pSetThreadErrorMode(oldmode, NULL);
} }
void _fpreset(void) {} /* override the mingw fpu init code */
static inline void set_fpu_cw(WORD cw) static inline void set_fpu_cw(WORD cw)
{ {
#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
@ -1387,11 +1389,10 @@ static WORD get_thread_fpu_cw(void)
static void test_thread_fpu_cw(void) static void test_thread_fpu_cw(void)
{ {
WORD initial_cw, cw, expect; WORD initial_cw, cw;
initial_cw = get_fpu_cw(); initial_cw = get_fpu_cw();
expect = sizeof(void *) > sizeof(int) ? 0x27f : 0x37f; ok(initial_cw == 0x27f, "Expected FPU control word 0x27f, got %#x.\n", initial_cw);
ok(initial_cw == expect, "Expected FPU control word expect, got %#x.\n", initial_cw);
cw = get_thread_fpu_cw(); cw = get_thread_fpu_cw();
ok(cw == 0x27f, "Expected FPU control word 0x27f, got %#x.\n", cw); ok(cw == 0x27f, "Expected FPU control word 0x27f, got %#x.\n", cw);

9
dlls/ntdll/signal_i386.c
View File

@ -2155,6 +2155,7 @@ void signal_free_thread( TEB *teb )
*/ */
void signal_init_thread( TEB *teb ) void signal_init_thread( TEB *teb )
{ {
const WORD fpu_cw = 0x27f;
struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)teb->SpareBytes1; struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)teb->SpareBytes1;
LDT_ENTRY fs_entry; LDT_ENTRY fs_entry;
stack_t ss; stack_t ss;
@ -2178,15 +2179,11 @@ void signal_init_thread( TEB *teb )
wine_ldt_init_fs( thread_data->fs, &fs_entry ); wine_ldt_init_fs( thread_data->fs, &fs_entry );
thread_data->gs = wine_get_gs(); thread_data->gs = wine_get_gs();
if (teb->Peb->ProcessHeap) /* Not for the inital thread. */
{
const WORD fpu_cw = 0x27f;
#ifdef __GNUC__ #ifdef __GNUC__
__asm__ volatile ("fninit; fldcw %0" : : "m" (fpu_cw)); __asm__ volatile ("fninit; fldcw %0" : : "m" (fpu_cw));
#else #else
FIXME("FPU setup not implemented for this platform.\n"); FIXME("FPU setup not implemented for this platform.\n");
#endif #endif
}
} }
/********************************************************************** /**********************************************************************