Changeset 86460 in vbox

Timestamp:

Oct 6, 2020 4:39:32 PM (4 years ago)

Author:

vboxsync

Message:

gen-slickedit-workspace.sh: PGM_BTH/SHW/GST_DECL/NAME fixes.

File:

• trunk/tools/bin/gen-slickedit-workspace.sh (modified) (1 diff)

trunk/tools/bin/gen-slickedit-workspace.sh

@@ -669 +669 @@
 #define PGM_CTX3(a,b,c)                 c
 #define PGM_GST_NAME(name)              PGM_GST_NAME_AMD64(name)
-#define PGM_GST_NAME_REAL(name)         PGM_CTX3(name)
-#define PGM_GST_NAME_PROT(name)         PGM_CTX3(pgm,GstProt,name)
-#define PGM_GST_NAME_32BIT(name)        PGM_CTX3(pgm,Gst32Bit,name)
-#define PGM_GST_NAME_PAE(name)          PGM_CTX3(pgm,GstPAE,name)
-#define PGM_GST_NAME_AMD64(name)        PGM_CTX3(pgm,GstAMD64,name)
+#define PGM_GST_NAME_REAL(name)         pgmGstReal##name
+#define PGM_GST_NAME_PROT(name)         pgmGstProt##name
+#define PGM_GST_NAME_32BIT(name)        pgmGst32Bit##name
+#define PGM_GST_NAME_PAE(name)          pgmGstPAE##name
+#define PGM_GST_NAME_AMD64(name)        pgmGstAMD64##name
 #define PGM_GST_DECL(type, name)        type PGM_GST_NAME(name)
 #define PGM_SHW_NAME(name)              PGM_GST_NAME_AMD64(name)
-#define PGM_SHW_NAME_32BIT(name)        PGM_CTX3(pgm,Shw32Bit,name)
-#define PGM_SHW_NAME_PAE(name)          PGM_CTX3(pgm,ShwPAE,name)
-#define PGM_SHW_NAME_AMD64(name)        PGM_CTX3(pgm,ShwAMD64,name)
-#define PGM_SHW_NAME_NESTED(name)       PGM_CTX3(pgm,ShwNested,name)
-#define PGM_SHW_NAME_EPT(name)          PGM_CTX3(pgm,ShwEPT,name)
+#define PGM_SHW_NAME_32BIT(name)        pgmShw32Bit##name
+#define PGM_SHW_NAME_PAE(name)          pgmShwPAE##name
+#define PGM_SHW_NAME_AMD64(name)        pgmShwAMD64##name
+#define PGM_SHW_NAME_NESTED(name)       pgmShwNested##name
+#define PGM_SHW_NAME_EPT(name)          pgmShwEPT##name
 #define PGM_SHW_DECL(type, name)        type PGM_SHW_NAME(name)
 #define PGM_BTH_NAME(name)              PGM_BTH_NAME_NESTED_AMD64(name)
-#define PGM_BTH_NAME_32BIT_REAL(name)   PGM_CTX3(pgm,Bth,name)
-#define PGM_BTH_NAME_32BIT_PROT(name)   PGM_CTX3(pgm,Bth,name)
-#define PGM_BTH_NAME_32BIT_32BIT(name)  PGM_CTX3(pgm,Bth,name)
-#define PGM_BTH_NAME_PAE_REAL(name)     PGM_CTX3(pgm,Bth,name)
-#define PGM_BTH_NAME_PAE_PROT(name)     PGM_CTX3(pgm,Bth,name)
-#define PGM_BTH_NAME_PAE_32BIT(name)    PGM_CTX3(pgm,Bth,name)
-#define PGM_BTH_NAME_PAE_PAE(name)      PGM_CTX3(pgm,Bth,name)
-#define PGM_BTH_NAME_AMD64_PROT(name)   PGM_CTX3(pgm,Bth,name)
-#define PGM_BTH_NAME_AMD64_AMD64(name)  PGM_CTX3(pgm,Bth,name)
-#define PGM_BTH_NAME_NESTED_REAL(name)  PGM_CTX3(pgm,Bth,name)
-#define PGM_BTH_NAME_NESTED_PROT(name)  PGM_CTX3(pgm,Bth,name)
-#define PGM_BTH_NAME_NESTED_32BIT(name) PGM_CTX3(pgm,Bth,name)
-#define PGM_BTH_NAME_NESTED_PAE(name)   PGM_CTX3(pgm,Bth,name)
-#define PGM_BTH_NAME_NESTED_AMD64(name) PGM_CTX3(pgm,Bth,name)
-#define PGM_BTH_NAME_EPT_REAL(name)     PGM_CTX3(pgm,Bth,name)
-#define PGM_BTH_NAME_EPT_PROT(name)     PGM_CTX3(pgm,Bth,name)
-#define PGM_BTH_NAME_EPT_32BIT(name)    PGM_CTX3(pgm,Bth,name)
-#define PGM_BTH_NAME_EPT_PAE(name)      PGM_CTX3(pgm,Bth,name)
-#define PGM_BTH_NAME_EPT_AMD64(name)    PGM_CTX3(pgm,Bth,name)
+#define PGM_BTH_NAME_32BIT_REAL(name)   pgmBth##name
+#define PGM_BTH_NAME_32BIT_PROT(name)   pgmBth##name
+#define PGM_BTH_NAME_32BIT_32BIT(name)  pgmBth##name
+#define PGM_BTH_NAME_PAE_REAL(name)     pgmBth##name
+#define PGM_BTH_NAME_PAE_PROT(name)     pgmBth##name
+#define PGM_BTH_NAME_PAE_32BIT(name)    pgmBth##name
+#define PGM_BTH_NAME_PAE_PAE(name)      pgmBth##name
+#define PGM_BTH_NAME_AMD64_PROT(name)   pgmBth##name
+#define PGM_BTH_NAME_AMD64_AMD64(name)  pgmBth##name
+#define PGM_BTH_NAME_NESTED_REAL(name)  pgmBth##name
+#define PGM_BTH_NAME_NESTED_PROT(name)  pgmBth##name
+#define PGM_BTH_NAME_NESTED_32BIT(name) pgmBth##name
+#define PGM_BTH_NAME_NESTED_PAE(name)   pgmBth##name
+#define PGM_BTH_NAME_NESTED_AMD64(name) pgmBth##name
+#define PGM_BTH_NAME_EPT_REAL(name)     pgmBth##name
+#define PGM_BTH_NAME_EPT_PROT(name)     pgmBth##name
+#define PGM_BTH_NAME_EPT_32BIT(name)    pgmBth##name
+#define PGM_BTH_NAME_EPT_PAE(name)      pgmBth##name
+#define PGM_BTH_NAME_EPT_AMD64(name)    pgmBth##name
 #define PGM_BTH_DECL(type, name)        type PGM_BTH_NAME(name)