Changeset 72564 in vbox for trunk/src/VBox/VMM/VMMRC

Timestamp:

Jun 15, 2018 12:56:01 PM (7 years ago)

Author:

vboxsync

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

123058

Message:

EM,TRPM,IOM: Improved the raw-mode exit history a little (just for the heck of it). bugref:9044

Location:

trunk/src/VBox/VMM/VMMRC

Files:

• IOMRC.cpp (modified) (1 diff)
• TRPMRCHandlers.cpp (modified) (10 diffs)

trunk/src/VBox/VMM/VMMRC/IOMRC.cpp

@@ -218 +218 @@
     {
         case OP_IN:
+            EMHistoryUpdateFlagsAndType(pVCpu, EMEXIT_MAKE_FLAGS_AND_TYPE(EMEXIT_F_KIND_EM, EMEXITTYPE_IO_PORT_READ));
             return iomRCInterpretIN(pVM, pVCpu, pRegFrame, pCpu);
 
         case OP_OUT:
+            EMHistoryUpdateFlagsAndType(pVCpu, EMEXIT_MAKE_FLAGS_AND_TYPE(EMEXIT_F_KIND_EM, EMEXITTYPE_IO_PORT_WRITE));
             return iomRCInterpretOUT(pVM, pVCpu, pRegFrame, pCpu);
 
         case OP_INSB:
         case OP_INSWD:
+            EMHistoryUpdateFlagsAndType(pVCpu, EMEXIT_MAKE_FLAGS_AND_TYPE(EMEXIT_F_KIND_EM, EMEXITTYPE_IO_PORT_STR_READ));
             return iomRCInterpretINS(pVCpu, pCpu);
 
         case OP_OUTSB:
         case OP_OUTSWD:
+            EMHistoryUpdateFlagsAndType(pVCpu, EMEXIT_MAKE_FLAGS_AND_TYPE(EMEXIT_F_KIND_EM, EMEXITTYPE_IO_PORT_STR_WRITE));
             return iomRCInterpretOUTS(pVCpu, pCpu);
 

trunk/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp

@@ -845 +845 @@
      * Try handle it here, if not return to HC and emulate/interpret it there.
      */
-    switch (pCpu->pCurInstr->uOpcode)
+    uint16_t const uOpcode = pCpu->pCurInstr->uOpcode;
+    switch (uOpcode)
     {
         case OP_INT3:
@@ -856 +857 @@
         case OP_INT:
         {
+            EMHistoryUpdateFlagsAndType(pVCpu, EMEXIT_MAKE_FLAGS_AND_TYPE(EMEXIT_F_KIND_EM, EMEXITTYPE_INT));
             Assert(pCpu->Param1.fUse & DISUSE_IMMEDIATE8);
             Assert(!(PATMIsPatchGCAddr(pVM, PC)));
@@ -888 +890 @@
 
         case OP_HLT:
+            EMHistoryUpdateFlagsAndType(pVCpu, EMEXIT_MAKE_FLAGS_AND_TYPE(EMEXIT_F_KIND_EM, EMEXITTYPE_HLT));
+
             /* If it's in patch code, defer to ring-3. */
             if (PATMIsPatchGCAddr(pVM, PC))
@@ -908 +912 @@
             if (    !PATMIsPatchGCAddr(pVM, PC)
                 &&  !CSAMIsKnownDangerousInstr(pVM, PC))
+            {
+                if (uOpcode == OP_MOV_CR)
+                    EMHistoryUpdateFlagsAndType(pVCpu, EMEXIT_MAKE_FLAGS_AND_TYPE(EMEXIT_F_KIND_EM, EMEXITTYPE_MOV_CRX));
+                else
+                    EMHistoryUpdateFlagsAndType(pVCpu, EMEXIT_MAKE_FLAGS_AND_TYPE(EMEXIT_F_KIND_EM, EMEXITTYPE_MOV_DRX));
                 break;
+            }
             RT_FALL_THRU();
         case OP_INVLPG:
@@ -920 +930 @@
         case OP_WRMSR:
         {
+            /* Update history. */
+            switch (uOpcode)
+            {
+                case OP_MOV_CR:
+                    EMHistoryUpdateFlagsAndType(pVCpu, EMEXIT_MAKE_FLAGS_AND_TYPE(EMEXIT_F_KIND_EM, EMEXITTYPE_MOV_CRX));
+                    break;
+                case OP_MOV_DR:
+                    EMHistoryUpdateFlagsAndType(pVCpu, EMEXIT_MAKE_FLAGS_AND_TYPE(EMEXIT_F_KIND_EM, EMEXITTYPE_MOV_DRX));
+                    break;
+                case OP_INVLPG:
+                    EMHistoryUpdateFlagsAndType(pVCpu, EMEXIT_MAKE_FLAGS_AND_TYPE(EMEXIT_F_KIND_EM, EMEXITTYPE_INVLPG));
+                    break;
+                case OP_LLDT:
+                    EMHistoryUpdateFlagsAndType(pVCpu, EMEXIT_MAKE_FLAGS_AND_TYPE(EMEXIT_F_KIND_EM, EMEXITTYPE_LLDT));
+                    break;
+                case OP_STI:
+                    EMHistoryUpdateFlagsAndType(pVCpu, EMEXIT_MAKE_FLAGS_AND_TYPE(EMEXIT_F_KIND_EM, EMEXITTYPE_STI));
+                    break;
+                case OP_RDPMC:
+                    EMHistoryUpdateFlagsAndType(pVCpu, EMEXIT_MAKE_FLAGS_AND_TYPE(EMEXIT_F_KIND_EM, EMEXITTYPE_RDPMC));
+                    break;
+                case OP_CLTS:
+                    EMHistoryUpdateFlagsAndType(pVCpu, EMEXIT_MAKE_FLAGS_AND_TYPE(EMEXIT_F_KIND_EM, EMEXITTYPE_CLTS));
+                    break;
+                case OP_WBINVD:
+                    EMHistoryUpdateFlagsAndType(pVCpu, EMEXIT_MAKE_FLAGS_AND_TYPE(EMEXIT_F_KIND_EM, EMEXITTYPE_CLTS));
+                    break;
+                case OP_RDMSR:
+                    EMHistoryUpdateFlagsAndType(pVCpu, EMEXIT_MAKE_FLAGS_AND_TYPE(EMEXIT_F_KIND_EM, EMEXITTYPE_MSR_READ));
+                    break;
+                case OP_WRMSR:
+                    EMHistoryUpdateFlagsAndType(pVCpu, EMEXIT_MAKE_FLAGS_AND_TYPE(EMEXIT_F_KIND_EM, EMEXITTYPE_MSR_WRITE));
+                    break;
+            }
+
             rc = VBOXSTRICTRC_TODO(EMInterpretInstructionDisasState(pVCpu, pCpu, pRegFrame, PC, EMCODETYPE_SUPERVISOR));
             if (rc == VERR_EM_INTERPRETER)
@@ -952 +997 @@
     TRPM_ENTER_DBG_HOOK(0xd);
 
-    switch (pCpu->pCurInstr->uOpcode)
+    uint16_t const uOpcode = pCpu->pCurInstr->uOpcode;
+    switch (uOpcode)
     {
         /*
@@ -967 +1013 @@
         case OP_INT:
         {
+            EMHistoryUpdateFlagsAndType(pVCpu, EMEXIT_MAKE_FLAGS_AND_TYPE(EMEXIT_F_KIND_EM, EMEXITTYPE_INT));
             Assert(pCpu->Param1.fUse & DISUSE_IMMEDIATE8);
             rc = TRPMForwardTrap(pVCpu, pRegFrame, (uint32_t)pCpu->Param1.uValue, pCpu->cbInstr, TRPM_TRAP_NO_ERRORCODE, TRPM_SOFTWARE_INT, 0xd);
@@ -986 +1033 @@
         case OP_SYSCALL:
         case OP_SYSENTER:
+            if (uOpcode == OP_SYSCALL)
+                EMHistoryUpdateFlagsAndType(pVCpu, EMEXIT_MAKE_FLAGS_AND_TYPE(EMEXIT_F_KIND_EM, EMEXITTYPE_SYSCALL));
+            else
+                EMHistoryUpdateFlagsAndType(pVCpu, EMEXIT_MAKE_FLAGS_AND_TYPE(EMEXIT_F_KIND_EM, EMEXITTYPE_SYSENTER));
 #ifdef PATM_EMULATE_SYSENTER
             rc = PATMSysCall(pVM, CPUMCTX_FROM_CORE(pRegFrame), pCpu);
@@ -1127 +1178 @@
      */
     if (Cpu.pCurInstr->uOpcode == OP_RDTSC)
+    {
+        EMHistoryUpdateFlagsAndType(pVCpu, EMEXIT_MAKE_FLAGS_AND_TYPE(EMEXIT_F_KIND_EM, EMEXITTYPE_RDTSC));
         return trpmGCTrap0dHandlerRdTsc(pVM, pVCpu, pRegFrame);
+    }
 
     /*
@@ -1135 +1189 @@
         &&  (Cpu.pCurInstr->fOpType & DISOPTYPE_PORTIO))
     {
+        /* IOMRCIOPortHandler updates exit history. */
         VBOXSTRICTRC rcStrict = IOMRCIOPortHandler(pVM, pVCpu, pRegFrame, &Cpu);
         TRPM_EXIT_DBG_HOOK(0xd);