Changeset 9501 in vbox

Timestamp:

Jun 8, 2008 1:15:34 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

31772

Message:

Preparing 64-bit guest additions building (focusing on windows atm.)

Location:

trunk/src/VBox/Additions/WINNT/VBoxGuest

Files:

• Makefile.kmk (modified) (5 diffs)
• VBoxGuest.cpp (modified) (8 diffs)

trunk/src/VBox/Additions/WINNT/VBoxGuest/Makefile.kmk

@@ -28 +28 @@
 #
 SYSMODS += VBoxGuest
+ifdef VBOX_WITH_64BIT_ADDITIONS
+VBoxGuest_TEMPLATE    = VBOXGUESTR0
+else
 VBoxGuest_TEMPLATE    = VBOXW32GUESTR0
+VBoxGuest_SDKS        = W2K3DDKX86 WINPSDKINCS
+endif
 ifdef VBOX_SIGN_ADDITIONS
  VBoxGuest_NOINST     = true
 endif
-VBoxGuest_SDKS        = W2K3DDKX86 WINPSDKINCS
 VBoxGuest_DEFS        = LOG_TO_BACKDOOR VBGL_VBOXGUEST VBOX_HGCM VBOX_REBOOT_ON_UNINSTALL
 #VBoxGuest_DEFS       += LOG_ENABLED
 VBoxGuest_INCS        = ../include
+ifdef VBOX_WITH_64BIT_ADDITIONS
+VBoxGuest_LDFLAGS.x86   = -Entry:DriverEntry@8
+VBoxGuest_LDFLAGS.amd64 = -Entry:DriverEntry
+else
 VBoxGuest_LDFLAGS     = -Entry:DriverEntry@8
+endif
 VBoxGuest_SOURCES     = \
         VBoxGuest.cpp \
@@ -42 +51 @@
         Helper.cpp \
         VBoxGuest.rc
+ifdef VBOX_WITH_64BIT_ADDITIONS
+VBoxGuest_LIBS        = \
+        $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \
+        $(PATH_SDK_W2K3DDK_LIB)/hal.lib \
+        $(PATH_SDK_W2K3DDK_LIB)/win32k.lib \
+        $(VBOX_LIB_VBGL_R0BASE) \
+        $(VBOX_LIB_IPRT_GUEST_R0)
+else
 VBoxGuest_LIBS        = \
         $(PATH_SDK_W2K3DDKX86_LIB)/int64.lib \
         $(PATH_SDK_W2K3DDKX86_LIB)/win32k.lib \
         $(PATH_SDK_W2K3DDKX86_LIB)/ntoskrnl.lib \
-        $(PATH_SDK_W2K3DDKX86_LIB)/hal.lib \
+        $(PATH_SDK_W2K3DDKX86_LIB)/hal.lib
         $(PATH_LIB)/additions/VBoxGuestLibBase$(VBOXW32GUEST_SUFF_LIB) \
         $(PATH_LIB)/additions/RuntimeW32GuestR0$(VBOXW32GUEST_SUFF_LIB)
+endif
 
 
 #
-# VBoxGuestNT - NT version of the driver.
+# VBoxGuestNT - NT version of the driver (x86 only).
 #
+ifdef VBOX_WITH_64BIT_ADDITIONS
+SYSMODS.x86 += VBoxGuestNT
+VBoxGuestNT_TEMPLATE  = VBOXGUESTR0
+else
 SYSMODS += VBoxGuestNT
 VBoxGuestNT_TEMPLATE  = VBOXW32GUESTR0
 VBoxGuestNT_SDKS      = W2K3DDKX86 WINPSDKINCS
+endif
 VBoxGuestNT_DEFS      = $(VBoxGuest_DEFS) TARGET_NT4
 VBoxGuestNT_INCS      = $(VBoxGuest_INCS)
@@ -65 +88 @@
         NTLegacy.cpp \
         VBoxGuest.rc
+ifdef VBOX_WITH_64BIT_ADDITIONS
+VBoxGuestNT_LIBS      = \
+        $(PATH_SDK_W2K3DDKX86_LIB)/exsup.lib \
+        $(PATH_SDK_W2K3DDKX86_LIB)/int64.lib \
+        $(PATH_SDK_W2K3DDKX86_LIB)/ntoskrnl.lib \
+        $(PATH_SDK_W2K3DDKX86_LIB)/hal.lib \
+        $(VBOX_LIB_VBGL_R0BASE) \
+        $(VBOX_LIB_IPRT_GUEST_R0_NT4)
+else
 VBoxGuestNT_LIBS      = \
         $(PATH_SDK_W2K3DDKX86_LIB)/exsup.lib \
