Changeset 108142 in vbox
- Timestamp:
- Feb 10, 2025 2:38:31 PM (11 days ago)
- svn:sync-xref-src-repo-rev:
- 167443
- Location:
- trunk/src/VBox/VMM
- Files:
-
- 3 edited
- 5 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/VMM/.scm-settings
r108135 r108142 31 31 --filter-out-files /testcase/dev.tar.gz 32 32 33 /include/PGMGstDefs .h: --no-fix-header-guards33 /include/PGMGstDefs-x86.h: --no-fix-header-guards 34 34 /include/PGMSlatDefs.h: --no-fix-header-guards 35 35 /VMMR0/PGMR0Bth.h: --no-fix-header-guards 36 36 /VMMR3/PGMPhysRWTmpl.h: --no-fix-header-guards 37 /VMMRC/PGMRCBth.h: --no-fix-header-guards 38 /VMMRC/PGMRCShw.h: --no-fix-header-guards 39 /VMMRC/PGMRCGst.h: --no-fix-header-guards 40 /VMMAll/PGMAllBth.h: --no-fix-header-guards 41 /VMMAll/PGMAllGst.h: --no-fix-header-guards 42 /VMMAll/PGMAllGst-armv8.h: --no-fix-header-guards 43 /VMMAll/PGMAllShw.h: --no-fix-header-guards 37 /VMMAll/PGMAll*-*.cpp.h: --no-fix-header-guards 44 38 /VMMAll/IEMAllInstCommonBodyMacros.h: --no-fix-header-guards 45 39 /VMMAll/IEMAllN8veLiveness.h: --no-fix-header-guards -
trunk/src/VBox/VMM/Makefile.kmk
r108132 r108142 1205 1205 PGMInternal.o: PGM.o 1206 1206 1207 PGMAllBth.o PGMAllGst.o PGMAllShw.o \ 1208 PGMAllBth.obj PGMAllGst.obj PGMAllShw.obj: PGMAll.o 1209 1210 PGMRCBth.o PGMRCGst.o PGMRCShw.o \ 1211 PGMRCBth.obj PGMRCGst.obj PGMRCShw.obj: PGMRC.o 1207 PGMAllGst-x86.cpp.o PGMAllShw-x86.cpp.o PGMAllBth-x86.cpp.o \ 1208 PGMAllGst-armv8.cpp.o: PGMAll.o 1212 1209 1213 1210 PGMPhysRWTmpl.o PGMPhysRWTmpl.obj: PGMPhys.o -
trunk/src/VBox/VMM/VMMAll/PGMAll.cpp
r108134 r108142 102 102 # define PGM_SHW_TYPE PGM_TYPE_32BIT 103 103 # define PGM_SHW_NAME(name) PGM_SHW_NAME_32BIT(name) 104 # include "PGMAllShw .h"104 # include "PGMAllShw-x86.cpp.h" 105 105 106 106 /* Guest - real mode */ … … 110 110 # define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_32BIT_PT_FOR_PHYS 111 111 # define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_32BIT_PD_PHYS 112 # include "PGMGstDefs .h"113 # include "PGMAllGst .h"114 # include "PGMAllBth .h"112 # include "PGMGstDefs-x86.h" 113 # include "PGMAllGst-x86.cpp.h" 114 # include "PGMAllBth-x86.cpp.h" 115 115 # undef BTH_PGMPOOLKIND_PT_FOR_PT 116 116 # undef BTH_PGMPOOLKIND_ROOT … … 125 125 # define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_32BIT_PT_FOR_PHYS 126 126 # define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_32BIT_PD_PHYS 127 # include "PGMGstDefs .h"128 # include "PGMAllGst .h"129 # include "PGMAllBth .h"127 # include "PGMGstDefs-x86.h" 128 # include "PGMAllGst-x86.cpp.h" 129 # include "PGMAllBth-x86.cpp.h" 130 130 # undef BTH_PGMPOOLKIND_PT_FOR_PT 131 131 # undef BTH_PGMPOOLKIND_ROOT … … 141 141 # define BTH_PGMPOOLKIND_PT_FOR_BIG PGMPOOLKIND_32BIT_PT_FOR_32BIT_4MB 142 142 # define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_32BIT_PD 143 # include "PGMGstDefs .h"144 # include "PGMAllGst .h"145 # include "PGMAllBth .h"143 # include "PGMGstDefs-x86.h" 144 # include "PGMAllGst-x86.cpp.h" 145 # include "PGMAllBth-x86.cpp.h" 146 146 # undef BTH_PGMPOOLKIND_PT_FOR_BIG 147 147 # undef BTH_PGMPOOLKIND_PT_FOR_PT … … 161 161 # define PGM_SHW_NAME(name) PGM_SHW_NAME_PAE(name) 162 162 # define PGM_BTH_NAME(name) PGM_BTH_NAME_PAE_REAL(name) 163 # include "PGMAllShw .h"163 # include "PGMAllShw-x86.cpp.h" 164 164 165 165 /* Guest - real mode */ … … 169 169 # define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_PAE_PT_FOR_PHYS 170 170 # define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_PAE_PDPT_PHYS 171 # include "PGMGstDefs .h"172 # include "PGMAllBth .h"171 # include "PGMGstDefs-x86.h" 172 # include "PGMAllBth-x86.cpp.h" 173 173 # undef BTH_PGMPOOLKIND_PT_FOR_PT 174 174 # undef BTH_PGMPOOLKIND_ROOT … … 183 183 # define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_PAE_PT_FOR_PHYS 184 184 # define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_PAE_PDPT_PHYS 185 # include "PGMGstDefs .h"186 # include "PGMAllBth .h"185 # include "PGMGstDefs-x86.h" 186 # include "PGMAllBth-x86.cpp.h" 187 187 # undef BTH_PGMPOOLKIND_PT_FOR_PT 188 188 # undef BTH_PGMPOOLKIND_ROOT … … 198 198 # define BTH_PGMPOOLKIND_PT_FOR_BIG PGMPOOLKIND_PAE_PT_FOR_32BIT_4MB 199 199 # define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_PAE_PDPT_FOR_32BIT 200 # include "PGMGstDefs .h"201 # include "PGMAllBth .h"200 # include "PGMGstDefs-x86.h" 201 # include "PGMAllBth-x86.cpp.h" 202 202 # undef BTH_PGMPOOLKIND_PT_FOR_BIG 203 203 # undef BTH_PGMPOOLKIND_PT_FOR_PT … … 215 215 # define BTH_PGMPOOLKIND_PT_FOR_BIG PGMPOOLKIND_PAE_PT_FOR_PAE_2MB 216 216 # define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_PAE_PDPT 217 # include "PGMGstDefs .h"218 # include "PGMAllGst .h"219 # include "PGMAllBth .h"217 # include "PGMGstDefs-x86.h" 218 # include "PGMAllGst-x86.cpp.h" 219 # include "PGMAllBth-x86.cpp.h" 220 220 # undef BTH_PGMPOOLKIND_PT_FOR_BIG 221 221 # undef BTH_PGMPOOLKIND_PT_FOR_PT … … 234 234 # define PGM_SHW_TYPE PGM_TYPE_AMD64 235 235 # define PGM_SHW_NAME(name) PGM_SHW_NAME_AMD64(name) 236 # include "PGMAllShw .h"236 # include "PGMAllShw-x86.cpp.h" 237 237 238 238 /* Guest - protected mode (only used for AMD-V nested paging in 64 bits mode) */ … … 243 243 # define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_PAE_PT_FOR_PHYS 244 244 # define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_PAE_PD_PHYS 245 # include "PGMGstDefs .h"246 # include "PGMAllBth .h"245 # include "PGMGstDefs-x86.h" 246 # include "PGMAllBth-x86.cpp.h" 247 247 # undef BTH_PGMPOOLKIND_PT_FOR_PT 248 248 # undef BTH_PGMPOOLKIND_ROOT … … 259 259 # define BTH_PGMPOOLKIND_PT_FOR_BIG PGMPOOLKIND_PAE_PT_FOR_PAE_2MB 260 260 # define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_64BIT_PML4 261 # include "PGMGstDefs .h"262 # include "PGMAllGst .h"263 # include "PGMAllBth .h"261 # include "PGMGstDefs-x86.h" 262 # include "PGMAllGst-x86.cpp.h" 263 # include "PGMAllBth-x86.cpp.h" 264 264 # undef BTH_PGMPOOLKIND_PT_FOR_BIG 265 265 # undef BTH_PGMPOOLKIND_PT_FOR_PT … … 279 279 # define PGM_SHW_TYPE PGM_TYPE_NESTED_32BIT 280 280 # define PGM_SHW_NAME(name) PGM_SHW_NAME_NESTED_32BIT(name) 281 # include "PGMAllShw .h"281 # include "PGMAllShw-x86.cpp.h" 282 282 283 283 /* Guest - real mode */ … … 285 285 # define PGM_GST_NAME(name) PGM_GST_NAME_REAL(name) 286 286 # define PGM_BTH_NAME(name) PGM_BTH_NAME_NESTED_32BIT_REAL(name) 287 # include "PGMGstDefs .h"288 # include "PGMAllBth .h"287 # include "PGMGstDefs-x86.h" 288 # include "PGMAllBth-x86.cpp.h" 289 289 # undef PGM_BTH_NAME 290 290 # undef PGM_GST_TYPE … … 295 295 # define PGM_GST_NAME(name) PGM_GST_NAME_PROT(name) 296 296 # define PGM_BTH_NAME(name) PGM_BTH_NAME_NESTED_32BIT_PROT(name) 297 # include "PGMGstDefs .h"298 # include "PGMAllBth .h"297 # include "PGMGstDefs-x86.h" 298 # include "PGMAllBth-x86.cpp.h" 299 299 # undef PGM_BTH_NAME 300 300 # undef PGM_GST_TYPE … … 305 305 # define PGM_GST_NAME(name) PGM_GST_NAME_32BIT(name) 306 306 # define PGM_BTH_NAME(name) PGM_BTH_NAME_NESTED_32BIT_32BIT(name) 307 # include "PGMGstDefs .h"308 # include "PGMAllBth .h"307 # include "PGMGstDefs-x86.h" 308 # include "PGMAllBth-x86.cpp.h" 309 309 # undef PGM_BTH_NAME 310 310 # undef PGM_GST_TYPE … … 315 315 # define PGM_GST_NAME(name) PGM_GST_NAME_PAE(name) 316 316 # define PGM_BTH_NAME(name) PGM_BTH_NAME_NESTED_32BIT_PAE(name) 317 # include "PGMGstDefs .h"318 # include "PGMAllBth .h"317 # include "PGMGstDefs-x86.h" 318 # include "PGMAllBth-x86.cpp.h" 319 319 # undef PGM_BTH_NAME 320 320 # undef PGM_GST_TYPE … … 326 326 # define PGM_GST_NAME(name) PGM_GST_NAME_AMD64(name) 327 327 # define PGM_BTH_NAME(name) PGM_BTH_NAME_NESTED_32BIT_AMD64(name) 328 # include "PGMGstDefs .h"329 # include "PGMAllBth .h"328 # include "PGMGstDefs-x86.h" 329 # include "PGMAllBth-x86.cpp.h" 330 330 # undef PGM_BTH_NAME 331 331 # undef PGM_GST_TYPE … … 342 342 # define PGM_SHW_TYPE PGM_TYPE_NESTED_PAE 343 343 # define PGM_SHW_NAME(name) PGM_SHW_NAME_NESTED_PAE(name) 344 # include "PGMAllShw .h"344 # include "PGMAllShw-x86.cpp.h" 345 345 346 346 /* Guest - real mode */ … … 348 348 # define PGM_GST_NAME(name) PGM_GST_NAME_REAL(name) 349 349 # define PGM_BTH_NAME(name) PGM_BTH_NAME_NESTED_PAE_REAL(name) 350 # include "PGMGstDefs .h"351 # include "PGMAllBth .h"350 # include "PGMGstDefs-x86.h" 351 # include "PGMAllBth-x86.cpp.h" 352 352 # undef PGM_BTH_NAME 353 353 # undef PGM_GST_TYPE … … 358 358 # define PGM_GST_NAME(name) PGM_GST_NAME_PROT(name) 359 359 # define PGM_BTH_NAME(name) PGM_BTH_NAME_NESTED_PAE_PROT(name) 360 # include "PGMGstDefs .h"361 # include "PGMAllBth .h"360 # include "PGMGstDefs-x86.h" 361 # include "PGMAllBth-x86.cpp.h" 362 362 # undef PGM_BTH_NAME 363 363 # undef PGM_GST_TYPE … … 368 368 # define PGM_GST_NAME(name) PGM_GST_NAME_32BIT(name) 369 369 # define PGM_BTH_NAME(name) PGM_BTH_NAME_NESTED_PAE_32BIT(name) 370 # include "PGMGstDefs .h"371 # include "PGMAllBth .h"370 # include "PGMGstDefs-x86.h" 371 # include "PGMAllBth-x86.cpp.h" 372 372 # undef PGM_BTH_NAME 373 373 # undef PGM_GST_TYPE … … 378 378 # define PGM_GST_NAME(name) PGM_GST_NAME_PAE(name) 379 379 # define PGM_BTH_NAME(name) PGM_BTH_NAME_NESTED_PAE_PAE(name) 380 # include "PGMGstDefs .h"381 # include "PGMAllBth .h"380 # include "PGMGstDefs-x86.h" 381 # include "PGMAllBth-x86.cpp.h" 382 382 # undef PGM_BTH_NAME 383 383 # undef PGM_GST_TYPE … … 389 389 # define PGM_GST_NAME(name) PGM_GST_NAME_AMD64(name) 390 390 # define PGM_BTH_NAME(name) PGM_BTH_NAME_NESTED_PAE_AMD64(name) 391 # include "PGMGstDefs .h"392 # include "PGMAllBth .h"391 # include "PGMGstDefs-x86.h" 392 # include "PGMAllBth-x86.cpp.h" 393 393 # undef PGM_BTH_NAME 394 394 # undef PGM_GST_TYPE … … 405 405 # define PGM_SHW_TYPE PGM_TYPE_NESTED_AMD64 406 406 # define PGM_SHW_NAME(name) PGM_SHW_NAME_NESTED_AMD64(name) 407 # include "PGMAllShw .h"407 # include "PGMAllShw-x86.cpp.h" 408 408 409 409 /* Guest - real mode */ … … 411 411 # define PGM_GST_NAME(name) PGM_GST_NAME_REAL(name) 412 412 # define PGM_BTH_NAME(name) PGM_BTH_NAME_NESTED_AMD64_REAL(name) 413 # include "PGMGstDefs .h"414 # include "PGMAllBth .h"413 # include "PGMGstDefs-x86.h" 414 # include "PGMAllBth-x86.cpp.h" 415 415 # undef PGM_BTH_NAME 416 416 # undef PGM_GST_TYPE … … 421 421 # define PGM_GST_NAME(name) PGM_GST_NAME_PROT(name) 422 422 # define PGM_BTH_NAME(name) PGM_BTH_NAME_NESTED_AMD64_PROT(name) 423 # include "PGMGstDefs .h"424 # include "PGMAllBth .h"423 # include "PGMGstDefs-x86.h" 424 # include "PGMAllBth-x86.cpp.h" 425 425 # undef PGM_BTH_NAME 426 426 # undef PGM_GST_TYPE … … 431 431 # define PGM_GST_NAME(name) PGM_GST_NAME_32BIT(name) 432 432 # define PGM_BTH_NAME(name) PGM_BTH_NAME_NESTED_AMD64_32BIT(name) 433 # include "PGMGstDefs .h"434 # include "PGMAllBth .h"433 # include "PGMGstDefs-x86.h" 434 # include "PGMAllBth-x86.cpp.h" 435 435 # undef PGM_BTH_NAME 436 436 # undef PGM_GST_TYPE … … 441 441 # define PGM_GST_NAME(name) PGM_GST_NAME_PAE(name) 442 442 # define PGM_BTH_NAME(name) PGM_BTH_NAME_NESTED_AMD64_PAE(name) 443 # include "PGMGstDefs .h"444 # include "PGMAllBth .h"443 # include "PGMGstDefs-x86.h" 444 # include "PGMAllBth-x86.cpp.h" 445 445 # undef PGM_BTH_NAME 446 446 # undef PGM_GST_TYPE … … 452 452 # define PGM_GST_NAME(name) PGM_GST_NAME_AMD64(name) 453 453 # define PGM_BTH_NAME(name) PGM_BTH_NAME_NESTED_AMD64_AMD64(name) 454 # include "PGMGstDefs .h"455 # include "PGMAllBth .h"454 # include "PGMGstDefs-x86.h" 455 # include "PGMAllBth-x86.cpp.h" 456 456 # undef PGM_BTH_NAME 457 457 # undef PGM_GST_TYPE … … 468 468 # define PGM_SHW_TYPE PGM_TYPE_EPT 469 469 # define PGM_SHW_NAME(name) PGM_SHW_NAME_EPT(name) 470 # include "PGMAllShw .h"470 # include "PGMAllShw-x86.cpp.h" 471 471 472 472 /* Guest - real mode */ … … 475 475 # define PGM_BTH_NAME(name) PGM_BTH_NAME_EPT_REAL(name) 476 476 # define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_EPT_PT_FOR_PHYS 477 # include "PGMGstDefs .h"478 # include "PGMAllBth .h"477 # include "PGMGstDefs-x86.h" 478 # include "PGMAllBth-x86.cpp.h" 479 479 # undef BTH_PGMPOOLKIND_PT_FOR_PT 480 480 # undef PGM_BTH_NAME … … 487 487 # define PGM_BTH_NAME(name) PGM_BTH_NAME_EPT_PROT(name) 488 488 # define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_EPT_PT_FOR_PHYS 489 # include "PGMGstDefs .h"490 # include "PGMAllBth .h"489 # include "PGMGstDefs-x86.h" 490 # include "PGMAllBth-x86.cpp.h" 491 491 # undef BTH_PGMPOOLKIND_PT_FOR_PT 492 492 # undef PGM_BTH_NAME … … 499 499 # define PGM_BTH_NAME(name) PGM_BTH_NAME_EPT_32BIT(name) 500 500 # define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_EPT_PT_FOR_PHYS 501 # include "PGMGstDefs .h"502 # include "PGMAllBth .h"501 # include "PGMGstDefs-x86.h" 502 # include "PGMAllBth-x86.cpp.h" 503 503 # undef BTH_PGMPOOLKIND_PT_FOR_PT 504 504 # undef PGM_BTH_NAME … … 511 511 # define PGM_BTH_NAME(name) PGM_BTH_NAME_EPT_PAE(name) 512 512 # define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_EPT_PT_FOR_PHYS 513 # include "PGMGstDefs .h"514 # include "PGMAllBth .h"513 # include "PGMGstDefs-x86.h" 514 # include "PGMAllBth-x86.cpp.h" 515 515 # undef BTH_PGMPOOLKIND_PT_FOR_PT 516 516 # undef PGM_BTH_NAME … … 524 524 # define PGM_BTH_NAME(name) PGM_BTH_NAME_EPT_AMD64(name) 525 525 # define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_EPT_PT_FOR_PHYS 526 # include "PGMGstDefs .h"527 # include "PGMAllBth .h"526 # include "PGMGstDefs-x86.h" 527 # include "PGMAllBth-x86.cpp.h" 528 528 # undef BTH_PGMPOOLKIND_PT_FOR_PT 529 529 # undef PGM_BTH_NAME … … 541 541 # define PGM_SHW_TYPE PGM_TYPE_NONE 542 542 # define PGM_SHW_NAME(name) PGM_SHW_NAME_NONE(name) 543 # include "PGMAllShw .h"543 # include "PGMAllShw-x86.cpp.h" 544 544 545 545 /* Guest - real mode */ … … 547 547 # define PGM_GST_NAME(name) PGM_GST_NAME_REAL(name) 548 548 # define PGM_BTH_NAME(name) PGM_BTH_NAME_NONE_REAL(name) 549 # include "PGMGstDefs .h"550 # include "PGMAllBth .h"549 # include "PGMGstDefs-x86.h" 550 # include "PGMAllBth-x86.cpp.h" 551 551 # undef PGM_BTH_NAME 552 552 # undef PGM_GST_TYPE … … 557 557 # define PGM_GST_NAME(name) PGM_GST_NAME_PROT(name) 558 558 # define PGM_BTH_NAME(name) PGM_BTH_NAME_NONE_PROT(name) 559 # include "PGMGstDefs .h"560 # include "PGMAllBth .h"559 # include "PGMGstDefs-x86.h" 560 # include "PGMAllBth-x86.cpp.h" 561 561 # undef PGM_BTH_NAME 562 562 # undef PGM_GST_TYPE … … 567 567 # define PGM_GST_NAME(name) PGM_GST_NAME_32BIT(name) 568 568 # define PGM_BTH_NAME(name) PGM_BTH_NAME_NONE_32BIT(name) 569 # include "PGMGstDefs .h"570 # include "PGMAllBth .h"569 # include "PGMGstDefs-x86.h" 570 # include "PGMAllBth-x86.cpp.h" 571 571 # undef PGM_BTH_NAME 572 572 # undef PGM_GST_TYPE … … 577 577 # define PGM_GST_NAME(name) PGM_GST_NAME_PAE(name) 578 578 # define PGM_BTH_NAME(name) PGM_BTH_NAME_NONE_PAE(name) 579 # include "PGMGstDefs .h"580 # include "PGMAllBth .h"579 # include "PGMGstDefs-x86.h" 580 # include "PGMAllBth-x86.cpp.h" 581 581 # undef PGM_BTH_NAME 582 582 # undef PGM_GST_TYPE … … 588 588 # define PGM_GST_NAME(name) PGM_GST_NAME_AMD64(name) 589 589 # define PGM_BTH_NAME(name) PGM_BTH_NAME_NONE_AMD64(name) 590 # include "PGMGstDefs .h"591 # include "PGMAllBth .h"590 # include "PGMGstDefs-x86.h" 591 # include "PGMAllBth-x86.cpp.h" 592 592 # undef PGM_BTH_NAME 593 593 # undef PGM_GST_TYPE … … 963 963 #elif defined(VBOX_VMM_TARGET_ARMV8) 964 964 965 /** @todo Proper ARMv8 guest support for PGM */ 966 # include "PGMAllGst-armv8.h" 965 /** @todo Proper ARMv8 guest support for PGM; The idea is to cache the 966 * configuration register values and lazily reconfigure when they 967 * change. */ 968 # include "PGMAllGst-armv8.cpp.h" 967 969 968 970 #else
Note:
See TracChangeset
for help on using the changeset viewer.