Changeset 9768 in vbox for trunk/include

Timestamp:

Jun 17, 2008 1:51:39 PM (17 years ago)

Author:

vboxsync

Message:

Regenerate err.mac and x86.mac. Adjusted the rule for generting these as x86.h now include multiline macros.

Location:

trunk/include

Files:

• VBox/err.mac (modified) (4 diffs)
• VBox/x86.mac (modified) (4 diffs)
• iprt/err.mac (modified) (3 diffs)

trunk/include/VBox/err.mac

@@ -12 +12 @@
 %define VERR_INVALID_SELECTOR    (-1011)
 %define VERR_INVALID_RPL    (-1012)
+%define VERR_PAGE_MAP_LEVEL4_NOT_PRESENT    (-1013)
+%define VERR_PAGE_DIRECTORY_PTR_NOT_PRESENT    (-1014)
 %define VINF_EM_FIRST    1100
 %define VINF_EM_TERMINATE    1100
@@ -64 +66 @@
 %define VINF_DBGF_BP_ALREADY_EXIST    1207
 %define VERR_DBGF_MEM_NOT_FOUND    (-1208)
+%define VERR_DBGF_OS_NOT_DETCTED    (-1209)
+%define VINF_DBGF_OS_NOT_DETCTED    1209
 %define VWRN_CONTINUE_ANALYSIS    1400
 %define VWRN_CONTINUE_RECOMPILE    VWRN_CONTINUE_ANALYSIS
@@ -122 +126 @@
 %define VINF_PGM_SYNCPAGE_MODIFIED_PDE    1625
 %define VERR_PGM_GCPHYS_RANGE_CROSSES_BOUNDARY    (-1626)
+%define VERR_PGM_INTERMEDIATE_PAGING_CONFLICT    (-1627)
+%define VERR_PGM_UNSUPPORTED_SHADOW_PAGING_MODE    (-1628)
 %define VERR_MM_RAM_CONFLICT    (-1700)
 %define VERR_MM_HYPER_NO_MEMORY    (-1701)
@@ -349 +355 @@
 %define VERR_VGA_INVALID_CUSTOM_MODE    (-3500)
 %define VINF_VGA_RESIZE_IN_PROGRESS    (3501)
+%define VERR_INTNET_FLT_IF_NOT_FOUND    (-3600)
+%define VERR_INTNET_FLT_IF_BUSY    (-3601)
+%define VERR_INTNET_FLT_IF_FAILED    (-3602)
 %define VERR_VMX_INVALID_VMCS_FIELD    (-4000)
 %define VERR_VMX_INVALID_VMCS_PTR    (-4001)

trunk/include/VBox/x86.mac

@@ -182 +182 @@
 %define X86_DR7_LEN(iBp, cb)                ( (cb) << ((iBp) * 4 + 18) )
 %define X86_DR7_ENABLED_MASK                (RT_BIT(0) | RT_BIT(1) | RT_BIT(2) | RT_BIT(3) | RT_BIT(4) | RT_BIT(6) | RT_BIT(7))
+%define MSR_IA32_APICBASE                   0x1b
 %define MSR_IA32_FEATURE_CONTROL            0x3A
 %define MSR_IA32_FEATURE_CONTROL_LOCK       RT_BIT(0)
@@ -188 +189 @@
 %define MSR_IA32_SYSENTER_ESP               0x175
 %define MSR_IA32_SYSENTER_EIP               0x176
-%define IA32_CR_PAT                         0x277
+%define MSR_IA32_CR_PAT                     0x277
 %define MSR_IA32_VMX_BASIC_INFO             0x480
 %define MSR_IA32_VMX_PINBASED_CTLS          0x481
@@ -277 +278 @@
 %define X86_PTE_PG_MASK                     ( 0xfffff000 )
 %define X86_PTE_PAE_PG_MASK                 ( 0x0000fffffffff000ULL )
+%define X86_PTE_PAE_PG_MASK_FULL            ( 0x000ffffffffff000ULL )
 %define X86_PTE_PAE_PG_MASK                 ( 0x000ffffffffff000ULL )
 %define X86_PTE_PAE_NX                      RT_BIT_64(63)
@@ -326 +328 @@
 %define X86_PDPE_PG_MASK                    ( 0x000ffffffffff000ULL )
 %define X86_PDPE_NX                         RT_BIT_64(63)
-%define X86_PDPTR_SHIFT             30
-%define X86_PDPTR_MASK_32           0x3
-%define X86_PDPTR_MASK              0x1ff
+%define X86_PDPT_SHIFT             30
+%define X86_PDPT_MASK_PAE          0x3
+%define X86_PDPT_MASK_AMD64        0x1ff
 %define X86_PML4E_P                         RT_BIT(0)
 %define X86_PML4E_RW                        RT_BIT(1)

trunk/include/iprt/err.mac

@@ -2 +2 @@
 %define VERR_GENERAL_FAILURE    (-1)
 %define VERR_INVALID_PARAMETER    (-2)
+%define VWRN_INVALID_PARAMETER    2
 %define VERR_INVALID_MAGIC    (-3)
+%define VWRN_INVALID_MAGIC    3
 %define VERR_INVALID_HANDLE    (-4)
+%define VWRN_INVALID_HANDLE    4
 %define VERR_LOCK_FAILED    (-5)
 %define VERR_INVALID_POINTER    (-6)
@@ -76 +79 @@
 %define VERR_TRAILING_SPACES    (-77)
 %define VWRN_TRAILING_SPACES    77
-%define VERR_GETOPT_UNKNOWN_OPTION    (-78)
-%define VERR_GETOPT_REQUIRED_ARGUMENT_MISSING    (-79)
-%define VERR_GETOPT_INVALID_ARGUMENT_FORMAT    (-80)
-%define VERR_NOT_FOUND    (-81)
+%define VERR_NOT_FOUND    (-78)
+%define VWRN_NOT_FOUND    78
+%define VERR_INVALID_STATE    (-79)
+%define VWRN_INVALID_STATE    79
+%define VERR_OUT_OF_RESOURCES    (-80)
+%define VWRN_OUT_OF_RESOURCES    80
 %define VERR_FILE_IO_ERROR    (-100)
 %define VERR_OPEN_FAILED    (-101)
@@ -249 +254 @@
 %define VERR_CPU_OFFLINE    (-800)
 %define VERR_CPU_NOT_FOUND    (-801)
+%define VERR_GETOPT_UNKNOWN_OPTION    (-825)
+%define VERR_GETOPT_REQUIRED_ARGUMENT_MISSING    (-826)
+%define VERR_GETOPT_INVALID_ARGUMENT_FORMAT    (-827)