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

msvcrt: Use status word flags from public header. 

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2020-12-01 13:51:55 +01:00 committed by Alexandre Julliard
parent eabef91a97
commit 09d018c73d
2 changed files with 36 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
dlls/msvcrt/math.c
View File

@ -1640,12 +1640,12 @@ void CDECL _statusfp2( unsigned int *x86_sw, unsigned int *sse2_sw )
{ {
__asm__ __volatile__( "fstsw %0" : "=m" (fpword) ); __asm__ __volatile__( "fstsw %0" : "=m" (fpword) );
flags = 0; flags = 0;
if (fpword & 0x1) flags |= MSVCRT__SW_INVALID; if (fpword & 0x1) flags |= _SW_INVALID;
if (fpword & 0x2) flags |= MSVCRT__SW_DENORMAL; if (fpword & 0x2) flags |= _SW_DENORMAL;
if (fpword & 0x4) flags |= MSVCRT__SW_ZERODIVIDE; if (fpword & 0x4) flags |= _SW_ZERODIVIDE;
if (fpword & 0x8) flags |= MSVCRT__SW_OVERFLOW; if (fpword & 0x8) flags |= _SW_OVERFLOW;
if (fpword & 0x10) flags |= MSVCRT__SW_UNDERFLOW; if (fpword & 0x10) flags |= _SW_UNDERFLOW;
if (fpword & 0x20) flags |= MSVCRT__SW_INEXACT; if (fpword & 0x20) flags |= _SW_INEXACT;
*x86_sw = flags; *x86_sw = flags;
} }
@ -1655,12 +1655,12 @@ void CDECL _statusfp2( unsigned int *x86_sw, unsigned int *sse2_sw )
{ {
__asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) ); __asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) );
flags = 0; flags = 0;
if (fpword & 0x1) flags |= MSVCRT__SW_INVALID; if (fpword & 0x1) flags |= _SW_INVALID;
if (fpword & 0x2) flags |= MSVCRT__SW_DENORMAL; if (fpword & 0x2) flags |= _SW_DENORMAL;
if (fpword & 0x4) flags |= MSVCRT__SW_ZERODIVIDE; if (fpword & 0x4) flags |= _SW_ZERODIVIDE;
if (fpword & 0x8) flags |= MSVCRT__SW_OVERFLOW; if (fpword & 0x8) flags |= _SW_OVERFLOW;
if (fpword & 0x10) flags |= MSVCRT__SW_UNDERFLOW; if (fpword & 0x10) flags |= _SW_UNDERFLOW;
if (fpword & 0x20) flags |= MSVCRT__SW_INEXACT; if (fpword & 0x20) flags |= _SW_INEXACT;
*sse2_sw = flags; *sse2_sw = flags;
} }
else *sse2_sw = 0; else *sse2_sw = 0;
@ -1686,12 +1686,12 @@ unsigned int CDECL _statusfp(void)
ULONG_PTR fpsr; ULONG_PTR fpsr;
__asm__ __volatile__( "mrs %0, fpsr" : "=r" (fpsr) ); __asm__ __volatile__( "mrs %0, fpsr" : "=r" (fpsr) );
if (fpsr & 0x1) flags |= MSVCRT__SW_INVALID; if (fpsr & 0x1) flags |= _SW_INVALID;
if (fpsr & 0x2) flags |= MSVCRT__SW_ZERODIVIDE; if (fpsr & 0x2) flags |= _SW_ZERODIVIDE;
if (fpsr & 0x4) flags |= MSVCRT__SW_OVERFLOW; if (fpsr & 0x4) flags |= _SW_OVERFLOW;
if (fpsr & 0x8) flags |= MSVCRT__SW_UNDERFLOW; if (fpsr & 0x8) flags |= _SW_UNDERFLOW;
if (fpsr & 0x10) flags |= MSVCRT__SW_INEXACT; if (fpsr & 0x10) flags |= _SW_INEXACT;
if (fpsr & 0x80) flags |= MSVCRT__SW_DENORMAL; if (fpsr & 0x80) flags |= _SW_DENORMAL;
#else #else
FIXME( "not implemented\n" ); FIXME( "not implemented\n" );
#endif #endif
@ -1708,22 +1708,22 @@ unsigned int CDECL _clearfp(void)
unsigned long fpword; unsigned long fpword;
__asm__ __volatile__( "fnstsw %0; fnclex" : "=m" (fpword) ); __asm__ __volatile__( "fnstsw %0; fnclex" : "=m" (fpword) );
if (fpword & 0x1) flags |= MSVCRT__SW_INVALID; if (fpword & 0x1) flags |= _SW_INVALID;
if (fpword & 0x2) flags |= MSVCRT__SW_DENORMAL; if (fpword & 0x2) flags |= _SW_DENORMAL;
if (fpword & 0x4) flags |= MSVCRT__SW_ZERODIVIDE; if (fpword & 0x4) flags |= _SW_ZERODIVIDE;
if (fpword & 0x8) flags |= MSVCRT__SW_OVERFLOW; if (fpword & 0x8) flags |= _SW_OVERFLOW;
if (fpword & 0x10) flags |= MSVCRT__SW_UNDERFLOW; if (fpword & 0x10) flags |= _SW_UNDERFLOW;
if (fpword & 0x20) flags |= MSVCRT__SW_INEXACT; if (fpword & 0x20) flags |= _SW_INEXACT;
if (sse2_supported) if (sse2_supported)
{ {
__asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) ); __asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) );
if (fpword & 0x1) flags |= MSVCRT__SW_INVALID; if (fpword & 0x1) flags |= _SW_INVALID;
if (fpword & 0x2) flags |= MSVCRT__SW_DENORMAL; if (fpword & 0x2) flags |= _SW_DENORMAL;
if (fpword & 0x4) flags |= MSVCRT__SW_ZERODIVIDE; if (fpword & 0x4) flags |= _SW_ZERODIVIDE;
if (fpword & 0x8) flags |= MSVCRT__SW_OVERFLOW; if (fpword & 0x8) flags |= _SW_OVERFLOW;
if (fpword & 0x10) flags |= MSVCRT__SW_UNDERFLOW; if (fpword & 0x10) flags |= _SW_UNDERFLOW;
if (fpword & 0x20) flags |= MSVCRT__SW_INEXACT; if (fpword & 0x20) flags |= _SW_INEXACT;
fpword &= ~0x3f; fpword &= ~0x3f;
__asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) ); __asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) );
} }
@ -1731,12 +1731,12 @@ unsigned int CDECL _clearfp(void)
ULONG_PTR fpsr; ULONG_PTR fpsr;
__asm__ __volatile__( "mrs %0, fpsr" : "=r" (fpsr) ); __asm__ __volatile__( "mrs %0, fpsr" : "=r" (fpsr) );
if (fpsr & 0x1) flags |= MSVCRT__SW_INVALID; if (fpsr & 0x1) flags |= _SW_INVALID;
if (fpsr & 0x2) flags |= MSVCRT__SW_ZERODIVIDE; if (fpsr & 0x2) flags |= _SW_ZERODIVIDE;
if (fpsr & 0x4) flags |= MSVCRT__SW_OVERFLOW; if (fpsr & 0x4) flags |= _SW_OVERFLOW;
if (fpsr & 0x8) flags |= MSVCRT__SW_UNDERFLOW; if (fpsr & 0x8) flags |= _SW_UNDERFLOW;
if (fpsr & 0x10) flags |= MSVCRT__SW_INEXACT; if (fpsr & 0x10) flags |= _SW_INEXACT;
if (fpsr & 0x80) flags |= MSVCRT__SW_DENORMAL; if (fpsr & 0x80) flags |= _SW_DENORMAL;
fpsr &= ~0x9f; fpsr &= ~0x9f;
__asm__ __volatile__( "msr fpsr, %0" :: "r" (fpsr) ); __asm__ __volatile__( "msr fpsr, %0" :: "r" (fpsr) );
#else #else

