Changeset 62006 in vbox for trunk

Timestamp:

Jul 4, 2016 1:08:28 PM (9 years ago)

Author:

vboxsync

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

108456

Message:

Config.kmk,VMM: Reduced the VM structure by half on darwin where we have no recompiler or raw-mode. For paranoid reasons, this requires that the VBOX_WITH_REM and VBOX_WITH_RAW_MODE macros are defined globally.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• include/VBox/vmm/vm.h (modified) (4 diffs)
• include/VBox/vmm/vm.mac (modified) (1 diff)
• src/VBox/VMM/Makefile.kmk (modified) (6 diffs)
• src/VBox/VMM/testcase/tstVMStruct.h (modified) (2 diffs)
• src/VBox/VMM/testcase/tstVMStructSize.cpp (modified) (2 diffs)

trunk/Config.kmk

@@ -1535 +1535 @@
  DEFS += VBOX_WITH_64_BITS_GUESTS
 endif
+ifdef VBOX_WITH_REM
+ DEFS += VBOX_WITH_REM
+endif
+ifdef VBOX_WITH_RAW_MODE
+ DEFS += VBOX_WITH_RAW_MODE
+endif
 
 # Don't flood CDEFS, old MASMs doesn't like too many defines.
 ifdef VBOX_WITH_DEBUGGER
- DEFS += VBOX_WITH_DEBUGGER
+ CDEFS += VBOX_WITH_DEBUGGER
 endif
 ifdef VBOX_WITH_HARDENING

trunk/include/VBox/vmm/vm.h

@@ -1222 +1222 @@
     } ftm;
 
-//#ifdef VBOX_WITH_REM
+#ifdef VBOX_WITH_RAW_MODE
     /** PATM part. */
     union
@@ -1240 +1240 @@
         uint8_t     padding[1088];      /* multiple of 64 */
     } csam;
-
+#endif
+
+#ifdef VBOX_WITH_REM
     /** REM part. */
     union
@@ -1249 +1251 @@
         uint8_t     padding[0x11100];   /* multiple of 64 */
     } rem;
-//#endif
+#endif
 
     union
@@ -1288 +1290 @@
 
     /** Padding for aligning the cpu array on a page boundary. */
-//#ifdef VBOX_WITH_REM
+#if defined(VBOX_WITH_REM) && defined(VBOX_WITH_RAW_MODE)
     uint8_t         abAlignment2[3870];
-//#else
-//    uint8_t         abAlignment2[3870 + 1984];
-//#endif
+#elif defined(VBOX_WITH_REM) && !defined(VBOX_WITH_RAW_MODE)
+    uint8_t         abAlignment2[1630];
+#elif !defined(VBOX_WITH_REM) && defined(VBOX_WITH_RAW_MODE)
+    uint8_t         abAlignment2[30];
+#else
+    uint8_t         abAlignment2[1886];
+#endif
 
     /* ---- end small stuff ---- */

trunk/include/VBox/vmm/vm.mac

@@ -164 +164 @@
     .ssm                    resb 128
     .ftm                    resb 512
-;%ifdef VBOX_WITH_REM
+%ifdef VBOX_WITH_RAW_MODE
     .patm                   resb 768
     .csam                   resb 1088
+%endif
+%ifdef VBOX_WITH_REM
     .rem                    resb 0x11100
-;%endif
+%endif
     .gim                    resb 448
     .apic                   resb 128

trunk/src/VBox/VMM/Makefile.kmk

@@ -246 +246 @@
         VMMAll/PGMAllPhys.cpp \
         VMMAll/PGMAllPool.cpp \
-        VMMAll/REMAll.cpp \
         VMMAll/SELMAll.cpp \
         VMMAll/EMAll.cpp \
@@ -286 +285 @@
         VMMAll/APICAll.cpp
 endif
-
+ifdef VBOX_WITH_REM
+ VBoxVMM_SOURCES += \
+        VMMAll/REMAll.cpp
+endif
 ifdef VBOX_WITH_RAW_MODE
  VBoxVMM_SOURCES.x86 += \
@@ -517 +519 @@
         VMMAll/PGMAllPhys.cpp \
         VMMAll/PGMAllPool.cpp \
-        VMMAll/REMAll.cpp \
         VMMAll/SELMAll.cpp \
         VMMAll/TMAll.cpp \
@@ -538 +539 @@
  endif
  ifdef VBOX_WITH_NEW_APIC
-  VMMRC_SOURCES += VMMAll/APICAll.cpp
+  VMMRC_SOURCES += \
+        VMMAll/APICAll.cpp
  endif 
+ ifdef VBOX_WITH_REM
+  VMMRC_SOURCES += \
+        VMMAll/REMAll.cpp
+ endif
 
  # the very last one.
@@ -644 +650 @@
         VMMAll/PGMAllPhys.cpp \
         VMMAll/PGMAllPool.cpp \
-        VMMAll/REMAll.cpp \
         VMMAll/SELMAll.cpp \
         VMMAll/TMAll.cpp \
@@ -669 +674 @@
   VMMR0_SOURCES += \
         VMMAll/APICAll.cpp
+ endif
+ ifdef VBOX_WITH_REM
+  VMMR0_SOURCES += \
+        VMMAll/REMAll.cpp
  endif
  VMMR0_SOURCES.amd64 = \

trunk/src/VBox/VMM/testcase/tstVMStruct.h

@@ -1449 +1449 @@
     GEN_CHECK_OFF(VM, pdm);
     GEN_CHECK_OFF(VM, iom);
+#ifdef VBOX_WITH_RAW_MODE
     GEN_CHECK_OFF(VM, patm);
     GEN_CHECK_OFF(VM, csam);
+#endif
     GEN_CHECK_OFF(VM, em);
     GEN_CHECK_OFF(VM, tm);
@@ -1456 +1458 @@
     GEN_CHECK_OFF(VM, ssm);
     GEN_CHECK_OFF(VM, ftm);
+#ifdef VBOX_WITH_REM
     GEN_CHECK_OFF(VM, rem);
+#endif
     GEN_CHECK_OFF(VM, gim);
     GEN_CHECK_OFF(VM, vm);

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

@@ -233 +233 @@
     CHECK_PADDING_VM(64, gim);
     CHECK_PADDING_VM(64, ssm);
+#ifdef VBOX_WITH_REM
     CHECK_PADDING_VM(64, rem);
+#endif
     CHECK_PADDING_VM(8, vm);
     CHECK_PADDING_VM(8, cfgm);
@@ -297 +299 @@
     CHECK_MEMBER_ALIGNMENT(VM, vmm.s.StatRunRC, 8);
     CHECK_MEMBER_ALIGNMENT(VM, StatTotalQemuToGC, 8);
+#ifdef VBOX_WITH_REM
     CHECK_MEMBER_ALIGNMENT(VM, rem.s.uPendingExcptCR2, 8);
     CHECK_MEMBER_ALIGNMENT(VM, rem.s.StatsInQEMU, 8);
     CHECK_MEMBER_ALIGNMENT(VM, rem.s.Env, 64);
+#endif
 
     /* the VMCPUs are page aligned TLB hit reasons. */