Changeset 72570 in vbox

Timestamp:

Jun 15, 2018 8:09:14 PM (6 years ago)

Author:

vboxsync

Message:

EM,IEM: build fixes. bugref:9044

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• EMAll.cpp (modified) (1 diff)
• IEMAll.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -447 +447 @@
         case EMEXITACTION_EXEC_PROBE:
         {
-            LogFlow(("EMHistoryExec/EXEC_PROBE: %RX64, max %u\n", pExitRec->uFlatPC));
+            LogFlow(("EMHistoryExec/EXEC_PROBE: %RX64\n", pExitRec->uFlatPC));
             PEMEXITREC   pExitRecUnconst = (PEMEXITREC)pExitRec;
             VBOXSTRICTRC rcStrict = IEMExecForExits(pVCpu, fWillExit,

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

@@ -14183 +14183 @@
     if (rcStrict == VINF_SUCCESS)
     {
-        uint32_t cInstructionSinceLastExit = 0;
-
 #ifdef IEM_WITH_SETJMP
         jmp_buf         JmpBuf;
@@ -14193 +14191 @@
 #endif
         {
+            uint32_t cInstructionSinceLastExit = 0;
+
             /*
              * The run loop.  We limit ourselves to 4096 instructions right now.
@@ -14251 +14251 @@
                                       || pStats->cInstructions < cMinInstructions))
                         {
-                            if (cMaxInstructions-- > 0)
+                            if (pStats->cInstructions < cMaxInstructions)
                             {
                                 if (cInstructionSinceLastExit <= cMaxInstructionsWithoutExits)
@@ -14261 +14261 @@
                             }
                         }
+                        Assert(!(fCpu & VMCPU_FF_IEM));
                     }
                     Assert(pVCpu->iem.s.cActiveMappings == 0);