diff options
| author | malc <av1474@comtv.ru> | 2012-06-15 15:53:34 +0400 |
|---|---|---|
| committer | malc <av1474@comtv.ru> | 2012-06-15 15:53:34 +0400 |
| commit | 63bb682a18acc5d2f3219ea96c4d81c1a3b50748 (patch) | |
| tree | 8893d9c687630ab3b8213c934de69bf8e18ae823 /cpu-exec.c | |
| parent | 1417d7e40eaf1418333fb2ec43d0c7f4245b10e7 (diff) | |
| parent | 8219314be689f54ff9814e55d619f87b9d66452a (diff) | |
| download | focaccia-qemu-63bb682a18acc5d2f3219ea96c4d81c1a3b50748.tar.gz focaccia-qemu-63bb682a18acc5d2f3219ea96c4d81c1a3b50748.zip | |
Merge branch 'master' of git://git.qemu.org/qemu
Diffstat (limited to 'cpu-exec.c')
| -rw-r--r-- | cpu-exec.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index 83cac932ed..624c409f7b 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -467,11 +467,18 @@ int cpu_exec(CPUArchState *env) do_interrupt(env); next_tb = 0; } - if (interrupt_request & CPU_INTERRUPT_NMI - && (env->pregs[PR_CCS] & M_FLAG)) { - env->exception_index = EXCP_NMI; - do_interrupt(env); - next_tb = 0; + if (interrupt_request & CPU_INTERRUPT_NMI) { + unsigned int m_flag_archval; + if (env->pregs[PR_VR] < 32) { + m_flag_archval = M_FLAG_V10; + } else { + m_flag_archval = M_FLAG_V32; + } + if ((env->pregs[PR_CCS] & m_flag_archval)) { + env->exception_index = EXCP_NMI; + do_interrupt(env); + next_tb = 0; + } } #elif defined(TARGET_M68K) if (interrupt_request & CPU_INTERRUPT_HARD |