SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target-mips: Pass MIPSCPU to mips_vpe_is_wfi()

Browse Source 
Needed for moving halted field to CPUState.
The variable name "c" is retained for MIPSCPU to leave "cpu" for CPUState.

Also change return type to bool while at it.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Andreas Färber 2012-10-12 00:56:35 +02:00 committed by Aurelien Jarno
parent 135dd63a19
commit b35d77d73c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
target-mips/op_helper.c
View File

@ -714,11 +714,13 @@ void helper_sdm(CPUMIPSState *env, target_ulong addr, target_ulong reglist,
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
/* SMP helpers. */ /* SMP helpers. */
static int mips_vpe_is_wfi(CPUMIPSState *c) static bool mips_vpe_is_wfi(MIPSCPU *c)
{ {
CPUMIPSState *env = &c->env;
/* If the VPE is halted but otherwise active, it means it's waiting for /* If the VPE is halted but otherwise active, it means it's waiting for
an interrupt. */ an interrupt. */
return c->halted && mips_vpe_active(c); return env->halted && mips_vpe_active(env);
} }
static inline void mips_vpe_wake(CPUMIPSState *c) static inline void mips_vpe_wake(CPUMIPSState *c)
@ -742,7 +744,7 @@ static inline void mips_tc_wake(MIPSCPU *cpu, int tc)
CPUMIPSState *c = &cpu->env; CPUMIPSState *c = &cpu->env;
/* FIXME: TC reschedule. */ /* FIXME: TC reschedule. */
if (mips_vpe_active(c) && !mips_vpe_is_wfi(c)) { if (mips_vpe_active(c) && !mips_vpe_is_wfi(cpu)) {
mips_vpe_wake(c); mips_vpe_wake(c);
} }
} }
@ -1899,9 +1901,11 @@ target_ulong helper_evpe(CPUMIPSState *env)
target_ulong prev = env->mvp->CP0_MVPControl; target_ulong prev = env->mvp->CP0_MVPControl;
do { do {
MIPSCPU *other_cpu = mips_env_get_cpu(other_cpu_env);
if (other_cpu_env != env if (other_cpu_env != env
/* If the VPE is WFI, don't disturb its sleep. */ /* If the VPE is WFI, don't disturb its sleep. */
&& !mips_vpe_is_wfi(other_cpu_env)) { && !mips_vpe_is_wfi(other_cpu)) {
/* Enable the VPE. */ /* Enable the VPE. */
other_cpu_env->mvp->CP0_MVPControl |= (1 << CP0MVPCo_EVP); other_cpu_env->mvp->CP0_MVPControl |= (1 << CP0MVPCo_EVP);
mips_vpe_wake(other_cpu_env); /* And wake it up. */ mips_vpe_wake(other_cpu_env); /* And wake it up. */