Changeset 47267 in vbox for trunk/include/iprt

Timestamp:

Jul 19, 2013 3:31:25 PM (12 years ago)

Author:

vboxsync

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

87396

Message:

Regenerate assembly headers, added TSSes to x86extra.mac.

Location:

trunk/include/iprt

Files:

• err.mac (modified) (1 diff)
• x86.h (modified) (2 diffs)
• x86.mac (modified) (2 diffs)
• x86extra.mac (modified) (2 diffs)

trunk/include/iprt/err.mac

@@ -455 +455 @@
 %define VERR_TAR_MALFORMED_GNU_LONGXXXX    (-946)
 %define VERR_TAR_NAME_TOO_LONG    (-947)
+%define VINF_TAR_DIR_PATH    (925)
 %define VERR_POLL_HANDLE_NOT_POLLABLE    (-950)
 %define VERR_POLL_HANDLE_ID_EXISTS    (-951)

trunk/include/iprt/x86.h

@@ -2264 +2264 @@
 #define X86DESCATTR_DT              UINT32_C(0x00000010)
 #define X86DESCATTR_DPL             UINT32_C(0x00000060)
+#define X86DESCATTR_DPL_SHIFT       5 /**< Shift count for the DPL value. */
 #define X86DESCATTR_P               UINT32_C(0x00000800)
 #define X86DESCATTR_LIMIT_HIGH      UINT32_C(0x00000f00)
@@ -3073 +3074 @@
     X86_XCPT_VE = 0x14,
     /** \#SX - Security Exception. */
-    X86_XCPT_SX = 0x2f
+    X86_XCPT_SX = 0x1f
 } X86XCPT;
 /** Pointer to a x86 exception code. */

trunk/include/iprt/x86.mac

@@ -548 +548 @@
 %ifndef VBOX_FOR_DTRACE_LIB
 %endif
+%define X86DESCATTR_TYPE            0x0000000f
+%define X86DESCATTR_DT              0x00000010
+%define X86DESCATTR_DPL             0x00000060
+%define X86DESCATTR_DPL_SHIFT       5
+%define X86DESCATTR_P               0x00000800
+%define X86DESCATTR_LIMIT_HIGH      0x00000f00
+%define X86DESCATTR_AVL             0x00001000
+%define X86DESCATTR_L               0x00002000
+%define X86DESCATTR_D               0x00004000
+%define X86DESCATTR_G               0x00008000
+%define X86DESCATTR_UNUSABLE        0x00010000
 %ifndef VBOX_FOR_DTRACE_LIB
 %endif
@@ -648 +659 @@
 %define X86_SEL_RPL             0x0003
 %define X86_SEL_RPL_LDT         0x0007
-%define X86_XCPT_MAX                (X86_XCPT_XF)
+%define X86_XCPT_MAX                (X86_XCPT_SX)
 %define X86_TRAP_ERR_EXTERNAL       1
 %define X86_TRAP_ERR_IDT            2

trunk/include/iprt/x86extra.mac

@@ -48 +48 @@
 %define X86_XCPT_MC             0x12
 %define X86_XCPT_XF             0x13
+%define X86_XCPT_VE             0x14
+%define X86_XCPT_SX             0x1f
 
 %define PAGE_SIZE               0x1000
@@ -115 +117 @@
 
 
+struc X86TSS16
+        .selPrev        resw 1
+        .sp0            resw 1
+        .ss0            resw 1
+        .sp1            resw 1
+        .ss1            resw 1
+        .sp2            resw 1
+        .ss2            resw 1
+        .ip             resw 1
+        .flags          resw 1
+        .ax             resw 1
+        .cx             resw 1
+        .dx             resw 1
+        .bx             resw 1
+        .sp             resw 1
+        .bp             resw 1
+        .si             resw 1
+        .di             resw 1
+        .es             resw 1
+        .cs             resw 1
+        .ss             resw 1
+        .ds             resw 1
+        .selLdt         resw 1
+endstruc
+AssertCompileSize(X86TSS16, 44)
+
+
+struc X86TSS32
+        .selPrev        resw 1
+        .padding1       resw 1
+        .esp0           resd 1
+        .ss0            resw 1
+        .padding_ss0    resw 1
+        .esp1           resd 1
+        .ss1            resw 1
+        .padding_ss1    resw 1
+        .esp2           resd 1
+        .ss2            resw 1
+        .padding_ss2    resw 1
+        .cr3            resd 1
+        .eip            resd 1
+        .eflags         resd 1
+        .eax            resd 1
+        .ecx            resd 1
+        .edx            resd 1
+        .ebx            resd 1
+        .esp            resd 1
+        .ebp            resd 1
+        .esi            resd 1
+        .edi            resd 1
+        .es             resw 1
+        .padding_es     resw 1
+        .cs             resw 1
+        .padding_cs     resw 1
+        .ss             resw 1
+        .padding_ss     resw 1
+        .ds             resw 1
+        .padding_ds     resw 1
+        .fs             resw 1
+        .padding_fs     resw 1
+        .gs             resw 1
+        .padding_gs     resw 1
+        .selLdt         resw 1
+        .padding_ldt    resw 1
+        .fDebugTrap     resw 1
+        .offIoBitmap    resw 1
+        .IntRedirBitmap resb 32
+endstruc
+
+
+struc X86TSS64
+        .u32Reserved    resd 1
+        .rsp0           resq 1
+        .rsp1           resq 1
+        .rsp2           resq 1
+        .u32Reserved2   resd 2
+        .ist1           resq 1
+        .ist2           resq 1
+        .ist3           resq 1
+        .ist4           resq 1
+        .ist5           resq 1
+        .ist6           resq 1
+        .ist7           resq 1
+        .u16Reserved    resw 5
+        .offIoBitmap    resw 1
+        .IntRedirBitmap resb 32
+endstruc
+AssertCompileSize(X86TSS64, 136)
+
 %endif