Changeset 35335 in vbox for trunk/src/VBox
- Timestamp:
- Dec 27, 2010 12:34:40 PM (14 years ago)
- Location:
- trunk/src/VBox/VMM
- Files:
-
- 25 deleted
- 1 edited
- 26 copied
- 1 moved
-
Makefile.kmk (modified) (6 diffs)
-
PATM/VMMGC (deleted)
-
VMMRC (moved) (moved from trunk/src/VBox/VMM/VMMGC )
-
VMMRC/CPUMGC.cpp (deleted)
-
VMMRC/CPUMGCA.asm (deleted)
-
VMMRC/CPUMRC.cpp (copied) (copied from trunk/src/VBox/VMM/VMMGC/CPUMGC.cpp )
-
VMMRC/CPUMRCA.asm (copied) (copied from trunk/src/VBox/VMM/VMMGC/CPUMGCA.asm ) (1 diff)
-
VMMRC/CSAMRC.cpp (copied) (copied from trunk/src/VBox/VMM/PATM/VMMGC/CSAMGC.cpp )
-
VMMRC/EMGCA.asm (deleted)
-
VMMRC/EMRCA.asm (copied) (copied from trunk/src/VBox/VMM/VMMGC/EMGCA.asm )
-
VMMRC/HWACCMGCA.asm (deleted)
-
VMMRC/HWACCMRCA.asm (copied) (copied from trunk/src/VBox/VMM/VMMGC/HWACCMGCA.asm )
-
VMMRC/IOMGC.cpp (deleted)
-
VMMRC/IOMRC.cpp (copied) (copied from trunk/src/VBox/VMM/VMMGC/IOMGC.cpp )
-
VMMRC/MMRamGC.cpp (deleted)
-
VMMRC/MMRamGCA.asm (deleted)
-
VMMRC/MMRamRC.cpp (copied) (copied from trunk/src/VBox/VMM/VMMGC/MMRamGC.cpp )
-
VMMRC/MMRamRCA.asm (copied) (copied from trunk/src/VBox/VMM/VMMGC/MMRamGCA.asm )
-
VMMRC/PATMRC.cpp (copied) (copied from trunk/src/VBox/VMM/PATM/VMMGC/PATMGC.cpp )
-
VMMRC/PDMGCDevice.cpp (deleted)
-
VMMRC/PDMRCDevice.cpp (copied) (copied from trunk/src/VBox/VMM/VMMGC/PDMGCDevice.cpp )
-
VMMRC/PGMGC.cpp (deleted)
-
VMMRC/PGMGCBth.h (deleted)
-
VMMRC/PGMGCGst.h (deleted)
-
VMMRC/PGMGCShw.h (deleted)
-
VMMRC/PGMRC.cpp (copied) (copied from trunk/src/VBox/VMM/VMMGC/PGMGC.cpp ) (12 diffs)
-
VMMRC/PGMRCBth.h (copied) (copied from trunk/src/VBox/VMM/VMMGC/PGMGCBth.h )
-
VMMRC/PGMRCGst.h (copied) (copied from trunk/src/VBox/VMM/VMMGC/PGMGCGst.h )
-
VMMRC/PGMRCShw.h (copied) (copied from trunk/src/VBox/VMM/VMMGC/PGMGCShw.h )
-
VMMRC/SELMGC.cpp (deleted)
-
VMMRC/SELMRC.cpp (copied) (copied from trunk/src/VBox/VMM/VMMGC/SELMGC.cpp )
-
VMMRC/TRPMGC.cpp (deleted)
-
VMMRC/TRPMGCHandlers.cpp (deleted)
-
VMMRC/TRPMGCHandlersA.asm (deleted)
-
VMMRC/TRPMRC.cpp (copied) (copied from trunk/src/VBox/VMM/VMMGC/TRPMGC.cpp )
-
VMMRC/TRPMRCHandlers.cpp (copied) (copied from trunk/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp )
-
VMMRC/TRPMRCHandlersA.asm (copied) (copied from trunk/src/VBox/VMM/VMMGC/TRPMGCHandlersA.asm ) (1 diff)
-
VMMRC/VMMGC.cpp (deleted)
-
VMMRC/VMMGC.def (deleted)
-
VMMRC/VMMGC.mac (deleted)
-
VMMRC/VMMGC0.asm (deleted)
-
VMMRC/VMMGC99.asm (deleted)
-
VMMRC/VMMGCA.asm (deleted)
-
VMMRC/VMMGCBuiltin.def (deleted)
-
VMMRC/VMMGCDeps.cpp (deleted)
-
VMMRC/VMMRC.cpp (copied) (copied from trunk/src/VBox/VMM/VMMGC/VMMGC.cpp )
-
VMMRC/VMMRC.def (copied) (copied from trunk/src/VBox/VMM/VMMGC/VMMGC.def )
-
VMMRC/VMMRC.mac (copied) (copied from trunk/src/VBox/VMM/VMMGC/VMMGC.mac )
-
VMMRC/VMMRC0.asm (copied) (copied from trunk/src/VBox/VMM/VMMGC/VMMGC0.asm ) (1 diff)
-
VMMRC/VMMRC99.asm (copied) (copied from trunk/src/VBox/VMM/VMMGC/VMMGC99.asm ) (1 diff)
-
VMMRC/VMMRCA.asm (copied) (copied from trunk/src/VBox/VMM/VMMGC/VMMGCA.asm )
-
VMMRC/VMMRCBuiltin.def (copied) (copied from trunk/src/VBox/VMM/VMMGC/VMMGCBuiltin.def )
-
VMMRC/VMMRCDeps.cpp (copied) (copied from trunk/src/VBox/VMM/VMMGC/VMMGCDeps.cpp )
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/VMM/Makefile.kmk
r35333 r35335 183 183 endif 184 184 if defined(VBOX_WITH_WARNINGS_AS_ERRORS) && "$(KBUILD_TARGET)" == "win" 185 PDMBlkCache.cpp_CXXFLAGS = -WX- 185 ## @todo Alexander, please fix these warnings. 186 VMMR3/PDMBlkCache.cpp_CXXFLAGS = -WX- 186 187 endif 187 188 … … 246 247 247 248 # 248 # VMM GCBuiltin.lib249 # 250 LIBRARIES += VMM GCBuiltin251 VMM GCBuiltin_TEMPLATE = VBoxRc249 # VMMRCBuiltin.lib 250 # 251 LIBRARIES += VMMRCBuiltin 252 VMMRCBuiltin_TEMPLATE = VBoxRc 252 253 ifeq ($(VBOX_LDR_FMT32),pe) 253 VMM GCBuiltin_SOURCES = VMMGC/VMMGCBuiltin.def254 VMMRCBuiltin_SOURCES = VMMRC/VMMRCBuiltin.def 254 255 endif 255 256 ifeq ($(VBOX_LDR_FMT32),lx) 256 VMM GCBuiltin_SOURCES = $(PATH_VMMGCBuiltin)/VMMGCBuiltin.def257 $$(PATH_VMM GCBuiltin)/VMMGCBuiltin.def: $(PATH_SUB_CURRENT)/VMMGC/VMMGCBuiltin.def | $$(dir $$@)257 VMMRCBuiltin_SOURCES = $(PATH_VMMRCBuiltin)/VMMRCBuiltin.def 258 $$(PATH_VMMRCBuiltin)/VMMRCBuiltin.def: $(PATH_SUB_CURRENT)/VMMRC/VMMRCBuiltin.def | $$(dir $$@) 258 259 $(SED) -e '/not-os2/d' -e 's/^[ \t][ \t]*\([a-zA-Z]\)/ _\1/' -e 's/[ \t]DATA[ \t]*/ /' --output $@ $< 259 260 endif … … 261 262 262 263 # 263 # VMM GCImp.lib264 # 265 LIBRARIES += VMM GCImp266 VMM GCImp_TEMPLATE = VBoxRc267 VMM GCImp_SOURCES = $(PATH_VMMGCImp)/VMMGC.def268 VMM GCImp_CLEAN = $(PATH_VMMGCImp)/VMMGC.def269 270 $$(PATH_VMM GCImp)/VMMGC.def: $(PATH_SUB_CURRENT)/VMMGC/VMMGC.def | $$(dir $$@)264 # VMMRCImp.lib 265 # 266 LIBRARIES += VMMRCImp 267 VMMRCImp_TEMPLATE = VBoxRc 268 VMMRCImp_SOURCES = $(PATH_VMMRCImp)/VMMRC.def 269 VMMRCImp_CLEAN = $(PATH_VMMRCImp)/VMMRC.def 270 271 $$(PATH_VMMRCImp)/VMMRC.def: $(PATH_SUB_CURRENT)/VMMRC/VMMRC.def | $$(dir $$@) 271 272 ifeq ($(VBOX_LDR_FMT32),lx) 272 273 $(SED) \ … … 325 326 if defined(VBOX_WITH_RAW_MODE) && !defined(VBOX_ONLY_EXTPACKS) 326 327 # 327 # VMMGC.gc 328 # 329 SYSMODS += VMMGC 330 VMMGC_TEMPLATE = VBoxRc 331 VMMGC_SYSSUFF = .gc 332 333 VMMGC_DEFS = IN_VMM_RC IN_RT_RC IN_DIS DIS_CORE_ONLY VBOX_WITH_RAW_MODE $(VMM_COMMON_DEFS) 328 # VMMRC.gc 329 # 330 SYSMODS += VMMRC 331 VMMRC_TEMPLATE = VBoxRc 332 VMMRC_NAME = VMMGC 333 VMMRC_SYSSUFF = .gc 334 335 VMMRC_DEFS = IN_VMM_RC IN_RT_RC IN_DIS DIS_CORE_ONLY VBOX_WITH_RAW_MODE $(VMM_COMMON_DEFS) 334 336 ifeq ($(KBUILD_TARGET_ARCH),x86) 335 VMM GC_DEFS.darwin = VMM_R0_SWITCH_STACK336 VMM GC_DEFS.darwin = \337 VMMRC_DEFS.darwin = VMM_R0_SWITCH_STACK 338 VMMRC_DEFS.darwin = \ 337 339 VBOX_WITH_2X_4GB_ADDR_SPACE VBOX_WITH_2X_4GB_ADDR_SPACE_IN_RC \ 338 340 VBOX_WITH_HYBRID_32BIT_KERNEL VBOX_WITH_HYBRID_32BIT_KERNEL_IN_RC 339 341 endif 340 342 341 VMM GC_INCS := \343 VMMRC_INCS := \ 342 344 include \ 343 VMM GC \345 VMMRC \ 344 346 PATM 345 347 346 VMM GC_LIBS = \348 VMMRC_LIBS = \ 347 349 $(PATH_LIB)/DisasmRC$(VBOX_SUFF_LIB) \ 348 350 $(PATH_LIB)/RuntimeRC$(VBOX_SUFF_LIB) 349 351 ifneq ($(filter pe lx,$(VBOX_LDR_FMT32)),) 350 VMMGC_LIBS += \ 351 $(PATH_LIB)/VMMGCBuiltin$(VBOX_SUFF_LIB) 352 endif 353 354 VMMGC_SOURCES = \ 355 VMMGC/VMMGC0.asm \ 356 VMMGC/VMMGCDeps.cpp \ 357 VMMGC/CPUMGC.cpp \ 358 VMMGC/CPUMGCA.asm \ 359 VMMGC/EMGCA.asm \ 360 VMMGC/IOMGC.cpp \ 361 VMMGC/MMRamGC.cpp \ 362 VMMGC/MMRamGCA.asm \ 363 VMMGC/PDMGCDevice.cpp \ 364 VMMGC/PGMGC.cpp \ 365 VMMGC/SELMGC.cpp \ 366 VMMGC/TRPMGC.cpp \ 367 VMMGC/TRPMGCHandlers.cpp \ 368 VMMGC/TRPMGCHandlersA.asm \ 369 VMMGC/VMMGC.cpp \ 370 VMMGC/VMMGCA.asm \ 371 VMMGC/HWACCMGCA.asm \ 352 VMMRC_LIBS += \ 353 $(PATH_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) 354 endif 355 356 VMMRC_SOURCES = \ 357 VMMRC/VMMRC0.asm \ 358 VMMRC/VMMRCDeps.cpp \ 359 VMMRC/CPUMRC.cpp \ 360 VMMRC/CPUMRCA.asm \ 361 VMMRC/EMRCA.asm \ 362 VMMRC/IOMRC.cpp \ 363 VMMRC/MMRamRC.cpp \ 364 VMMRC/MMRamRCA.asm \ 365 VMMRC/PDMRCDevice.cpp \ 366 VMMRC/PGMRC.cpp \ 367 VMMRC/SELMRC.cpp \ 368 VMMRC/TRPMRC.cpp \ 369 VMMRC/TRPMRCHandlers.cpp \ 370 VMMRC/TRPMRCHandlersA.asm \ 371 VMMRC/VMMRC.cpp \ 372 VMMRC/VMMRCA.asm \ 373 VMMRC/HWACCMRCA.asm \ 374 VMMRC/CSAMRC.cpp \ 375 VMMRC/PATMRC.cpp \ 372 376 VMMRZ/DBGFRZ.cpp \ 373 377 VMMRZ/PGMRZDynMap.cpp \ … … 401 405 VMMAll/VMMAll.cpp \ 402 406 VMMAll/VMMAllA.asm \ 403 PATM/VMMGC/CSAMGC.cpp \404 407 PATM/VMMAll/CSAMAll.cpp \ 405 PATM/VMMGC/PATMGC.cpp \406 408 PATM/VMMAll/PATMAll.cpp 407 409 ifeq ($(VBOX_LDR_FMT32),pe) 408 VMM GC_SOURCES += VMMGC/VMMGC.def410 VMMRC_SOURCES += VMMRC/VMMRC.def 409 411 endif 410 412 ifeq ($(VBOX_LDR_FMT32),lx) 411 VMM GC_SOURCES += $(PATH_VMMGCImp)/VMMGC.def413 VMMRC_SOURCES += $(PATH_VMMRCImp)/VMMRC.def 412 414 endif 413 415 414 416 415 417 # the very last one. 416 VMM GC_SOURCES += VMMGC/VMMGC99.asm417 418 VMM GC/VMMGCDeps.cpp_CXXFLAGS.win = -Oi- -TC ## @todo rename VMMGCDeps.cpp to .c418 VMMRC_SOURCES += VMMRC/VMMRC99.asm 419 420 VMMRC/VMMRCDeps.cpp_CXXFLAGS.win = -Oi- -TC ## @todo rename VMMRCDeps.cpp to .c 419 421 endif # VBOX_WITH_RAW_MODE && !VBOX_ONLY_EXTPACKS 420 422 … … 554 556 PGMAllBth.obj PGMAllGst.obj PGMAllShw.obj: PGMAll.o 555 557 556 PGM GCBth.o PGMGCGst.o PGMGCShw.o \557 PGM GCBth.obj PGMGCGst.obj PGMGCShw.obj: PGMGC.o558 PGMRCBth.o PGMRCGst.o PGMRCShw.o \ 559 PGMRCBth.obj PGMRCGst.obj PGMRCShw.obj: PGMRC.o 558 560 559 561 PGMPhysRWTmpl.o PGMPhysRWTmpl.obj: PGMPhys.o -
trunk/src/VBox/VMM/VMMRC/CPUMRCA.asm
r35332 r35335 18 18 ;* Header Files * 19 19 ;******************************************************************************* 20 %include "VMM GC.mac"20 %include "VMMRC.mac" 21 21 %include "VBox/vm.mac" 22 22 %include "VBox/err.mac" -
trunk/src/VBox/VMM/VMMRC/PGMRC.cpp
r35332 r35335 29 29 #include <VBox/trpm.h> 30 30 #include <VBox/rem.h> 31 #include " ../PGMInternal.h"31 #include "PGMInternal.h" 32 32 #include <VBox/vm.h> 33 #include " ../PGMInline.h"33 #include "PGMInline.h" 34 34 35 35 #include <iprt/asm.h> … … 55 55 #define PGM_SHW_TYPE PGM_TYPE_32BIT 56 56 #define PGM_SHW_NAME(name) PGM_SHW_NAME_32BIT(name) 57 #include "PGM GCShw.h"57 #include "PGMRCShw.h" 58 58 59 59 /* Guest - real mode */ … … 61 61 #define PGM_GST_NAME(name) PGM_GST_NAME_REAL(name) 62 62 #define PGM_BTH_NAME(name) PGM_BTH_NAME_32BIT_REAL(name) 63 #include "PGM GCGst.h"64 #include "PGM GCBth.h"63 #include "PGMRCGst.h" 64 #include "PGMRCBth.h" 65 65 #undef PGM_BTH_NAME 66 66 #undef PGM_GST_TYPE … … 71 71 #define PGM_GST_NAME(name) PGM_GST_NAME_PROT(name) 72 72 #define PGM_BTH_NAME(name) PGM_BTH_NAME_32BIT_PROT(name) 73 #include "PGM GCGst.h"74 #include "PGM GCBth.h"73 #include "PGMRCGst.h" 74 #include "PGMRCBth.h" 75 75 #undef PGM_BTH_NAME 76 76 #undef PGM_GST_TYPE … … 81 81 #define PGM_GST_NAME(name) PGM_GST_NAME_32BIT(name) 82 82 #define PGM_BTH_NAME(name) PGM_BTH_NAME_32BIT_32BIT(name) 83 #include "PGM GCGst.h"84 #include "PGM GCBth.h"83 #include "PGMRCGst.h" 84 #include "PGMRCBth.h" 85 85 #undef PGM_BTH_NAME 86 86 #undef PGM_GST_TYPE … … 98 98 #define PGM_SHW_NAME(name) PGM_SHW_NAME_PAE(name) 99 99 #define PGM_BTH_NAME(name) PGM_BTH_NAME_PAE_REAL(name) 100 #include "PGM GCShw.h"100 #include "PGMRCShw.h" 101 101 102 102 /* Guest - real mode */ … … 104 104 #define PGM_GST_NAME(name) PGM_GST_NAME_REAL(name) 105 105 #define PGM_BTH_NAME(name) PGM_BTH_NAME_PAE_REAL(name) 106 #include "PGM GCBth.h"106 #include "PGMRCBth.h" 107 107 #undef PGM_BTH_NAME 108 108 #undef PGM_GST_TYPE … … 113 113 #define PGM_GST_NAME(name) PGM_GST_NAME_PROT(name) 114 114 #define PGM_BTH_NAME(name) PGM_BTH_NAME_PAE_PROT(name) 115 #include "PGM GCBth.h"115 #include "PGMRCBth.h" 116 116 #undef PGM_BTH_NAME 117 117 #undef PGM_GST_TYPE … … 122 122 #define PGM_GST_NAME(name) PGM_GST_NAME_32BIT(name) 123 123 #define PGM_BTH_NAME(name) PGM_BTH_NAME_PAE_32BIT(name) 124 #include "PGM GCBth.h"124 #include "PGMRCBth.h" 125 125 #undef PGM_BTH_NAME 126 126 #undef PGM_GST_TYPE … … 131 131 #define PGM_GST_NAME(name) PGM_GST_NAME_PAE(name) 132 132 #define PGM_BTH_NAME(name) PGM_BTH_NAME_PAE_PAE(name) 133 #include "PGM GCGst.h"134 #include "PGM GCBth.h"133 #include "PGMRCGst.h" 134 #include "PGMRCBth.h" 135 135 #undef PGM_BTH_NAME 136 136 #undef PGM_GST_TYPE … … 146 146 #define PGM_SHW_TYPE PGM_TYPE_AMD64 147 147 #define PGM_SHW_NAME(name) PGM_SHW_NAME_AMD64(name) 148 #include "PGM GCShw.h"148 #include "PGMRCShw.h" 149 149 150 150 #ifdef VBOX_WITH_64_BITS_GUESTS … … 153 153 #define PGM_GST_NAME(name) PGM_GST_NAME_AMD64(name) 154 154 #define PGM_BTH_NAME(name) PGM_BTH_NAME_AMD64_AMD64(name) 155 #include "PGM GCGst.h"156 #include "PGM GCBth.h"155 #include "PGMRCGst.h" 156 #include "PGMRCBth.h" 157 157 #undef PGM_BTH_NAME 158 158 #undef PGM_GST_TYPE -
trunk/src/VBox/VMM/VMMRC/TRPMRCHandlersA.asm
r35332 r35335 18 18 ;* Header Files * 19 19 ;******************************************************************************* 20 %include "VMM GC.mac"20 %include "VMMRC.mac" 21 21 %include "VBox/x86.mac" 22 22 %include "VBox/cpum.mac" -
trunk/src/VBox/VMM/VMMRC/VMMRC0.asm
r35332 r35335 16 16 ; 17 17 18 %include "VMM GC.mac"18 %include "VMMRC.mac" 19 19 20 20 -
trunk/src/VBox/VMM/VMMRC/VMMRC99.asm
r35332 r35335 15 15 ; 16 16 17 %include "VMM GC.mac"17 %include "VMMRC.mac" 18 18 19 19
Note:
See TracChangeset
for help on using the changeset viewer.
