Changeset 2123 in vbox for trunk

Timestamp:

Apr 17, 2007 12:25:00 PM (18 years ago)

Author:

vboxsync

Message:

TRPM changes to assert and report trap/interrupt types accurately.

File:

• trunk/include/VBox/trpm.h (modified) (6 diffs)

trunk/include/VBox/trpm.h

@@ -19 +19 @@
  */
 
-#ifndef __VBox_im_h__
-#define __VBox_im_h__
+#ifndef __VBox_trpm_h__
+#define __VBox_trpm_h__
 
 #include <VBox/cdefs.h>
@@ -38 +38 @@
 {
     TRPM_TRAP_HAS_ERRORCODE = 0,
-    TRPM_TRAP_NO_ERRORCODE
+    TRPM_TRAP_NO_ERRORCODE,
+    /** The usual 32-bit paranoia. */
+    TRPM_TRAP_32BIT_HACK = 0x7fffffff
 } TRPMERRORCODE;
 
@@ -44 +46 @@
  * TRPM event type
  */
+/** Note: must match trpm.mac! */
 typedef enum
 {
-    TRPM_TRAP = 0,
-    TRPM_HARDWARE_INT,
-    TRPM_SOFTWARE_INT
+    TRPM_TRAP         = 0,
+    TRPM_HARDWARE_INT = 1,
+    TRPM_SOFTWARE_INT = 2,
+    /** The usual 32-bit paranoia. */
+    TRPM_32BIT_HACK   = 0x7fffffff
 } TRPMEVENT;
 
@@ -63 +68 @@
  * @param   pVM                     The virtual machine.
  * @param   pu8TrapNo               Where to store the trap number.
- * @param   pfSoftwareInterrupt     Where to store the software interrupt indicator.
- */
-TRPMDECL(int)  TRPMQueryTrap(PVM pVM, uint8_t *pu8TrapNo, bool *pfSoftwareInterrupt);
+ * @param   pEnmType                Where to store the trap type
+ */
+TRPMDECL(int)  TRPMQueryTrap(PVM pVM, uint8_t *pu8TrapNo, TRPMEVENT *pEnmType);
 
 /**
@@ -120 +125 @@
  * @param   pVM                 The virtual machine.
  * @param   u8TrapNo            The trap vector to assert.
- * @param   fSoftwareInterrupt  Indicate if it's a software interrupt or not.
- */
-TRPMDECL(int)  TRPMAssertTrap(PVM pVM, uint8_t u8TrapNo, bool fSoftwareInterrupt);
+ * @param   enmType             Trap type.
+ */
+TRPMDECL(int)  TRPMAssertTrap(PVM pVM, uint8_t u8TrapNo, TRPMEVENT enmType);
 
 /**
@@ -176 +181 @@
  * @param   pVM                     The virtual machine.
  * @param   pu8TrapNo               Where to store the trap number.
- * @param   pfSoftwareInterrupt   Where to store the software interrupt indicator.
+ * @param   pEnmType                Where to store the trap type.
  * @param   puErrorCode             Where to store the error code associated with some traps.
  *                                  ~0U is stored if the trap have no error code.
  * @param   puCR2                   Where to store the CR2 associated with a trap 0E.
  */
-TRPMDECL(int)  TRPMQueryTrapAll(PVM pVM, uint8_t *pu8TrapNo, bool *pfSoftwareInterrupt, PRTGCUINT puErrorCode, PRTGCUINTPTR puCR2);
+TRPMDECL(int)  TRPMQueryTrapAll(PVM pVM, uint8_t *pu8TrapNo, TRPMEVENT *pEnmType, PRTGCUINT puErrorCode, PRTGCUINTPTR puCR2);