@@ -72 +104 @@
         $(PATH_LIB)/additions/VBoxGuestLibBase$(VBOXW32GUEST_SUFF_LIB) \
         $(PATH_LIB)/additions/RuntimeW32NT4GuestR0$(VBOXW32GUEST_SUFF_LIB)
-#       $(PATH_SDK_W2K3DDKX86_LIB)/win32k.lib  - not needed?
-
+endif
 
 #
@@ -79 +110 @@
 #
 #PROGRAMS += VBoxGuestInst
-VBoxGuestInst_TEMPLATE= VBOXW32GUESTR3
+VBoxGuestInst_TEMPLATE= VBOXGUESTR3EXE
 VBoxGuestInst_SOURCES = VBoxGuestInst.cpp
 

trunk/src/VBox/Additions/WINNT/VBoxGuest/VBoxGuest.cpp

@@ -40 +40 @@
 
 #ifdef TARGET_NT4
-/* XP DDK #defines ExFreePool to ExFreePoolWithTag. The latter does not exist on NT4, so... 
+/* XP DDK #defines ExFreePool to ExFreePoolWithTag. The latter does not exist on NT4, so...
  * The same for ExAllocatePool.
  */
@@ -345 +345 @@
 
     dprintf(("VBoxHGCMCallback\n"));
-        
-    /* Possible problem with request completion right between the fu32Flags check and KeWaitForSingleObject 
+
+    /* Possible problem with request completion right between the fu32Flags check and KeWaitForSingleObject
      * call; introduce a timeout to make sure we don't wait indefinitely.
      */
@@ -357 +357 @@
          *       calling process is being killed.
          *       When alertable is TRUE, the wait sometimes ends with STATUS_USER_APC.
-         */ 
+         */
         NTSTATUS rc = KeWaitForSingleObject (&pDevExt->keventNotification, Executive,
                                              UserMode,
@@ -400 +400 @@
 #endif /* VBOX_HGCM */
 
-static bool
-__declspec (naked) __fastcall
-TestAndClearEvent (PVBOXGUESTDEVEXT pDevExt, int iBitOffset)
-{
-    _asm {
-        lock btr PVBOXGUESTDEVEXT[ecx].u32Events, edx;
-        setc al;
-        movzx eax, al;
-        ret;
-    }
-}
-
 static bool IsPowerOfTwo (uint32_t val)
 {
     return (val & (val - 1)) == 0;
-}
-
-static int __declspec (naked) __fastcall GetMsb32 (uint32_t val)
-{
-    _asm {
-        bsf eax, ecx;
-        ret;
-    }
 }
 
@@ -521 +501 @@
                     /* Calls to MmProbeAndLockPages must be enclosed in a try/except block. */
                     MmProbeAndLockPages (pMdl, KernelMode, IoModifyAccess);
-                } 
-                __except(EXCEPTION_EXECUTE_HANDLER) 
+                }
+                __except(EXCEPTION_EXECUTE_HANDLER)
                 {
                     dprintf(("MmProbeAndLockPages failed!\n"));
@@ -775 +755 @@
 
             eventInfo->u32EventFlagsOut = 0;
-            int iBitOffset = GetMsb32 (eventInfo->u32EventMaskIn);
+            int iBitOffset = ASMBitFirstSetU32 (eventInfo->u32EventMaskIn) - 1;
             bool fTimeout = (eventInfo->u32TimeoutIn != ~0L);
 
             dprintf (("mask = %d, iBitOffset = %d\n", iBitOffset, eventInfo->u32EventMaskIn));
 
-            /* Possible problem with request completion right between the pending event check and KeWaitForSingleObject 
+            /* Possible problem with request completion right between the pending event check and KeWaitForSingleObject
              * call; introduce a timeout (if none was specified) to make sure we don't wait indefinitely.
              */
@@ -791 +771 @@
             for (;;)
             {
-                bool fEventPending = TestAndClearEvent (pDevExt, iBitOffset);
+                bool fEventPending = ASMAtomicBitTestAndClear(&pDevExt->u32Events, iBitOffset);
                 if (fEventPending)
                 {
@@ -998 +978 @@
             Status = vboxHGCMVerifyIOBuffers (pStack,
                                               sizeof (VBoxGuestHGCMCallInfo));
-                                              
+
             if (Status != STATUS_SUCCESS)
             {