fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More efficient target register / TC accesses.

Browse source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4794 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
ths 2008-06-27 10:02:35 +00:00
parent a37ee56cb7
commit b5dc7732e1
16 changed files with 327 additions and 246 deletions
Download patch file Download diff file Expand all files Collapse all files

26
linux-user/main.c
View file

@ -1779,8 +1779,8 @@ void cpu_loop(CPUMIPSState *env)
trapnr = cpu_mips_exec(env);
switch(trapnr) {
case EXCP_SYSCALL:
syscall_num = env->gpr[env->current_tc][2] - 4000;
env->PC[env->current_tc] += 4;
syscall_num = env->active_tc.gpr[2] - 4000;
env->active_tc.PC += 4;
if (syscall_num >= sizeof(mips_syscall_args)) {
ret = -ENOSYS;
} else {
@ -1789,7 +1789,7 @@ void cpu_loop(CPUMIPSState *env)
abi_ulong arg5 = 0, arg6 = 0, arg7 = 0, arg8 = 0;
nb_args = mips_syscall_args[syscall_num];
sp_reg = env->gpr[env->current_tc][29];
sp_reg = env->active_tc.gpr[29];
switch (nb_args) {
/* these arguments are taken from the stack */
/* FIXME - what to do if get_user() fails? */
@ -1800,20 +1800,20 @@ void cpu_loop(CPUMIPSState *env)
default:
break;
}
ret = do_syscall(env, env->gpr[env->current_tc][2],
env->gpr[env->current_tc][4],
env->gpr[env->current_tc][5],
env->gpr[env->current_tc][6],
env->gpr[env->current_tc][7],
ret = do_syscall(env, env->active_tc.gpr[2],
env->active_tc.gpr[4],
env->active_tc.gpr[5],
env->active_tc.gpr[6],
env->active_tc.gpr[7],
arg5, arg6/*, arg7, arg8*/);
}
if ((unsigned int)ret >= (unsigned int)(-1133)) {
env->gpr[env->current_tc][7] = 1; /* error flag */
env->active_tc.gpr[7] = 1; /* error flag */
ret = -ret;
} else {
env->gpr[env->current_tc][7] = 0; /* error flag */
env->active_tc.gpr[7] = 0; /* error flag */
}
env->gpr[env->current_tc][2] = ret;
env->active_tc.gpr[2] = ret;
break;
case EXCP_TLBL:
case EXCP_TLBS:
@ -2566,9 +2566,9 @@ int main(int argc, char **argv)
int i;
for(i = 0; i < 32; i++) {
env->gpr[env->current_tc][i] = regs->regs[i];
env->active_tc.gpr[i] = regs->regs[i];
}
env->PC[env->current_tc] = regs->cp0_epc;
env->active_tc.PC = regs->cp0_epc;
}
#elif defined(TARGET_SH4)
{

2
linux-user/mips/target_signal.h
View file

@ -23,7 +23,7 @@ typedef struct target_sigaltstack {
static inline abi_ulong get_sp_from_cpustate(CPUMIPSState *state)
{
return state->gpr[state->current_tc][29];
return state->active_tc.gpr[29];
}
#endif /* TARGET_SIGNAL_H */

2
linux-user/mips64/target_signal.h
View file

@ -23,7 +23,7 @@ typedef struct target_sigaltstack {
static inline abi_ulong get_sp_from_cpustate(CPUMIPSState *state)
{
return state->gpr[state->current_tc][29];
return state->active_tc.gpr[29];
}
#endif /* TARGET_SIGNAL_H */

2
linux-user/mipsn32/target_signal.h
View file

@ -23,7 +23,7 @@ typedef struct target_sigaltstack {
static inline target_ulong get_sp_from_cpustate(CPUMIPSState *state)
{
return state->gpr[state->current_tc][29];
return state->active_tc.gpr[29];
}
#endif /* TARGET_SIGNAL_H */

34
linux-user/signal.c
View file

@ -2290,10 +2290,10 @@ setup_sigcontext(CPUState *regs, struct target_sigcontext *sc)
{
int err = 0;
err |= __put_user(regs->PC[regs->current_tc], &sc->sc_pc);
err |= __put_user(regs->active_tc.PC, &sc->sc_pc);
#define save_gp_reg(i) do { \
err |= __put_user(regs->gpr[regs->current_tc][i], &sc->sc_regs[i]); \
#define save_gp_reg(i) do { \
err |= __put_user(regs->active_tc.gpr[i], &sc->sc_regs[i]); \
} while(0)
__put_user(0, &sc->sc_regs[0]); save_gp_reg(1); save_gp_reg(2);
save_gp_reg(3); save_gp_reg(4); save_gp_reg(5); save_gp_reg(6);
@ -2306,8 +2306,8 @@ setup_sigcontext(CPUState *regs, struct target_sigcontext *sc)
save_gp_reg(31);
#undef save_gp_reg
err |= __put_user(regs->HI[regs->current_tc][0], &sc->sc_mdhi);
err |= __put_user(regs->LO[regs->current_tc][0], &sc->sc_mdlo);
err |= __put_user(regs->active_tc.HI[0], &sc->sc_mdhi);
err |= __put_user(regs->active_tc.LO[0], &sc->sc_mdlo);
/* Not used yet, but might be useful if we ever have DSP suppport */
#if 0
@ -2367,11 +2367,11 @@ restore_sigcontext(CPUState *regs, struct target_sigcontext *sc)
err |= __get_user(regs->CP0_EPC, &sc->sc_pc);
err |= __get_user(regs->HI[regs->current_tc][0], &sc->sc_mdhi);
err |= __get_user(regs->LO[regs->current_tc][0], &sc->sc_mdlo);
err |= __get_user(regs->active_tc.HI[0], &sc->sc_mdhi);
err |= __get_user(regs->active_tc.LO[0], &sc->sc_mdlo);
#define restore_gp_reg(i) do { \
err |= __get_user(regs->gpr[regs->current_tc][i], &sc->sc_regs[i]); \
err |= __get_user(regs->active_tc.gpr[i], &sc->sc_regs[i]); \
} while(0)
restore_gp_reg( 1); restore_gp_reg( 2); restore_gp_reg( 3);
restore_gp_reg( 4); restore_gp_reg( 5); restore_gp_reg( 6);
@ -2437,7 +2437,7 @@ get_sigframe(struct target_sigaction *ka, CPUState *regs, size_t frame_size)
unsigned long sp;
/* Default to using normal stack */
sp = regs->gpr[regs->current_tc][29];
sp = regs->active_tc.gpr[29];
/*
* FPU emulator may have it's own trampoline active just
@ -2486,15 +2486,15 @@ static void setup_frame(int sig, struct target_sigaction * ka,
* $25 and PC point to the signal handler, $29 points to the
* struct sigframe.
*/
regs->gpr[regs->current_tc][ 4] = sig;
regs->gpr[regs->current_tc][ 5] = 0;
regs->gpr[regs->current_tc][ 6] = frame_addr + offsetof(struct sigframe, sf_sc);
regs->gpr[regs->current_tc][29] = frame_addr;
regs->gpr[regs->current_tc][31] = frame_addr + offsetof(struct sigframe, sf_code);
regs->active_tc.gpr[ 4] = sig;
regs->active_tc.gpr[ 5] = 0;
regs->active_tc.gpr[ 6] = frame_addr + offsetof(struct sigframe, sf_sc);
regs->active_tc.gpr[29] = frame_addr;
regs->active_tc.gpr[31] = frame_addr + offsetof(struct sigframe, sf_code);
/* The original kernel code sets CP0_EPC to the handler
* since it returns to userland using eret
* we cannot do this here, and we must set PC directly */
regs->PC[regs->current_tc] = regs->gpr[regs->current_tc][25] = ka->_sa_handler;
regs->active_tc.PC = regs->active_tc.gpr[25] = ka->_sa_handler;
unlock_user_struct(frame, frame_addr, 1);
return;
@ -2515,7 +2515,7 @@ long do_sigreturn(CPUState *regs)
#if defined(DEBUG_SIGNAL)
fprintf(stderr, "do_sigreturn\n");
#endif
frame_addr = regs->gpr[regs->current_tc][29];
frame_addr = regs->active_tc.gpr[29];
if (!lock_user_struct(VERIFY_READ, frame, frame_addr, 1))
goto badframe;
@ -2542,7 +2542,7 @@ long do_sigreturn(CPUState *regs)
/* Unreached */
#endif
regs->PC[regs->current_tc] = regs->CP0_EPC;
regs->active_tc.PC = regs->CP0_EPC;
/* I am not sure this is right, but it seems to work
* maybe a problem with nested signals ? */
regs->CP0_EPC = 0;

2
linux-user/syscall.c
View file

@ -3686,7 +3686,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
if (!is_error(ret)) {
#if defined(TARGET_MIPS)
CPUMIPSState *env = (CPUMIPSState*)cpu_env;
env->gpr[env->current_tc][3] = host_pipe[1];
env->active_tc.gpr[3] = host_pipe[1];
ret = host_pipe[0];
#elif defined(TARGET_SH4)
((CPUSH4State*)cpu_env)->gregs[1] = host_pipe[1];