Commit 6810e154907c4ed3883f3f9fc03507fe45a679ea
1 parent
a64d4718
MIPS halt support - MIPS static state fix (Daniel Jacobowitz)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1689 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
10 additions
and
1 deletions
cpu-exec.c
@@ -191,7 +191,7 @@ static inline TranslationBlock *tb_find_fast(void) | @@ -191,7 +191,7 @@ static inline TranslationBlock *tb_find_fast(void) | ||
191 | cs_base = 0; | 191 | cs_base = 0; |
192 | pc = env->nip; | 192 | pc = env->nip; |
193 | #elif defined(TARGET_MIPS) | 193 | #elif defined(TARGET_MIPS) |
194 | - flags = env->hflags & MIPS_HFLAGS_TMASK; | 194 | + flags = env->hflags & (MIPS_HFLAGS_TMASK | MIPS_HFLAG_BMASK); |
195 | cs_base = 0; | 195 | cs_base = 0; |
196 | pc = env->PC; | 196 | pc = env->PC; |
197 | #else | 197 | #else |
@@ -285,6 +285,15 @@ int cpu_exec(CPUState *env1) | @@ -285,6 +285,15 @@ int cpu_exec(CPUState *env1) | ||
285 | return EXCP_HALTED; | 285 | return EXCP_HALTED; |
286 | } | 286 | } |
287 | } | 287 | } |
288 | +#elif defined(TARGET_MIPS) | ||
289 | + if (env1->halted) { | ||
290 | + if (env1->interrupt_request & | ||
291 | + (CPU_INTERRUPT_HARD | CPU_INTERRUPT_TIMER)) { | ||
292 | + env1->halted = 0; | ||
293 | + } else { | ||
294 | + return EXCP_HALTED; | ||
295 | + } | ||
296 | + } | ||
288 | #endif | 297 | #endif |
289 | 298 | ||
290 | cpu_single_env = env1; | 299 | cpu_single_env = env1; |