mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small cleanup

Browse Source
This commit is contained in:
Stanislav Shwartsman 2012-09-27 07:03:25 +00:00
parent 35ec96f740
commit dc369d831f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bochs/cpu/event.cc
View File

@ -191,11 +191,10 @@ bx_bool BX_CPU_C::handleAsyncEvent(void)
// STOPCLK // STOPCLK
// SMI // SMI
// INIT // INIT
if (is_pending(BX_EVENT_SMI) && ! BX_CPU_THIS_PTR smm_mode() && SVM_GIF) if (is_unmasked_event_pending(BX_EVENT_SMI) && SVM_GIF)
{ {
// clear SMI pending flag and disable NMI when SMM was accepted clear_event(BX_EVENT_SMI); // clear SMI pending flag
clear_event(BX_EVENT_SMI); enter_system_management_mode(); // would disable NMI when SMM was accepted
enter_system_management_mode();
} }
if (is_unmasked_event_pending(BX_EVENT_INIT) && SVM_GIF) { if (is_unmasked_event_pending(BX_EVENT_INIT) && SVM_GIF) {
@ -252,7 +251,7 @@ bx_bool BX_CPU_C::handleAsyncEvent(void)
// boundary because of certain instructions like STI. // boundary because of certain instructions like STI.
} }
#if BX_SUPPORT_VMX >= 2 #if BX_SUPPORT_VMX >= 2
else if (BX_CPU_THIS_PTR in_vmx_guest && is_pending(BX_EVENT_VMX_PREEMPTION_TIMER_EXPIRED)) { else if (is_unmasked_event_pending(BX_EVENT_VMX_PREEMPTION_TIMER_EXPIRED)) {
clear_event(BX_EVENT_VMX_PREEMPTION_TIMER_EXPIRED); clear_event(BX_EVENT_VMX_PREEMPTION_TIMER_EXPIRED);
VMexit_PreemptionTimerExpired(); VMexit_PreemptionTimerExpired();
} }