14
dlls/msvcrt/msvcrt.h
View File

@ -626,20 +626,6 @@ struct MSVCRT__stat64 {
#define MSVCRT__O_U16TEXT 0x20000 #define MSVCRT__O_U16TEXT 0x20000
#define MSVCRT__O_U8TEXT 0x40000 #define MSVCRT__O_U8TEXT 0x40000
/* _statusfp bit flags */
#define MSVCRT__SW_INEXACT 0x00000001 /* inexact (precision) */
#define MSVCRT__SW_UNDERFLOW 0x00000002 /* underflow */
#define MSVCRT__SW_OVERFLOW 0x00000004 /* overflow */
#define MSVCRT__SW_ZERODIVIDE 0x00000008 /* zero divide */
#define MSVCRT__SW_INVALID 0x00000010 /* invalid */
#define MSVCRT__SW_UNEMULATED 0x00000040 /* unemulated instruction */
#define MSVCRT__SW_SQRTNEG 0x00000080 /* square root of a neg number */
#define MSVCRT__SW_STACKOVERFLOW 0x00000200 /* FP stack overflow */
#define MSVCRT__SW_STACKUNDERFLOW 0x00000400 /* FP stack underflow */
#define MSVCRT__SW_DENORMAL 0x00080000 /* denormal status bit */
/* fpclass constants */ /* fpclass constants */
#define MSVCRT__FPCLASS_SNAN 0x0001 /* Signaling "Not a Number" */ #define MSVCRT__FPCLASS_SNAN 0x0001 /* Signaling "Not a Number" */
#define MSVCRT__FPCLASS_QNAN 0x0002 /* Quiet "Not a Number" */ #define MSVCRT__FPCLASS_QNAN 0x0002 /* Quiet "Not a Number" */