Changeset 62232 in vbox

Timestamp:

Jul 13, 2016 7:42:20 PM (9 years ago)

Author:

vboxsync

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

108744

Message:

VMM: Try convince the microsoft linker to pick the right version of structures where we hide stuff using unions (VMCPU, VM, ++). Looks like it takes the last occurence.

Location:

trunk

Files:

• include/VBox/vmm/vm.h (modified) (13 diffs)
• src/VBox/VMM/Makefile.kmk (modified) (4 diffs)
• src/VBox/VMM/VMMAll/AllPdbTypeHack.cpp (added)

trunk/include/VBox/vmm/vm.h

@@ -138 +138 @@
      * @remarks This comes first as it allows the use of 8-bit immediates for the
      *          first 64 bytes of the structure, reducing code size a wee bit. */
-    union
+#ifdef ___IEMInternal_h /* For PDB hacking. */
+    union VMCPUUNIONIEMFULL
+#else
+    union VMCPUUNIONIEMSTUB
+#endif
     {
 #ifdef ___IEMInternal_h
@@ -147 +151 @@
 
     /** HM part. */
-    union
+    union VMCPUUNIONHM
     {
 #ifdef ___HMInternal_h
@@ -156 +160 @@
 
     /** EM part. */
-    union
+    union VMCPUUNIONEM
     {
 #ifdef ___EMInternal_h
@@ -165 +169 @@
 
     /** TRPM part. */
-    union
+    union VMCPUUNIONTRPM
     {
 #ifdef ___TRPMInternal_h
@@ -174 +178 @@
 
     /** TM part. */
-    union
+    union VMCPUUNIONTM
     {
 #ifdef ___TMInternal_h
@@ -183 +187 @@
 
     /** VMM part. */
-    union
+    union VMCPUUNIONVMM
     {
 #ifdef ___VMMInternal_h
@@ -192 +196 @@
 
     /** PDM part. */
-    union
+    union VMCPUUNIONPDM
     {
 #ifdef ___PDMInternal_h
@@ -201 +205 @@
 
     /** IOM part. */
-    union
+    union VMCPUUNIONIOM
     {
 #ifdef ___IOMInternal_h
@@ -211 +215 @@
     /** DBGF part.
      * @todo Combine this with other tiny structures. */
-    union
+    union VMCPUUNIONDBGF
     {
 #ifdef ___DBGFInternal_h
@@ -220 +224 @@
 
     /** GIM part. */
-    union
+    union VMCPUUNIONGIM
     {
 #ifdef ___GIMInternal_h
@@ -229 +233 @@
 
     /** APIC part. */
-    union
+    union VMCPUUNIONAPIC
     {
 #ifdef ___APICInternal_h
@@ -253 +257 @@
 
     /** PGM part. */
-    union
+    union VMCPUUNIONPGM
     {
 #ifdef ___PGMInternal_h
@@ -262 +266 @@
 
     /** CPUM part. */
-    union
+    union VMCPUUNIONCPUM
     {
 #ifdef ___CPUMInternal_h

trunk/src/VBox/VMM/Makefile.kmk

@@ -341 +341 @@
 $(call VBOX_SET_VER_INFO_DLL,VBoxVMM,VirtualBox VMM) # Version info / description.
 
+if "$(KBUILD_TARGET)" == "win" && !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS)
+ #
+ # Debug type info hack for VMCPU, VM and similar.
+ #
+ # The microsoft linker seems to be using the last occurence of the structures
+ # when writing the module PDB file.  So, we put the fully complete structures
+ # in a library which is at the end of the library list.
+ #
+ VBoxVMM_LIBS    += $(VBoxVMMPdbTypeHack_1_TARGET)
+ VBoxVMM_LDFLAGS += /Export:PdbTypeHack
+
+ LIBRARIES += VBoxVMMPdbTypeHack
+ VBoxVMMPdbTypeHack_TEMPLATE = VBoxR3DllNoPic
+ VBoxVMMPdbTypeHack_SOURCES  = VMMAll/AllPdbTypeHack.cpp
+ VBoxVMMPdbTypeHack_DEFS     = $(VBoxVMM_DEFS)
+ VBoxVMMPdbTypeHack_INCS     = $(VBoxVMM_INCS)
+
+endif
+
 
 if defined(VBOX_WITH_RAW_MODE) && $(intersects $(VBOX_LDR_FMT32), pe lx)
@@ -548 +567 @@
  endif
 
- # the very last one.
- VMMRC_SOURCES += VMMRC/VMMRC99.asm
+ # The very last one.
+ VMMRC_SOURCES += \
+        VMMRC/VMMRC99.asm
 
  VMMRC/VMMRCDeps.cpp_CXXFLAGS.win = -Oi- -TC ## @todo rename VMMRCDeps.cpp to .c
@@ -558 +578 @@
   VMMRC_VMMAll/IEMAll.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
  endif
+
+ if "$(KBUILD_TARGET)" == "win"
+  # Debug type info hack for VMCPU, VM and similar.  See VBoxVMM for details.
+  VMMRC_LIBS    += $(VMMRCPdbTypeHack_1_TARGET)
+  VMMRC_LDFLAGS += /Export:PdbTypeHack
+
+  LIBRARIES += VMMRCPdbTypeHack
+  VMMRCPdbTypeHack_TEMPLATE       = $(VMMRC_TEMPLATE)
+  VMMRCPdbTypeHack_SOURCES        = VMMAll/AllPdbTypeHack.cpp
+  VMMRCPdbTypeHack_DEFS           = $(VMMRC_DEFS)
+  VMMRCPdbTypeHack_DEFS.win       = $(VMMRC_DEFS.win)
+  VMMRCPdbTypeHack_DEFS.win.x86   = $(VMMRC_DEFS.win.x86)
+  VMMRCPdbTypeHack_DEFS.win.amd64 = $(VMMRC_DEFS.win.amd64)
+  VMMRCPdbTypeHack_INCS           = $(VMMRC_INCS)
+ endif
+
 endif # VBOX_WITH_RAW_MODE && !VBOX_ONLY_EXTPACKS
 
@@ -699 +735 @@
   VMMR0_VMMAll/IEMAll.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
  endif
+
+ if "$(KBUILD_TARGET)" == "win"
+  # Debug type info hack for VMCPU, VM and similar.  See VBoxVMM for details.
+  VMMR0_LIBS    += $(VMMR0PdbTypeHack_1_TARGET)
+  VMMR0_LDFLAGS += /Export:PdbTypeHack
+
+  LIBRARIES += VMMR0PdbTypeHack
+  VMMR0PdbTypeHack_TEMPLATE       = $(VMMR0_TEMPLATE)
+  VMMR0PdbTypeHack_SOURCES        = VMMAll/AllPdbTypeHack.cpp
+  VMMR0PdbTypeHack_DEFS           = $(VMMR0_DEFS)
+  VMMR0PdbTypeHack_DEFS.win       = $(VMMR0_DEFS.win)
+  VMMR0PdbTypeHack_DEFS.win.x86   = $(VMMR0_DEFS.win.x86)
+  VMMR0PdbTypeHack_DEFS.win.amd64 = $(VMMR0_DEFS.win.amd64)
+  VMMR0PdbTypeHack_INCS           = $(VMMR0_INCS)
+ endif
+
 endif # !VBOX_ONLY_EXTPACKS