gwj / at91sam9263 · Commits

Commit c45b3c0e1b5125d1588c988dca2174bf3cfa5287

Authored by bellard
1 parent e04f40b5

efer is present even in legacy mode 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1393 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 6 additions and 1 deletions
@@ -431,7 +431,7 @@ int kqemu_cpu_exec(CPUState *env) @@ -431,7 +431,7 @@ int kqemu_cpu_exec(CPUState *env)
431 kenv->cr3 = env->cr[3]; 431 kenv->cr3 = env->cr[3];
432 kenv->cr4 = env->cr[4]; 432 kenv->cr4 = env->cr[4];
433 kenv->a20_mask = env->a20_mask; 433 kenv->a20_mask = env->a20_mask;
434 -#ifdef __x86_64__ 434 +#if KQEMU_VERSION >= 0x010100
435 kenv->efer = env->efer; 435 kenv->efer = env->efer;
436 #endif 436 #endif
437 if (env->dr[7] & 0xff) { 437 if (env->dr[7] & 0xff) {
@@ -530,6 +530,11 @@ int kqemu_cpu_exec(CPUState *env) @@ -530,6 +530,11 @@ int kqemu_cpu_exec(CPUState *env)
530 #endif 530 #endif
531 return 1; 531 return 1;
532 } else if (ret == KQEMU_RET_INTR) { 532 } else if (ret == KQEMU_RET_INTR) {
  533 +#ifdef DEBUG
  534 + if (loglevel & CPU_LOG_INT) {
  535 + cpu_dump_state(env, logfile, fprintf, 0);
  536 + }
  537 +#endif
533 return 0; 538 return 0;
534 } else if (ret == KQEMU_RET_SOFTMMU) { 539 } else if (ret == KQEMU_RET_SOFTMMU) {
535 return 2; 540 return 2;