Author: aandrejevic Date: Wed Jun 19 23:12:54 2013 New Revision: 59262
URL: http://svn.reactos.org/svn/reactos?rev=59262&view=rev Log: [SOFTX86] Fix warnings in softx87 (the FPU emulator).
Modified: branches/ntvdm/include/reactos/libs/softx86/softx87.h branches/ntvdm/lib/3rdparty/softx86/softx87/CMakeLists.txt branches/ntvdm/lib/3rdparty/softx86/softx87/softx87.c
Modified: branches/ntvdm/include/reactos/libs/softx86/softx87.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/softx... ============================================================================== --- branches/ntvdm/include/reactos/libs/softx86/softx87.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/softx86/softx87.h [iso-8859-1] Wed Jun 19 23:12:54 2013 @@ -4,7 +4,7 @@
/* get the Softx86 configuration defines and Softx86 headers */ #include "softx86.h" -#include <softx86cfg.h> +#include "softx86cfg.h"
#ifdef __cplusplus extern "C" { @@ -248,10 +248,10 @@ void softx87_normalize(softx87_ctx* ctx,softx87_reg80 *val);
/* loading/saving */ -void softx87_unpack_raw_int16(softx87_ctx* ctx,sx87_ubyte *data,softx87_reg80 *v); -void softx87_unpack_raw_int32(softx87_ctx* ctx,sx87_ubyte *data,softx87_reg80 *v); -void softx87_unpack_raw_fp32(softx87_ctx* ctx,sx87_ubyte *data,softx87_reg80 *v); -void softx87_unpack_raw_fp64(softx87_ctx* ctx,sx87_ubyte *data,softx87_reg80 *v); +void softx87_unpack_raw_int16(softx87_ctx* ctx,char *data,softx87_reg80 *v); +void softx87_unpack_raw_int32(softx87_ctx* ctx,char *data,softx87_reg80 *v); +void softx87_unpack_raw_fp32(softx87_ctx* ctx,char *data,softx87_reg80 *v); +void softx87_unpack_raw_fp64(softx87_ctx* ctx,char *data,softx87_reg80 *v);
#ifdef __cplusplus } @@ -262,7 +262,7 @@ This function assumes that you want the CPU and FPU to share the same memory. Provided as a service for those who don't want to manually link pointers together and such. */ -static int softx87_connect_to_CPU(softx86_ctx* cpu,softx87_ctx* fpu) +static inline int softx87_connect_to_CPU(softx86_ctx* cpu,softx87_ctx* fpu) { if (!cpu || !fpu) return 0;
Modified: branches/ntvdm/lib/3rdparty/softx86/softx87/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/softx86/softx... ============================================================================== --- branches/ntvdm/lib/3rdparty/softx86/softx87/CMakeLists.txt [iso-8859-1] (original) +++ branches/ntvdm/lib/3rdparty/softx86/softx87/CMakeLists.txt [iso-8859-1] Wed Jun 19 23:12:54 2013 @@ -11,4 +11,3 @@ )
add_library(softx87 ${SOURCE}) -allow_warnings(softx87)
Modified: branches/ntvdm/lib/3rdparty/softx86/softx87/softx87.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/softx86/softx... ============================================================================== --- branches/ntvdm/lib/3rdparty/softx86/softx87/softx87.c [iso-8859-1] (original) +++ branches/ntvdm/lib/3rdparty/softx86/softx87/softx87.c [iso-8859-1] Wed Jun 19 23:12:54 2013 @@ -354,7 +354,7 @@ /* loading/storing and conversion code */
/* loads 16-bit integer from data[] */ -void softx87_unpack_raw_int16(softx87_ctx* ctx,sx87_ubyte *data,softx87_reg80 *v) +void softx87_unpack_raw_int16(softx87_ctx* ctx,char *data,softx87_reg80 *v) { #if SX86_BYTE_ORDER == LE v->mantissa = (sx87_uldword)(*((sx87_uword*)data)); @@ -374,7 +374,7 @@ }
/* loads 32-bit integer from data[] */ -void softx87_unpack_raw_int32(softx87_ctx* ctx,sx87_ubyte *data,softx87_reg80 *v) +void softx87_unpack_raw_int32(softx87_ctx* ctx,char *data,softx87_reg80 *v) { #if SX86_BYTE_ORDER == LE v->mantissa = (sx87_uldword)(*((sx87_udword*)data)); @@ -396,7 +396,7 @@ }
/* loads 32-bit double precision floating point from data[] */ -void softx87_unpack_raw_fp32(softx87_ctx* ctx,sx87_ubyte *data,softx87_reg80 *v) +void softx87_unpack_raw_fp32(softx87_ctx* ctx,char *data,softx87_reg80 *v) { #if SX86_BYTE_ORDER == LE v->mantissa = (sx87_uldword)(*((sx87_udword*)data)); @@ -419,7 +419,7 @@ }
/* loads 64-bit double precision floating point from data[] */ -void softx87_unpack_raw_fp64(softx87_ctx* ctx,sx87_ubyte *data,softx87_reg80 *v) +void softx87_unpack_raw_fp64(softx87_ctx* ctx,char *data,softx87_reg80 *v) { #if SX86_BYTE_ORDER == LE v->mantissa = *((sx87_uldword*)data);