mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-01 23:03:54 -06:00
removed obsolete x86 code copy support
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3551 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard
parent
838104f608
commit
ec6338bac3
13 changed files with 23 additions and 327 deletions
126
cpu-exec.c
126
cpu-exec.c
|
|
@ -612,19 +612,9 @@ int cpu_exec(CPUState *env1)
|
|||
#if USE_KQEMU
|
||||
(env->kqemu_enabled != 2) &&
|
||||
#endif
|
||||
tb->page_addr[1] == -1
|
||||
#if defined(TARGET_I386) && defined(USE_CODE_COPY)
|
||||
&& (tb->cflags & CF_CODE_COPY) ==
|
||||
(((TranslationBlock *)(T0 & ~3))->cflags & CF_CODE_COPY)
|
||||
#endif
|
||||
) {
|
||||
tb->page_addr[1] == -1) {
|
||||
spin_lock(&tb_lock);
|
||||
tb_add_jump((TranslationBlock *)(long)(T0 & ~3), T0 & 3, tb);
|
||||
#if defined(USE_CODE_COPY)
|
||||
/* propagates the FP use info */
|
||||
((TranslationBlock *)(T0 & ~3))->cflags |=
|
||||
(tb->cflags & CF_FP_USED);
|
||||
#endif
|
||||
spin_unlock(&tb_lock);
|
||||
}
|
||||
}
|
||||
|
|
@ -648,80 +638,6 @@ int cpu_exec(CPUState *env1)
|
|||
: /* no outputs */
|
||||
: "r" (gen_func)
|
||||
: "r1", "r2", "r3", "r8", "r9", "r10", "r12", "r14");
|
||||
#elif defined(TARGET_I386) && defined(USE_CODE_COPY)
|
||||
{
|
||||
if (!(tb->cflags & CF_CODE_COPY)) {
|
||||
if ((tb->cflags & CF_FP_USED) && env->native_fp_regs) {
|
||||
save_native_fp_state(env);
|
||||
}
|
||||
gen_func();
|
||||
} else {
|
||||
if ((tb->cflags & CF_FP_USED) && !env->native_fp_regs) {
|
||||
restore_native_fp_state(env);
|
||||
}
|
||||
/* we work with native eflags */
|
||||
CC_SRC = cc_table[CC_OP].compute_all();
|
||||
CC_OP = CC_OP_EFLAGS;
|
||||
asm(".globl exec_loop\n"
|
||||
"\n"
|
||||
"debug1:\n"
|
||||
" pushl %%ebp\n"
|
||||
" fs movl %10, %9\n"
|
||||
" fs movl %11, %%eax\n"
|
||||
" andl $0x400, %%eax\n"
|
||||
" fs orl %8, %%eax\n"
|
||||
" pushl %%eax\n"
|
||||
" popf\n"
|
||||
" fs movl %%esp, %12\n"
|
||||
" fs movl %0, %%eax\n"
|
||||
" fs movl %1, %%ecx\n"
|
||||
" fs movl %2, %%edx\n"
|
||||
" fs movl %3, %%ebx\n"
|
||||
" fs movl %4, %%esp\n"
|
||||
" fs movl %5, %%ebp\n"
|
||||
" fs movl %6, %%esi\n"
|
||||
" fs movl %7, %%edi\n"
|
||||
" fs jmp *%9\n"
|
||||
"exec_loop:\n"
|
||||
" fs movl %%esp, %4\n"
|
||||
" fs movl %12, %%esp\n"
|
||||
" fs movl %%eax, %0\n"
|
||||
" fs movl %%ecx, %1\n"
|
||||
" fs movl %%edx, %2\n"
|
||||
" fs movl %%ebx, %3\n"
|
||||
" fs movl %%ebp, %5\n"
|
||||
" fs movl %%esi, %6\n"
|
||||
" fs movl %%edi, %7\n"
|
||||
" pushf\n"
|
||||
" popl %%eax\n"
|
||||
" movl %%eax, %%ecx\n"
|
||||
" andl $0x400, %%ecx\n"
|
||||
" shrl $9, %%ecx\n"
|
||||
" andl $0x8d5, %%eax\n"
|
||||
" fs movl %%eax, %8\n"
|
||||
" movl $1, %%eax\n"
|
||||
" subl %%ecx, %%eax\n"
|
||||
" fs movl %%eax, %11\n"
|
||||
" fs movl %9, %%ebx\n" /* get T0 value */
|
||||
" popl %%ebp\n"
|
||||
:
|
||||
: "m" (*(uint8_t *)offsetof(CPUState, regs[0])),
|
||||
"m" (*(uint8_t *)offsetof(CPUState, regs[1])),
|
||||
"m" (*(uint8_t *)offsetof(CPUState, regs[2])),
|
||||
"m" (*(uint8_t *)offsetof(CPUState, regs[3])),
|
||||
"m" (*(uint8_t *)offsetof(CPUState, regs[4])),
|
||||
"m" (*(uint8_t *)offsetof(CPUState, regs[5])),
|
||||
"m" (*(uint8_t *)offsetof(CPUState, regs[6])),
|
||||
"m" (*(uint8_t *)offsetof(CPUState, regs[7])),
|
||||
"m" (*(uint8_t *)offsetof(CPUState, cc_src)),
|
||||
"m" (*(uint8_t *)offsetof(CPUState, tmp0)),
|
||||
"a" (gen_func),
|
||||
"m" (*(uint8_t *)offsetof(CPUState, df)),
|
||||
"m" (*(uint8_t *)offsetof(CPUState, saved_esp))
|
||||
: "%ecx", "%edx"
|
||||
);
|
||||
}
|
||||
}
|
||||
#elif defined(__ia64)
|
||||
struct fptr {
|
||||
void *ip;
|
||||
|
|
@ -759,11 +675,6 @@ int cpu_exec(CPUState *env1)
|
|||
|
||||
|
||||
#if defined(TARGET_I386)
|
||||
#if defined(USE_CODE_COPY)
|
||||
if (env->native_fp_regs) {
|
||||
save_native_fp_state(env);
|
||||
}
|
||||
#endif
|
||||
/* restore flags in standard format */
|
||||
env->eflags = env->eflags | cc_table[CC_OP].compute_all() | (DF & DF_MASK);
|
||||
#elif defined(TARGET_ARM)
|
||||
|
|
@ -1275,26 +1186,6 @@ static inline int handle_cpu_signal(unsigned long pc, unsigned long address,
|
|||
# define ERROR_sig(context) ((context)->uc_mcontext.gregs[REG_ERR])
|
||||
#endif
|
||||
|
||||
#if defined(USE_CODE_COPY)
|
||||
static void cpu_send_trap(unsigned long pc, int trap,
|
||||
struct ucontext *uc)
|
||||
{
|
||||
TranslationBlock *tb;
|
||||
|
||||
if (cpu_single_env)
|
||||
env = cpu_single_env; /* XXX: find a correct solution for multithread */
|
||||
/* now we have a real cpu fault */
|
||||
tb = tb_find_pc(pc);
|
||||
if (tb) {
|
||||
/* the PC is inside the translated code. It means that we have
|
||||
a virtual CPU fault */
|
||||
cpu_restore_state(tb, env, pc, uc);
|
||||
}
|
||||
sigprocmask(SIG_SETMASK, &uc->uc_sigmask, NULL);
|
||||
raise_exception_err(trap, env->error_code);
|
||||
}
|
||||
#endif
|
||||
|
||||
int cpu_signal_handler(int host_signum, void *pinfo,
|
||||
void *puc)
|
||||
{
|
||||
|
|
@ -1311,17 +1202,10 @@ int cpu_signal_handler(int host_signum, void *pinfo,
|
|||
#endif
|
||||
pc = EIP_sig(uc);
|
||||
trapno = TRAP_sig(uc);
|
||||
#if defined(TARGET_I386) && defined(USE_CODE_COPY)
|
||||
if (trapno == 0x00 || trapno == 0x05) {
|
||||
/* send division by zero or bound exception */
|
||||
cpu_send_trap(pc, trapno, uc);
|
||||
return 1;
|
||||
} else
|
||||
#endif
|
||||
return handle_cpu_signal(pc, (unsigned long)info->si_addr,
|
||||
trapno == 0xe ?
|
||||
(ERROR_sig(uc) >> 1) & 1 : 0,
|
||||
&uc->uc_sigmask, puc);
|
||||
return handle_cpu_signal(pc, (unsigned long)info->si_addr,
|
||||
trapno == 0xe ?
|
||||
(ERROR_sig(uc) >> 1) & 1 : 0,
|
||||
&uc->uc_sigmask, puc);
|
||||
}
|
||||
|
||||
#elif defined(__x86_64__)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue