Changeset 846 in vbox

Timestamp:

Feb 12, 2007 1:18:55 PM (18 years ago)

Author:

vboxsync

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

18546

Message:

Fix for OpenBSD 4.0 (again).

File:

• trunk/src/VBox/VMM/PATM/CSAM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/PATM/CSAM.cpp

@@ -28 +28 @@
 #include <VBox/patm.h>
 #include <VBox/csam.h>
+#include <VBox/cpumdis.h>
 #include <VBox/pgm.h>
 #include <VBox/iom.h>
@@ -2234 +2235 @@
                 continue;
             }
+            /* OpenBSD guest specific patch test. */
             if (iGate >= 0x20)
             {
-                /* OpenBSD guest specific patch test (3.7 & 3.8) */
-                rc = PATMR3InstallPatch(pVM, pHandler - 3, PATMFL_CODE32 | PATMFL_GUEST_SPECIFIC);
-                if (VBOX_FAILURE(rc))
-                    /* OpenBSD guest specific patch test (3.9 & 4.0) */
-                    rc = PATMR3InstallPatch(pVM, pHandler - 0x2B, PATMFL_CODE32 | PATMFL_GUEST_SPECIFIC);
-                if (VBOX_SUCCESS(rc))
-                    Log(("Installed OpenBSD interrupt handler prefix instruction (push cs) patch\n"));
+                PCPUMCTX    pCtx;
+                DISCPUSTATE cpu;
+                RTGCUINTPTR aOpenBsdPushCSOffset[3] = {0x03,       /* OpenBSD 3.7 & 3.8 */
+                                                       0x2B,       /* OpenBSD 4.0 installation ISO */
+                                                       0x2F};      /* OpenBSD 4.0 after install */
+
+                rc = CPUMQueryGuestCtxPtr(pVM, &pCtx);
+                AssertRC(rc);   /* can't fail */
+
+                for (int i=0;i<ELEMENTS(aOpenBsdPushCSOffset);i++)
+                {
+                    rc = CPUMR3DisasmInstrCPU(pVM, pCtx, pHandler - aOpenBsdPushCSOffset[i], &cpu, NULL);
+                    if (    rc == VINF_SUCCESS
+                        &&  cpu.pCurInstr->opcode == OP_PUSH
+                        &&  cpu.pCurInstr->param1 == OP_PARM_REG_CS)
+                    {
+                        rc = PATMR3InstallPatch(pVM, pHandler - aOpenBsdPushCSOffset[i], PATMFL_CODE32 | PATMFL_GUEST_SPECIFIC);
+                        if (VBOX_SUCCESS(rc))
+                            Log(("Installed OpenBSD interrupt handler prefix instruction (push cs) patch\n"));
+                    }
+                }
             }