mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-12-11 16:00:50 -07:00
kqemu: merge CONFIG_KQEMU and USE_KQEMU
Basically a recursive ":%s/USE_KQEMU/CONFIG_KQEMU/g". Signed-off-by: Paul Bolle <pebolle@tiscali.nl> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7189 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
ac611340c9
commit
640f42e4e9
16 changed files with 59 additions and 59 deletions
|
|
@ -314,7 +314,7 @@ int cpu_exec(CPUState *env1)
|
|||
}
|
||||
env->exception_index = -1;
|
||||
}
|
||||
#ifdef USE_KQEMU
|
||||
#ifdef CONFIG_KQEMU
|
||||
if (kqemu_is_ok(env) && env->interrupt_request == 0 && env->exit_request == 0) {
|
||||
int ret;
|
||||
env->eflags = env->eflags | helper_cc_compute_all(CC_OP) | (DF & DF_MASK);
|
||||
|
|
@ -594,7 +594,7 @@ int cpu_exec(CPUState *env1)
|
|||
jump. */
|
||||
{
|
||||
if (next_tb != 0 &&
|
||||
#ifdef USE_KQEMU
|
||||
#ifdef CONFIG_KQEMU
|
||||
(env->kqemu_enabled != 2) &&
|
||||
#endif
|
||||
tb->page_addr[1] == -1) {
|
||||
|
|
@ -651,7 +651,7 @@ int cpu_exec(CPUState *env1)
|
|||
}
|
||||
/* reset soft MMU for next block (it can currently
|
||||
only be set by a memory fault) */
|
||||
#if defined(USE_KQEMU)
|
||||
#if defined(CONFIG_KQEMU)
|
||||
#define MIN_CYCLE_BEFORE_SWITCH (100 * 1000)
|
||||
if (kqemu_is_ok(env) &&
|
||||
(cpu_get_time_fast() - env->last_io_time) >= MIN_CYCLE_BEFORE_SWITCH) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue