Changeset 41155 in vbox for trunk/src/VBox/VMM

Timestamp:

May 3, 2012 11:33:24 PM (13 years ago)

Author:

vboxsync

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

77772

Message:

alignment and build fixes.

Location:

trunk/src/VBox/VMM

Files:

• include/VMMInternal.h (modified) (3 diffs)
• include/VMMInternal.mac (modified) (2 diffs)
• testcase/Makefile.kmk (modified) (1 diff)
• testcase/tstAsmStructs.cpp (modified) (2 diffs)

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

@@ -412 +412 @@
     RCPTRTYPE(uint8_t *)        pbEMTStackBottomRC;
 
-#ifdef LOG_ENABLED
     /** Pointer to the R0 logger instance - R3 Ptr.
      * This is NULL if logging is disabled. */
@@ -419 +418 @@
      * This is NULL if logging is disabled. */
     R0PTRTYPE(PVMMR0LOGGER)     pR0LoggerR0;
-#endif
 
     /** @name Rendezvous
@@ -449 +447 @@
     uint64_t                    u64CallRing3Arg;
     /** The Ring-0 jmp buffer.
-     * @remarks The size of this type isn't stable in assembly, so don't put 
+     * @remarks The size of this type isn't stable in assembly, so don't put
      *          anything that needs to be accessed from assembly after it. */
     VMMR0JMPBUF                 CallRing3JmpBufR0;

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

@@ -98 +98 @@
 
 struc VMMCPU
-                                
+
         .offVMCPU               resd 1
         .iLastGZRc              resd 1
@@ -104 +104 @@
         .pbEMTStackRC           RTRCPTR_RES 1
         .pbEMTStackBottomRC     RTRCPTR_RES 1
-%ifdef LOG_ENABLED
+
         .pR0LoggerR3            RTR3PTR_RES 1
         .pR0LoggerR0            RTR0PTR_RES 1
-%endif
 
         .fInRendezvous          resb 1

trunk/src/VBox/VMM/testcase/Makefile.kmk

@@ -386 +386 @@
         $(QUIET)$(RM) -f $@ [email protected] [email protected]
         $(QUIET)$(REDIRECT) -wo [email protected] -- $(VBOX_NM) $<
-        $(QUIET)$(SED) -e '/STAMPROFILEADV/d' \
-               -e '/00[0-9a-fA-F]* [aA] [^_.]*\./!d'       -e 's/\(00[0-9a-fA-F]*\) [aA] \([^.]*\)\.\(.*$$\)/    CHECK_OFF(\2, 0x0\1, \3);/' \
-               --output [email protected] [email protected]
-        $(QUIET)$(SED) -e '/VM_size$$/d' -e '/VMCPU_size$$/d' \
-               -e '/00[0-9a-fA-F]* [aA] [^_.]*_size$$/!d'  -e 's/\(00[0-9a-fA-F]*\) [aA] \([^_.]*\)_size/    CHECK_SIZE(\2, 0x0\1);/' \
-               --append [email protected] [email protected]
+        $(QUIET)$(SED) \
+                -e '/STAMPROFILEADV/d' \
+                \
+                -e '/00[0-9a-fA-F]* [aA] [^_.]*\./!d' \
+                -e 's/\(00[0-9a-fA-F]*\) [aA] \([^.]*\)\.\(.*$$\)/    CHECK_OFF(\2, 0x0\1, \3);/' \
+                --output [email protected] [email protected]
+        $(QUIET)$(SED) \
+                -e '/VM_size$$/d' \
+                -e '/VMCPU_size$$/d' \
+                -e '/VMMCPU_size$$/d' \
+                -e '/SUPDRVTRACERUSRCTX32_size$$/d' \
+                \
+                -e '/00[0-9a-fA-F]* [aA] [^_.]*_size$$/!d' \
+                -e 's/\(00[0-9a-fA-F]*\) [aA] \([^_.]*\)_size/    CHECK_SIZE(\2, 0x0\1);/' \
+                --append [email protected] [email protected]
         $(QUIET)$(MV) -f [email protected] $@
         $(QUIET)$(RM) -f [email protected]

trunk/src/VBox/VMM/testcase/tstAsmStructs.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -31 +31 @@
 #include <stdio.h>
 
-#define SUPDRVTRACERUSRCTX32 SUPDRVTRACERUSRCTX
-#define SUPDRVTRACERUSRCTX64 SUPDRVTRACERUSRCTX
+
+/* For sup.mac simplifications. */
+#define SUPDRVTRACERUSRCTX32    SUPDRVTRACERUSRCTX
+#define SUPDRVTRACERUSRCTX64    SUPDRVTRACERUSRCTX