Changeset 48155 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Aug 29, 2013 12:58:51 PM (11 years ago)

Author:

vboxsync

Message:

wined3d: fpu setup for amd64

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new

Files:

• Makefile.kmk (modified) (1 diff)
• d3d9/device.c (modified) (2 diffs)
• d3d9/vboxport.asm (added)

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/Makefile.kmk

@@ -319 +319 @@
         vbox/libWineStub/debug.c \
         d3d9/d3d9xpdm.def
+VBoxD3D9_SOURCES.amd64 = d3d9/vboxport.asm
 VBoxD3D9_LIBS             = \
         $(PATH_STAGE_LIB)/wined3d$(VBOX_SUFF_LIB)

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d9/device.c

@@ -3714 +3714 @@
 };
 
+#if defined(VBOX) && defined(RT_ARCH_AMD64)
+DECLASM(uint16_t) VBoxAsmFpuFCWGet();
+DECLASM(void) VBoxAsmFpuFCWSet(uint16_t u16FCW);
+#endif
+
 static void setup_fpu(void)
 {
@@ -3726 +3731 @@
     cw = (cw & ~0xf3f) | 0x3f;
     __asm fldcw cw;
-#elif defined(RT_ARCH_AMD64)
-    /* @todo: impl*/
+#elif defined(VBOX) && defined(RT_ARCH_AMD64)
+    uint16_t cw = VBoxAsmFpuFCWGet();
+    cw = (cw & ~0xf3f) | 0x3f;
+    VBoxAsmFpuFCWSet(cw);
 #else
     FIXME("FPU setup not implemented for this platform.\n");