Changeset 66599 in vbox

Timestamp:

Apr 18, 2017 6:15:32 AM (8 years ago)

Author:

vboxsync

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

114626

Message:

x86.h,bs2: X86_XCPT_MAX -> X86_XCPT_LAST; Corrected X86_XCPT_SX value.

Location:

trunk

Files:

• include/iprt/x86.h (modified) (2 diffs)
• include/iprt/x86.mac (modified) (1 diff)
• src/VBox/ValidationKit/bootsectors/bootsector2-common-routines-template-1.mac (modified) (1 diff)

trunk/include/iprt/x86.h

@@ -4031 +4031 @@
     X86_XCPT_VE = 0x14,
     /** \#SX - Security Exception. */
-    X86_XCPT_SX = 0x1f  /** @todo r=ramshankar: typo. \#SX should be 0x1e (30) but X86_XCPT_MAX probably needs to remain 31. */
+    X86_XCPT_SX = 0x1e
 } X86XCPT;
 /** Pointer to a x86 exception code. */
@@ -4037 +4037 @@
 /** Pointer to a const x86 exception code. */
 typedef const X86XCPT *PCX86XCPT;
-/** The maximum exception value. */
-#define X86_XCPT_MAX                (X86_XCPT_SX)
+/** The last valid (currently reserved) exception value. */
+#define X86_XCPT_LAST               0x1f
 
 

trunk/include/iprt/x86.mac

@@ -955 +955 @@
 %define X86_SEL_RPL             0x0003
 %define X86_SEL_RPL_LDT         0x0007
-%define X86_XCPT_MAX                (X86_XCPT_SX)
+%define X86_XCPT_LAST               0x1f
 %define X86_TRAP_ERR_EXTERNAL       1
 %define X86_TRAP_ERR_IDT            2

trunk/src/VBox/ValidationKit/bootsectors/bootsector2-common-routines-template-1.mac

@@ -1132 +1132 @@
         je      .nok
 
-        cmp     dword [sDI + BS2TRAPREC.u8TrapNo], X86_XCPT_MAX
+        cmp     dword [sDI + BS2TRAPREC.u8TrapNo], X86_XCPT_LAST
         ja      .nok