Changeset 39302 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Nov 15, 2011 10:54:22 AM (13 years ago)

Author:

vboxsync

Message:

nits from a few days back.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAll.cpp (modified) (6 diffs)

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

@@ -579 +579 @@
  * @param   pIemCpu             The per CPU IEM state.
  */
-DECLINLINE(void) iemInitDecode(PIEMCPU pIemCpu)
+DECLINLINE(void) iemInitDecoder(PIEMCPU pIemCpu)
 {
     PCPUMCTX pCtx = pIemCpu->CTX_SUFF(pCtx);
@@ -617 +617 @@
     uint8_t const cbOldOpcodes = pIemCpu->cbOpcode;
 #endif
-    iemInitDecode(pIemCpu);
+    iemInitDecoder(pIemCpu);
 
     /*
@@ -1690 +1690 @@
                             uint64_t    uCr2)
 {
-    NOREF(cbInstr); NOREF(uCr2);
+    NOREF(cbInstr);
 
     /*
@@ -1962 +1962 @@
     pCtx->rip               = uNewEip;
     pCtx->rflags.u         &= ~fEflToClear;
+
+    if (fFlags & IEM_XCPT_FLAGS_CR2)
+        pCtx->cr2 = uCr2;
 
     if (fFlags & IEM_XCPT_FLAGS_T_CPU_XCPT)
@@ -5599 +5602 @@
              || pOrgCtx->rip == 0x00100ffe
             )
+#endif
+#if 1
+       && pOrgCtx->rip == 0x9022bb3a
 #endif
 #if 0
@@ -6423 +6429 @@
 VMM_INT_DECL(VBOXSTRICTRC) IEMInjectTrap(PVMCPU pVCpu, uint8_t u8TrapNo, TRPMEVENT enmType, uint16_t uErrCode, RTGCPTR uCr2)
 {
+    iemInitDecoder(&pVCpu->iem.s);
+
     uint32_t fFlags;
     switch (enmType)