diff options
| author | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-19 10:18:01 +0000 |
|---|---|---|
| committer | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-19 10:18:01 +0000 |
| commit | 640f42e4e9d55ef3aa48cc59e8bc8942ce946e1e (patch) | |
| tree | 64bfaf3d5589c87ab9b35055a2ffa00f51d5b104 /target-i386/op_helper.c | |
| parent | ac611340c9e21f3f9f1247a23de08d8764174b83 (diff) | |
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
Diffstat (limited to 'target-i386/op_helper.c')
| -rw-r--r-- | target-i386/op_helper.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c index be092637a0..1a749022b2 100644 --- a/target-i386/op_helper.c +++ b/target-i386/op_helper.c @@ -1119,7 +1119,7 @@ void helper_sysret(int dflag) env->eflags |= IF_MASK; cpu_x86_set_cpl(env, 3); } -#ifdef USE_KQEMU +#ifdef CONFIG_KQEMU if (kqemu_is_ok(env)) { if (env->hflags & HF_LMA_MASK) CC_OP = CC_OP_EFLAGS; @@ -2478,7 +2478,7 @@ void helper_lcall_protected(int new_cs, target_ulong new_eip, SET_ESP(sp, sp_mask); EIP = offset; } -#ifdef USE_KQEMU +#ifdef CONFIG_KQEMU if (kqemu_is_ok(env)) { env->exception_index = -1; cpu_loop_exit(); @@ -2764,7 +2764,7 @@ void helper_iret_protected(int shift, int next_eip) helper_ret_protected(shift, 1, 0); } env->hflags2 &= ~HF2_NMI_MASK; -#ifdef USE_KQEMU +#ifdef CONFIG_KQEMU if (kqemu_is_ok(env)) { CC_OP = CC_OP_EFLAGS; env->exception_index = -1; @@ -2776,7 +2776,7 @@ void helper_iret_protected(int shift, int next_eip) void helper_lret_protected(int shift, int addend) { helper_ret_protected(shift, 0, addend); -#ifdef USE_KQEMU +#ifdef CONFIG_KQEMU if (kqemu_is_ok(env)) { env->exception_index = -1; cpu_loop_exit(); @@ -2854,7 +2854,7 @@ void helper_sysexit(int dflag) } ESP = ECX; EIP = EDX; -#ifdef USE_KQEMU +#ifdef CONFIG_KQEMU if (kqemu_is_ok(env)) { env->exception_index = -1; cpu_loop_exit(); @@ -3167,7 +3167,7 @@ void helper_rdmsr(void) val = env->kernelgsbase; break; #endif -#ifdef USE_KQEMU +#ifdef CONFIG_KQEMU case MSR_QPI_COMMBASE: if (env->kqemu_enabled) { val = kqemu_comm_base; |