Changeset 45786 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Apr 26, 2013 10:35:59 PM (12 years ago)

Author:

vboxsync

Message:

Move HMRCA.asm into the switcher code so we don't need VMMRC.rc.

Location:

trunk/src/VBox/VMM/include

Files:

• HMInternal.h (modified) (1 diff)
• VMMSwitcher.mac (modified) (1 diff)

trunk/src/VBox/VMM/include/HMInternal.h

@@ -316 +316 @@
     /** 32 to 64 bits switcher entrypoint. */
     R0PTRTYPE(PFNHMSWITCHERHC)  pfnHost32ToGuest64R0;
-
-    /* AMD-V 64 bits vmrun handler */
-    RTRCPTR                     pfnSVMGCVMRun64;
-
-    /* VT-x 64 bits vmlaunch handler */
-    RTRCPTR                     pfnVMXGCStartVM64;
-
-    /* RC handler to setup the 64 bits FPU state. */
-    RTRCPTR                     pfnSaveGuestFPU64;
-
-    /* RC handler to setup the 64 bits debug state. */
-    RTRCPTR                     pfnSaveGuestDebug64;
-
-    /* Test handler */
-    RTRCPTR                     pfnTest64;
-
-    RTRCPTR                     uAlignment[2];
-/*#elif defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
-    uint32_t                    u32Alignment[1]; */
+    RTR0PTR                     uPadding2;
 #endif
 

trunk/src/VBox/VMM/include/VMMSwitcher.mac

@@ -128 +128 @@
 
 %ifdef DEBUG_STUFF
-    %define DEBUG_CHAR(ch) COM_CHAR ch
-    %define DEBUG_S_CHAR(ch) COM_S_CHAR ch
+    %define DEBUG_CHAR(ch)      COM_CHAR ch
+    %define DEBUG32_CHAR(ch)    COM_CHAR ch
+    %define DEBUG64_CHAR(ch)    COM_CHAR ch
+    %define DEBUG_S_CHAR(ch)    COM_S_CHAR ch
+    %define DEBUG32_S_CHAR(ch)  COM32_S_CHAR ch
+    %define DEBUG64_S_CHAR(ch)  COM64_S_CHAR ch
 %else
     %define DEBUG_CHAR(ch)
+    %define DEBUG32_CHAR(ch)
+    %define DEBUG64_CHAR(ch)
     %define DEBUG_S_CHAR(ch)
+    %define DEBUG32_S_CHAR(ch)
+    %define DEBUG64_S_CHAR(ch)
 %endif