Changeset 2126 in vbox

Timestamp:

Apr 17, 2007 12:32:03 PM (18 years ago)

Author:

vboxsync

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

20447

Message:

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

Location:

trunk/src/recompiler

Files:

• VBoxRecompiler.c (modified) (2 diffs)
• new/VBoxRecompiler.c (modified) (2 diffs)

trunk/src/recompiler/VBoxRecompiler.c

@@ -1849 +1849 @@
      */
     pVM->rem.s.Env.exception_index = -1; /** @todo this won't work :/ */
-    bool            fIsSoftwareInterrupt;
-    uint8_t         u8TrapNo;
-    int rc = TRPMQueryTrap(pVM, &u8TrapNo, &fIsSoftwareInterrupt);
+    TRPMEVENT   enmType;
+    uint8_t     u8TrapNo;
+    int rc = TRPMQueryTrap(pVM, &u8TrapNo, &enmType);
     if (VBOX_SUCCESS(rc))
     {
@@ -1863 +1863 @@
 
         pVM->rem.s.Env.exception_index = u8TrapNo;
-        if (!fIsSoftwareInterrupt)
+        if (enmType != TRPM_SOFTWARE_INT)
         {
             pVM->rem.s.Env.exception_is_int     = 0;

trunk/src/recompiler/new/VBoxRecompiler.c

@@ -1933 +1933 @@
      */
     pVM->rem.s.Env.exception_index = -1; /** @todo this won't work :/ */
-    bool            fIsSoftwareInterrupt;
-    uint8_t         u8TrapNo;
-    int rc = TRPMQueryTrap(pVM, &u8TrapNo, &fIsSoftwareInterrupt);
+    TRPMEVENT   enmType;
+    uint8_t     u8TrapNo;
+    int rc = TRPMQueryTrap(pVM, &u8TrapNo, &enmType);
     if (VBOX_SUCCESS(rc))
     {
@@ -1947 +1947 @@
 
         pVM->rem.s.Env.exception_index = u8TrapNo;
-        if (!fIsSoftwareInterrupt)
+        if (enmType != TRPM_SOFTWARE_INT)
         {
             pVM->rem.s.Env.exception_is_int     = 0;