Changeset 94545 in vbox for trunk

Timestamp:

Apr 11, 2022 12:15:06 AM (3 years ago)

Author:

vboxsync

Message:

libs/softfloat-3e: Build ring-0 version the library, for now pretending we can get away with all global status variables. bugref:9898

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/VMM/Makefile.kmk (modified) (1 diff)
• src/VBox/VMM/VMMAll/IEMAllAImplC.cpp (modified) (2 diffs)
• src/libs/softfloat-3e/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -4808 +4808 @@
 
 SDK_VBOX_SOFTFLOAT             := SoftFloat 3 for dll linking.
- SDK_VBOX_SOFTFLOAT_DEFS       := SOFTFLOAT_FAST_INT64
- SDK_VBOX_SOFTFLOAT_DEFS.amd64 := LITTLEENDIAN
- SDK_VBOX_SOFTFLOAT_DEFS.arm64 := LITTLEENDIAN
- SDK_VBOX_SOFTFLOAT_DEFS.x86   := LITTLEENDIAN
+SDK_VBOX_SOFTFLOAT_DEFS        := SOFTFLOAT_FAST_INT64
+SDK_VBOX_SOFTFLOAT_DEFS.amd64  := LITTLEENDIAN
+SDK_VBOX_SOFTFLOAT_DEFS.arm64  := LITTLEENDIAN
+SDK_VBOX_SOFTFLOAT_DEFS.x86    := LITTLEENDIAN
 if1of ($(KBUILD_TARGET),win)
  SDK_VBOX_SOFTFLOAT_DEFS       += THREAD_LOCAL=__declspec(thread)
@@ -4821 +4821 @@
 SDK_VBOX_SOFTFLOAT_LIBS         = \
         $(PATH_STAGE_LIB)/VBox-SoftFloat$(VBOX_SUFF_LIB)
+
+SDK_VBOX_SOFTFLOATR0           := SoftFloat 3 for ring-0 linking.
+SDK_VBOX_SOFTFLOATR0_DEFS      := SOFTFLOAT_FAST_INT64
+SDK_VBOX_SOFTFLOATR0_DEFS.amd64:= LITTLEENDIAN
+SDK_VBOX_SOFTFLOATR0_DEFS.arm64:= LITTLEENDIAN
+SDK_VBOX_SOFTFLOATR0_DEFS.x86  := LITTLEENDIAN
+SDK_VBOX_SOFTFLOATR0_INCS       = \
+        $(PATH_ROOT)/src/libs/softfloat-3e/source/include
+SDK_VBOX_SOFTFLOATR0_LIBS       = \
+        $(PATH_STAGE_LIB)/VBox-SoftFloatR0$(VBOX_SUFF_LIB)
 
 ifdef VBOX_WITH_LIBSSH

trunk/src/VBox/VMM/Makefile.kmk

@@ -469 +469 @@
  endif
 
- VMMR0_SDKS      = VBOX_SOFTFLOAT
+ VMMR0_SDKS      = VBOX_SOFTFLOATR0
 
  VMMR0_INCS      = \

trunk/src/VBox/VMM/VMMAll/IEMAllAImplC.cpp

@@ -27 +27 @@
 #include <iprt/uint256.h>
 
-#ifndef IN_RING0
 RT_C_DECLS_BEGIN
-# include <softfloat.h>
+#include <softfloat.h>
 RT_C_DECLS_END
-#endif
 
 
@@ -4660 +4658 @@
         switch (fFcw & X86_FCW_RC_MASK)
         {
+            default: /* (for the simple-minded MSC which otherwise things fAdd would be used uninitialized) */
             case X86_FCW_RC_NEAREST:
                 if (puMantissa->QWords.qw1 & RT_BIT_64(63))

trunk/src/libs/softfloat-3e/Makefile.kmk

@@ -354 +354 @@
         source/f128M_lt_quiet.c
 
+#
+# Ring-0 version of the above (has different compiler settings).
+#
+if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_ONLY_EXTPACKS)
+ LIBRARIES += VBox-SoftFloatR0
+endif
+VBox-SoftFloatR0_EXTENDS   := VBox-SoftFloat
+VBox-SoftFloatR0_TEMPLATE  := VBoxR0
+VBox-SoftFloatR0_DEFS       = $(NO_SUCH_VARIABLE)
+
+# -wd4245: f128_sqrt.c(184): warning C4245: '=': conversion from 'int' to 'uint_fast64_t', signed/unsigned mismatch
+# -wd4389: f64_to_i64_r_minMag.c(93): warning C4389: '!=': signed/unsigned mismatch
+VBox-SoftFloatR0_CFLAGS.win := $(VBox-SoftFloat_CFLAGS.win) -wd4245 -wd4389
+
 include $(FILE_KBUILD_SUB_FOOTER)