Changeset 42396 in vbox for trunk/include/iprt

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

79482

Message:

fixed duplicate error codes and regenerated .mac incs

File:

• trunk/include/iprt/x86.mac (modified) (5 diffs)

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"