[SOFTX86]

Fix warnings in softx87 (the FPU emulator).

svn path=/branches/ntvdm/; revision=59262

diff --git a/include/reactos/libs/softx86/softx87.h b/include/reactos/libs/softx86/softx87.h
index e8e0371..a9e40b8 100644 (file)
--- a/include/reactos/libs/softx86/softx87.h
+++ b/include/reactos/libs/softx86/softx87.h
@@ -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 @@ int softx87_setbug(softx87_ctx* ctx,sx87_udword bug_id,sx87_ubyte on_off);
 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 @@ void softx87_unpack_raw_fp64(softx87_ctx* ctx,sx87_ubyte *data,softx87_reg80 *v)
    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;
 

diff --git a/lib/3rdparty/softx86/softx87/CMakeLists.txt b/lib/3rdparty/softx86/softx87/CMakeLists.txt
index 6e4c0c9..429867e 100644 (file)
--- a/lib/3rdparty/softx86/softx87/CMakeLists.txt
+++ b/lib/3rdparty/softx86/softx87/CMakeLists.txt
@@ -11,4 +11,3 @@ list(APPEND SOURCE
 )
 
 add_library(softx87 ${SOURCE})
-allow_warnings(softx87)

diff --git a/lib/3rdparty/softx86/softx87/softx87.c b/lib/3rdparty/softx86/softx87/softx87.c
index 6f3bc4b..4184426 100644 (file)
--- a/lib/3rdparty/softx86/softx87/softx87.c
+++ b/lib/3rdparty/softx86/softx87/softx87.c
@@ -354,7 +354,7 @@ void softx87_step_def_on_write_memory(void* _ctx,sx86_udword address,sx86_ubyte
 /* 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 @@ void softx87_unpack_raw_int16(softx87_ctx* ctx,sx87_ubyte *data,softx87_reg80 *v
 }
 
 /* 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 @@ void softx87_unpack_raw_int32(softx87_ctx* ctx,sx87_ubyte *data,softx87_reg80 *v
 }
 
 /* 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 @@ void softx87_unpack_raw_fp32(softx87_ctx* ctx,sx87_ubyte *data,softx87_reg80 *v)
 }
 
 /* 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);