diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-10-12 00:56:35 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2012-10-17 01:32:11 +0200 |
| commit | b35d77d73c0fc0b60c9937471a17d41c6fb32947 (patch) | |
| tree | d0eda2e70e8df92bb03e0d32bbb24aa9bdb47d99 /target-mips/op_helper.c | |
| parent | 135dd63a190a084fa5e9f1b4695397016bf0ce5a (diff) | |
target-mips: Pass MIPSCPU to mips_vpe_is_wfi()
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>
Diffstat (limited to 'target-mips/op_helper.c')
| -rw-r--r-- | target-mips/op_helper.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c index e721a4d659..9770741cd3 100644 --- a/target-mips/op_helper.c +++ b/target-mips/op_helper.c @@ -714,11 +714,13 @@ void helper_sdm(CPUMIPSState *env, target_ulong addr, target_ulong reglist, #ifndef CONFIG_USER_ONLY /* 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 an interrupt. */ - return c->halted && mips_vpe_active(c); + return env->halted && mips_vpe_active(env); } 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; /* 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); } } @@ -1899,9 +1901,11 @@ target_ulong helper_evpe(CPUMIPSState *env) target_ulong prev = env->mvp->CP0_MVPControl; do { + MIPSCPU *other_cpu = mips_env_get_cpu(other_cpu_env); + if (other_cpu_env != env /* 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. */ other_cpu_env->mvp->CP0_MVPControl |= (1 << CP0MVPCo_EVP); mips_vpe_wake(other_cpu_env); /* And wake it up. */ |