diff options
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/TODO | 1 | ||||
| -rw-r--r-- | target-i386/cpu.h | 14 | ||||
| -rw-r--r-- | target-i386/helper.c | 15 | ||||
| -rw-r--r-- | target-i386/op_helper.c | 42 |
4 files changed, 0 insertions, 72 deletions
diff --git a/target-i386/TODO b/target-i386/TODO index b671e24b4e..c8ada075d0 100644 --- a/target-i386/TODO +++ b/target-i386/TODO @@ -30,4 +30,3 @@ Optimizations/Features: - evaluate x87 stack pointer statically - find a way to avoid translating several time the same TB if CR0.TS is set or not. -- move kqemu support outside target-i386. diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 6a96e93298..d4274ea24a 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -682,11 +682,6 @@ typedef struct CPUX86State { uint64_t mask; } mtrr_var[8]; -#ifdef CONFIG_KQEMU - int kqemu_enabled; - int last_io_time; -#endif - /* For KVM */ uint64_t interrupt_bitmap[256 / 64]; uint32_t mp_state; @@ -850,15 +845,6 @@ uint64_t cpu_get_tsc(CPUX86State *env); #define X86_DUMP_FPU 0x0001 /* dump FPU state too */ #define X86_DUMP_CCOP 0x0002 /* dump qemu flag cache */ -#ifdef CONFIG_KQEMU -static inline int cpu_get_time_fast(void) -{ - int low, high; - asm volatile("rdtsc" : "=a" (low), "=d" (high)); - return low; -} -#endif - #define TARGET_PAGE_BITS 12 #define cpu_init cpu_x86_init diff --git a/target-i386/helper.c b/target-i386/helper.c index dd898852c5..e18a5a9c53 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -995,15 +995,11 @@ target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr) /* XXX: This value should match the one returned by CPUID * and in exec.c */ -#if defined(CONFIG_KQEMU) -#define PHYS_ADDR_MASK 0xfffff000LL -#else # if defined(TARGET_X86_64) # define PHYS_ADDR_MASK 0xfffffff000LL # else # define PHYS_ADDR_MASK 0xffffff000LL # endif -#endif /* return value: -1 = cannot handle fault @@ -1743,21 +1739,13 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, /* XXX: This value must match the one used in the MMU code. */ if (env->cpuid_ext2_features & CPUID_EXT2_LM) { /* 64 bit processor */ -#if defined(CONFIG_KQEMU) - *eax = 0x00003020; /* 48 bits virtual, 32 bits physical */ -#else /* XXX: The physical address space is limited to 42 bits in exec.c. */ *eax = 0x00003028; /* 48 bits virtual, 40 bits physical */ -#endif } else { -#if defined(CONFIG_KQEMU) - *eax = 0x00000020; /* 32 bits physical */ -#else if (env->cpuid_features & CPUID_PSE36) *eax = 0x00000024; /* 36 bits physical */ else *eax = 0x00000020; /* 32 bits physical */ -#endif } *ebx = 0; *ecx = 0; @@ -1833,9 +1821,6 @@ CPUX86State *cpu_x86_init(const char *cpu_model) } mce_init(env); cpu_reset(env); -#ifdef CONFIG_KQEMU - kqemu_init(env); -#endif qemu_init_vcpu(env); diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c index 6808a35963..c3f5af69b5 100644 --- a/target-i386/op_helper.c +++ b/target-i386/op_helper.c @@ -1111,14 +1111,6 @@ void helper_sysret(int dflag) env->eflags |= IF_MASK; cpu_x86_set_cpl(env, 3); } -#ifdef CONFIG_KQEMU - if (kqemu_is_ok(env)) { - if (env->hflags & HF_LMA_MASK) - CC_OP = CC_OP_EFLAGS; - env->exception_index = -1; - cpu_loop_exit(); - } -#endif } #endif @@ -2506,12 +2498,6 @@ void helper_lcall_protected(int new_cs, target_ulong new_eip, SET_ESP(sp, sp_mask); EIP = offset; } -#ifdef CONFIG_KQEMU - if (kqemu_is_ok(env)) { - env->exception_index = -1; - cpu_loop_exit(); - } -#endif } /* real and vm86 mode iret */ @@ -2792,24 +2778,11 @@ void helper_iret_protected(int shift, int next_eip) helper_ret_protected(shift, 1, 0); } env->hflags2 &= ~HF2_NMI_MASK; -#ifdef CONFIG_KQEMU - if (kqemu_is_ok(env)) { - CC_OP = CC_OP_EFLAGS; - env->exception_index = -1; - cpu_loop_exit(); - } -#endif } void helper_lret_protected(int shift, int addend) { helper_ret_protected(shift, 0, addend); -#ifdef CONFIG_KQEMU - if (kqemu_is_ok(env)) { - env->exception_index = -1; - cpu_loop_exit(); - } -#endif } void helper_sysenter(void) @@ -2882,12 +2855,6 @@ void helper_sysexit(int dflag) } ESP = ECX; EIP = EDX; -#ifdef CONFIG_KQEMU - if (kqemu_is_ok(env)) { - env->exception_index = -1; - cpu_loop_exit(); - } -#endif } #if defined(CONFIG_USER_ONLY) @@ -3211,15 +3178,6 @@ void helper_rdmsr(void) val = env->kernelgsbase; break; #endif -#ifdef CONFIG_KQEMU - case MSR_QPI_COMMBASE: - if (env->kqemu_enabled) { - val = kqemu_comm_base; - } else { - val = 0; - } - break; -#endif case MSR_MTRRphysBase(0): case MSR_MTRRphysBase(1): case MSR_MTRRphysBase(2): |