Changeset 42396 in vbox

Timestamp:

Jul 25, 2012 2:52:00 PM (12 years ago)

Author:

vboxsync

Message:

fixed duplicate error codes and regenerated .mac incs

Location:

trunk/include

Files:

• VBox/err.h (modified) (1 diff)
• VBox/err.mac (modified) (4 diffs)
• iprt/x86.mac (modified) (5 diffs)

trunk/include/VBox/err.h

@@ -959 +959 @@
 #define VERR_TRPM_BAD_TRAP_IN_OP            (-2406)
 /** Internal processing error \#1 in TRPM. */
-#define VERR_TRPM_IPE_1                     (-2507)
+#define VERR_TRPM_IPE_1                     (-2407)
 /** Internal processing error \#2 in TRPM. */
-#define VERR_TRPM_IPE_2                     (-2508)
+#define VERR_TRPM_IPE_2                     (-2408)
 /** Internal processing error \#3 in TRPM. */
-#define VERR_TRPM_IPE_3                     (-2509)
+#define VERR_TRPM_IPE_3                     (-2409)
 /** @} */
 

trunk/include/VBox/err.mac

@@ -351 +351 @@
 %define VINF_TRPM_XCPT_DISPATCHED    2405
 %define VERR_TRPM_BAD_TRAP_IN_OP    (-2406)
-%define VERR_TRPM_IPE_1    (-2507)
-%define VERR_TRPM_IPE_2    (-2508)
-%define VERR_TRPM_IPE_3    (-2509)
+%define VERR_TRPM_IPE_1    (-2407)
+%define VERR_TRPM_IPE_2    (-2408)
+%define VERR_TRPM_IPE_3    (-2409)
 %define VERR_SELM_SHADOW_GDT_WRITE    (-2500)
 %define VERR_SELM_SHADOW_LDT_WRITE    (-2501)
@@ -361 +361 @@
 %define VERR_SELM_INVALID_LDT    (-2505)
 %define VERR_SELM_LDT_OUT_OF_BOUNDS    (-2506)
+%define VERR_SELM_GDT_READ_ERROR    (-2507)
+%define VERR_SELM_GDT_TOO_FULL    (-2508)
 %define VERR_IOM_INVALID_IOPORT_RANGE    (-2600)
 %define VERR_IOM_NO_R3_IOPORT_RANGE    (-2601)
@@ -543 +545 @@
 %define VERR_VD_ISCSI_INVALID_STATE    (-3253)
 %define VERR_VD_ISCSI_INVALID_TYPE    (-3254)
+%define VERR_VD_ISCSI_SECRET_ENCRYPTED    (-3255)
 %define VERR_VD_VHD_INVALID_HEADER    (-3260)
 %define VERR_VD_PARALLELS_INVALID_HEADER    (-3265)
@@ -559 +562 @@
 %define VERR_VD_IMAGE_REPAIR_IMPOSSIBLE    (-3281)
 %define VERR_VD_READ_OUT_OF_RANGE    (-3282)
+%define VINF_VD_NEW_ZEROED_BLOCK    3283
 %define VERR_VBGL_NOT_INITIALIZED    (-3300)
 %define VERR_VBGL_INVALID_ADDR    (-3301)

trunk/include/iprt/x86.mac

@@ -45 +45 @@
 %define X86_CPUID_VENDOR_AMD_ECX        0x444d4163
 %define X86_CPUID_VENDOR_AMD_EDX        0x69746e65
+%define X86_CPUID_VENDOR_VIA_EBX        0x746e6543
+%define X86_CPUID_VENDOR_VIA_ECX        0x736c7561
+%define X86_CPUID_VENDOR_VIA_EDX        0x48727561
 %define X86_CPUID_FEATURE_ECX_SSE3      RT_BIT(0)
 %define X86_CPUID_FEATURE_ECX_PCLMUL    RT_BIT(1)
@@ -104 +107 @@
 %define X86_CPUID_MWAIT_ECX_EXT            RT_BIT(0)
 %define X86_CPUID_MWAIT_ECX_BREAKIRQIF0    RT_BIT(1)
+%define X86_CPUID_EXT_FEATURE_ECX_LAHF_SAHF     RT_BIT(0)
+%define X86_CPUID_EXT_FEATURE_EDX_SYSCALL       RT_BIT(11)
+%define X86_CPUID_EXT_FEATURE_EDX_NX            RT_BIT(20)
+%define X86_CPUID_EXT_FEATURE_EDX_PAGE1GB       RT_BIT(26)
+%define X86_CPUID_EXT_FEATURE_EDX_RDTSCP        RT_BIT(27)
+%define X86_CPUID_EXT_FEATURE_EDX_LONG_MODE     RT_BIT(29)
 %define X86_CPUID_AMD_FEATURE_EDX_FPU       RT_BIT(0)
 %define X86_CPUID_AMD_FEATURE_EDX_VME       RT_BIT(1)
@@ -114 +123 @@
 %define X86_CPUID_AMD_FEATURE_EDX_CX8       RT_BIT(8)
 %define X86_CPUID_AMD_FEATURE_EDX_APIC      RT_BIT(9)
-%define X86_CPUID_AMD_FEATURE_EDX_SEP       RT_BIT(11)
 %define X86_CPUID_AMD_FEATURE_EDX_MTRR      RT_BIT(12)
 %define X86_CPUID_AMD_FEATURE_EDX_PGE       RT_BIT(13)
@@ -121 +129 @@
 %define X86_CPUID_AMD_FEATURE_EDX_PAT       RT_BIT(16)
 %define X86_CPUID_AMD_FEATURE_EDX_PSE36     RT_BIT(17)
-%define X86_CPUID_AMD_FEATURE_EDX_NX        RT_BIT(20)
 %define X86_CPUID_AMD_FEATURE_EDX_AXMMX     RT_BIT(22)
 %define X86_CPUID_AMD_FEATURE_EDX_MMX       RT_BIT(23)
 %define X86_CPUID_AMD_FEATURE_EDX_FXSR      RT_BIT(24)
 %define X86_CPUID_AMD_FEATURE_EDX_FFXSR     RT_BIT(25)
-%define X86_CPUID_EXT_FEATURE_EDX_PAGE1GB   RT_BIT(26)
-%define X86_CPUID_EXT_FEATURE_EDX_RDTSCP    RT_BIT(27)
-%define X86_CPUID_EXT_FEATURE_EDX_LONG_MODE RT_BIT(29)
 %define X86_CPUID_AMD_FEATURE_EDX_3DNOW_EX  RT_BIT(30)
 %define X86_CPUID_AMD_FEATURE_EDX_3DNOW     RT_BIT(31)
-%define X86_CPUID_EXT_FEATURE_ECX_LAHF_SAHF RT_BIT(0)
 %define X86_CPUID_AMD_FEATURE_ECX_CMPL      RT_BIT(1)
 %define X86_CPUID_AMD_FEATURE_ECX_SVM       RT_BIT(2)
@@ -683 +686 @@
 %define X86_SREG_FS             4
 %define X86_SREG_GS             5
+%define X86_SREG_COUNT          6
 %endif
 %include "iprt/x86extra.mac"