mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 08:43:55 -06:00
x86: Introduce CPU_INTERRUPT_NMI
(Jan Kiszka) git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4205 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
6a0d8a1d23
commit
474ea8494a
5 changed files with 14 additions and 2 deletions
|
@ -2383,6 +2383,7 @@ void helper_iret_real(int shift)
|
|||
if (shift == 0)
|
||||
eflags_mask &= 0xffff;
|
||||
load_eflags(new_eflags, eflags_mask);
|
||||
env->hflags &= ~HF_NMI_MASK;
|
||||
}
|
||||
|
||||
static inline void validate_seg(int seg_reg, int cpl)
|
||||
|
@ -2634,6 +2635,7 @@ void helper_iret_protected(int shift, int next_eip)
|
|||
} else {
|
||||
helper_ret_protected(shift, 1, 0);
|
||||
}
|
||||
env->hflags &= ~HF_NMI_MASK;
|
||||
#ifdef USE_KQEMU
|
||||
if (kqemu_is_ok(env)) {
|
||||
CC_OP = CC_OP_EFLAGS;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue