VirtualBox

Changeset 108142 in vbox


Ignore:
Timestamp:
Feb 10, 2025 2:38:31 PM (11 days ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
167443
Message:

VMM/PGM: Renamed the PGMAll*.h files to indicate target/host. jiraref:VBP-1531

Location:
trunk/src/VBox/VMM
Files:
3 edited
5 moved

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/VMM/.scm-settings

    r108135 r108142  
    3131--filter-out-files /testcase/dev.tar.gz
    3232
    33 /include/PGMGstDefs.h: --no-fix-header-guards
     33/include/PGMGstDefs-x86.h: --no-fix-header-guards
    3434/include/PGMSlatDefs.h: --no-fix-header-guards
    3535/VMMR0/PGMR0Bth.h: --no-fix-header-guards
    3636/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
    4438/VMMAll/IEMAllInstCommonBodyMacros.h: --no-fix-header-guards
    4539/VMMAll/IEMAllN8veLiveness.h: --no-fix-header-guards
  • trunk/src/VBox/VMM/Makefile.kmk

    r108132 r108142  
    12051205PGMInternal.o: PGM.o
    12061206
    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
     1207PGMAllGst-x86.cpp.o PGMAllShw-x86.cpp.o PGMAllBth-x86.cpp.o \
     1208PGMAllGst-armv8.cpp.o: PGMAll.o
    12121209
    12131210PGMPhysRWTmpl.o PGMPhysRWTmpl.obj: PGMPhys.o
  • trunk/src/VBox/VMM/VMMAll/PGMAll.cpp

    r108134 r108142  
    102102# define PGM_SHW_TYPE                PGM_TYPE_32BIT
    103103# define PGM_SHW_NAME(name)          PGM_SHW_NAME_32BIT(name)
    104 # include "PGMAllShw.h"
     104# include "PGMAllShw-x86.cpp.h"
    105105
    106106/* Guest - real mode */
     
    110110# define BTH_PGMPOOLKIND_PT_FOR_PT   PGMPOOLKIND_32BIT_PT_FOR_PHYS
    111111# 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"
    115115# undef BTH_PGMPOOLKIND_PT_FOR_PT
    116116# undef BTH_PGMPOOLKIND_ROOT
     
    125125# define BTH_PGMPOOLKIND_PT_FOR_PT   PGMPOOLKIND_32BIT_PT_FOR_PHYS
    126126# 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"
    130130# undef BTH_PGMPOOLKIND_PT_FOR_PT
    131131# undef BTH_PGMPOOLKIND_ROOT
     
    141141# define BTH_PGMPOOLKIND_PT_FOR_BIG  PGMPOOLKIND_32BIT_PT_FOR_32BIT_4MB
    142142# 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"
    146146# undef BTH_PGMPOOLKIND_PT_FOR_BIG
    147147# undef BTH_PGMPOOLKIND_PT_FOR_PT
     
    161161# define PGM_SHW_NAME(name)          PGM_SHW_NAME_PAE(name)
    162162# define PGM_BTH_NAME(name)          PGM_BTH_NAME_PAE_REAL(name)
    163 # include "PGMAllShw.h"
     163# include "PGMAllShw-x86.cpp.h"
    164164
    165165/* Guest - real mode */
     
    169169# define BTH_PGMPOOLKIND_PT_FOR_PT   PGMPOOLKIND_PAE_PT_FOR_PHYS
    170170# 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"
    173173# undef BTH_PGMPOOLKIND_PT_FOR_PT
    174174# undef BTH_PGMPOOLKIND_ROOT
     
    183183# define BTH_PGMPOOLKIND_PT_FOR_PT   PGMPOOLKIND_PAE_PT_FOR_PHYS
    184184# 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"
    187187# undef BTH_PGMPOOLKIND_PT_FOR_PT
    188188# undef BTH_PGMPOOLKIND_ROOT
     
    198198# define BTH_PGMPOOLKIND_PT_FOR_BIG  PGMPOOLKIND_PAE_PT_FOR_32BIT_4MB
    199199# 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"
    202202# undef BTH_PGMPOOLKIND_PT_FOR_BIG
    203203# undef BTH_PGMPOOLKIND_PT_FOR_PT
     
    215215# define BTH_PGMPOOLKIND_PT_FOR_BIG  PGMPOOLKIND_PAE_PT_FOR_PAE_2MB
    216216# 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"
    220220# undef BTH_PGMPOOLKIND_PT_FOR_BIG
    221221# undef BTH_PGMPOOLKIND_PT_FOR_PT
     
    234234# define PGM_SHW_TYPE               PGM_TYPE_AMD64
    235235# define PGM_SHW_NAME(name)         PGM_SHW_NAME_AMD64(name)
    236 # include "PGMAllShw.h"
     236# include "PGMAllShw-x86.cpp.h"
    237237
    238238/* Guest - protected mode (only used for AMD-V nested paging in 64 bits mode) */
     
    243243# define BTH_PGMPOOLKIND_PT_FOR_PT  PGMPOOLKIND_PAE_PT_FOR_PHYS
    244244# 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"
    247247# undef BTH_PGMPOOLKIND_PT_FOR_PT
    248248# undef BTH_PGMPOOLKIND_ROOT
     
    259259#  define BTH_PGMPOOLKIND_PT_FOR_BIG PGMPOOLKIND_PAE_PT_FOR_PAE_2MB
    260260#  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"
    264264#  undef BTH_PGMPOOLKIND_PT_FOR_BIG
    265265#  undef BTH_PGMPOOLKIND_PT_FOR_PT
     
    279279# define PGM_SHW_TYPE                PGM_TYPE_NESTED_32BIT
    280280# define PGM_SHW_NAME(name)          PGM_SHW_NAME_NESTED_32BIT(name)
    281 # include "PGMAllShw.h"
     281# include "PGMAllShw-x86.cpp.h"
    282282
    283283/* Guest - real mode */
     
    285285# define PGM_GST_NAME(name)          PGM_GST_NAME_REAL(name)
    286286# 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"
    289289# undef PGM_BTH_NAME
    290290# undef PGM_GST_TYPE
     
    295295# define PGM_GST_NAME(name)          PGM_GST_NAME_PROT(name)
    296296# 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"
    299299# undef PGM_BTH_NAME
    300300# undef PGM_GST_TYPE
     
    305305# define PGM_GST_NAME(name)          PGM_GST_NAME_32BIT(name)
    306306# 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"
    309309# undef PGM_BTH_NAME
    310310# undef PGM_GST_TYPE
     
    315315# define PGM_GST_NAME(name)          PGM_GST_NAME_PAE(name)
    316316# 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"
    319319# undef PGM_BTH_NAME
    320320# undef PGM_GST_TYPE
     
    326326#  define PGM_GST_NAME(name)         PGM_GST_NAME_AMD64(name)
    327327#  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"
    330330#  undef PGM_BTH_NAME
    331331#  undef PGM_GST_TYPE
     
    342342# define PGM_SHW_TYPE                PGM_TYPE_NESTED_PAE
    343343# define PGM_SHW_NAME(name)          PGM_SHW_NAME_NESTED_PAE(name)
    344 # include "PGMAllShw.h"
     344# include "PGMAllShw-x86.cpp.h"
    345345
    346346/* Guest - real mode */
     
    348348# define PGM_GST_NAME(name)          PGM_GST_NAME_REAL(name)
    349349# 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"
    352352# undef PGM_BTH_NAME
    353353# undef PGM_GST_TYPE
     
    358358# define PGM_GST_NAME(name)          PGM_GST_NAME_PROT(name)
    359359# 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"
    362362# undef PGM_BTH_NAME
    363363# undef PGM_GST_TYPE
     
    368368# define PGM_GST_NAME(name)          PGM_GST_NAME_32BIT(name)
    369369# 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"
    372372# undef PGM_BTH_NAME
    373373# undef PGM_GST_TYPE
     
    378378# define PGM_GST_NAME(name)          PGM_GST_NAME_PAE(name)
    379379# 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"
    382382# undef PGM_BTH_NAME
    383383# undef PGM_GST_TYPE
     
    389389#  define PGM_GST_NAME(name)         PGM_GST_NAME_AMD64(name)
    390390#  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"
    393393#  undef PGM_BTH_NAME
    394394#  undef PGM_GST_TYPE
     
    405405# define PGM_SHW_TYPE                PGM_TYPE_NESTED_AMD64
    406406# define PGM_SHW_NAME(name)          PGM_SHW_NAME_NESTED_AMD64(name)
    407 # include "PGMAllShw.h"
     407# include "PGMAllShw-x86.cpp.h"
    408408
    409409/* Guest - real mode */
     
    411411# define PGM_GST_NAME(name)          PGM_GST_NAME_REAL(name)
    412412# 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"
    415415# undef PGM_BTH_NAME
    416416# undef PGM_GST_TYPE
     
    421421# define PGM_GST_NAME(name)          PGM_GST_NAME_PROT(name)
    422422# 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"
    425425# undef PGM_BTH_NAME
    426426# undef PGM_GST_TYPE
     
    431431# define PGM_GST_NAME(name)          PGM_GST_NAME_32BIT(name)
    432432# 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"
    435435# undef PGM_BTH_NAME
    436436# undef PGM_GST_TYPE
     
    441441# define PGM_GST_NAME(name)          PGM_GST_NAME_PAE(name)
    442442# 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"
    445445# undef PGM_BTH_NAME
    446446# undef PGM_GST_TYPE
     
    452452#  define PGM_GST_NAME(name)         PGM_GST_NAME_AMD64(name)
    453453#  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"
    456456#  undef PGM_BTH_NAME
    457457#  undef PGM_GST_TYPE
     
    468468# define PGM_SHW_TYPE                PGM_TYPE_EPT
    469469# define PGM_SHW_NAME(name)          PGM_SHW_NAME_EPT(name)
    470 # include "PGMAllShw.h"
     470# include "PGMAllShw-x86.cpp.h"
    471471
    472472/* Guest - real mode */
     
    475475# define PGM_BTH_NAME(name)          PGM_BTH_NAME_EPT_REAL(name)
    476476# 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"
    479479# undef BTH_PGMPOOLKIND_PT_FOR_PT
    480480# undef PGM_BTH_NAME
     
    487487# define PGM_BTH_NAME(name)          PGM_BTH_NAME_EPT_PROT(name)
    488488# 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"
    491491# undef BTH_PGMPOOLKIND_PT_FOR_PT
    492492# undef PGM_BTH_NAME
     
    499499# define PGM_BTH_NAME(name)          PGM_BTH_NAME_EPT_32BIT(name)
    500500# 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"
    503503# undef BTH_PGMPOOLKIND_PT_FOR_PT
    504504# undef PGM_BTH_NAME
     
    511511# define PGM_BTH_NAME(name)          PGM_BTH_NAME_EPT_PAE(name)
    512512# 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"
    515515# undef BTH_PGMPOOLKIND_PT_FOR_PT
    516516# undef PGM_BTH_NAME
     
    524524#  define PGM_BTH_NAME(name)         PGM_BTH_NAME_EPT_AMD64(name)
    525525#  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"
    528528#  undef BTH_PGMPOOLKIND_PT_FOR_PT
    529529#  undef PGM_BTH_NAME
     
    541541# define PGM_SHW_TYPE                PGM_TYPE_NONE
    542542# define PGM_SHW_NAME(name)          PGM_SHW_NAME_NONE(name)
    543 # include "PGMAllShw.h"
     543# include "PGMAllShw-x86.cpp.h"
    544544
    545545/* Guest - real mode */
     
    547547# define PGM_GST_NAME(name)          PGM_GST_NAME_REAL(name)
    548548# 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"
    551551# undef PGM_BTH_NAME
    552552# undef PGM_GST_TYPE
     
    557557# define PGM_GST_NAME(name)          PGM_GST_NAME_PROT(name)
    558558# 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"
    561561# undef PGM_BTH_NAME
    562562# undef PGM_GST_TYPE
     
    567567# define PGM_GST_NAME(name)          PGM_GST_NAME_32BIT(name)
    568568# 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"
    571571# undef PGM_BTH_NAME
    572572# undef PGM_GST_TYPE
     
    577577# define PGM_GST_NAME(name)         PGM_GST_NAME_PAE(name)
    578578# 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"
    581581# undef PGM_BTH_NAME
    582582# undef PGM_GST_TYPE
     
    588588#  define PGM_GST_NAME(name)         PGM_GST_NAME_AMD64(name)
    589589#  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"
    592592#  undef PGM_BTH_NAME
    593593#  undef PGM_GST_TYPE
     
    963963#elif defined(VBOX_VMM_TARGET_ARMV8)
    964964
    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"
    967969
    968970#else
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette