Ubuntu中文论坛

代码： 全选

650行开始 
#if BX_SUPPORT_VMX 
      VMexit_CR3_Write(i, val_32); 
      if (BX_CPU_THIS_PTR cr0.get_PG() && BX_CPU_THIS_PTR cr4.get_PAE() && 
!long_mode()) { 
        if (! CheckPDPTR(val_32)) { 
          BX_ERROR(("SetCR3(): PDPTR check failed !")); 
          exception(BX_GP_EXCEPTION, 0, 0); 
        } 
      } 
      SetCR3(val_32); 
      BX_INSTR_TLB_CNTRL(BX_CPU_ID, BX_INSTR_MOV_CR3, val_32); 
      break; 
#endif 
#if BX_CPU_LEVEL > 3 
    case 4: // CR4 
#if BX_SUPPORT_VMX 
      val_32 = VMexit_CR4_Write(i, val_32); 
      if (BX_CPU_THIS_PTR cr0.get_PG() && (val_32 & (1<<5)) != 0 /* PAE */ 
&& !long_mode()) { 
        if (! CheckPDPTR(BX_CPU_THIS_PTR cr3)) { 
          BX_ERROR(("SetCR4(): PDPTR check failed !")); 
          exception(BX_GP_EXCEPTION, 0, 0); 
        } 
      } 
      // Protected mode: #GP(0) if attempt to write a 1 to 
      // any reserved bit of CR4 
      if (! SetCR4(val_32)) 
        exception(BX_GP_EXCEPTION, 0, 0); 
      break; 
#endif 
#endif 
    default: 
      BX_ERROR(("MOV_CdRd: #UD - control register %d index out of range", 
i->nnn())); 
      exception(BX_UD_EXCEPTION, 0, 0); 
  } 
} 

683结束 

代码： 全选

@@ -649,7 +649,6 @@
     case 3: // CR3
 #if BX_SUPPORT_VMX
       VMexit_CR3_Write(i, val_32);
-#endif
       if (BX_CPU_THIS_PTR cr0.get_PG() && BX_CPU_THIS_PTR cr4.get_PAE() && !long_mode()) {
         if (! CheckPDPTR(val_32)) {
           BX_ERROR(("SetCR3(): PDPTR check failed !"));
@@ -659,11 +658,11 @@
       SetCR3(val_32);
       BX_INSTR_TLB_CNTRL(BX_CPU_ID, BX_INSTR_MOV_CR3, val_32);
       break;
+#endif
 #if BX_CPU_LEVEL > 3
     case 4: // CR4
 #if BX_SUPPORT_VMX
       val_32 = VMexit_CR4_Write(i, val_32);
-#endif
       if (BX_CPU_THIS_PTR cr0.get_PG() && (val_32 & (1<<5)) != 0 /* PAE */ && !long_mode()) {
         if (! CheckPDPTR(BX_CPU_THIS_PTR cr3)) {
           BX_ERROR(("SetCR4(): PDPTR check failed !"));
@@ -676,6 +675,7 @@
         exception(BX_GP_EXCEPTION, 0, 0);
       break;
 #endif
+#endif
     default:
       BX_ERROR(("MOV_CdRd: #UD - control register %d index out of range", i->nnn()));
       exception(BX_UD_EXCEPTION, 0, 0);