Patchwork [v2,4/5] target-mips: Pass MIPSCPU to mips_tc_sleep()

login
register
mail settings
Submitter Andreas Färber
Date Oct. 11, 2012, 10:56 p.m.
Message ID <1349996197-11054-5-git-send-email-afaerber@suse.de>
Download mbox | patch
Permalink /patch/191021/
State New
Headers show

Comments

Andreas Färber - Oct. 11, 2012, 10:56 p.m.
Needed for changing mips_vpe_sleep() argument type to MIPSCPU.

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 target-mips/op_helper.c |    8 +++++---
 1 Datei geändert, 5 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-)

Patch

diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
index 9770741..5710dd0 100644
--- a/target-mips/op_helper.c
+++ b/target-mips/op_helper.c
@@ -749,8 +749,10 @@  static inline void mips_tc_wake(MIPSCPU *cpu, int tc)
     }
 }
 
-static inline void mips_tc_sleep(CPUMIPSState *c, int tc)
+static inline void mips_tc_sleep(MIPSCPU *cpu, int tc)
 {
+    CPUMIPSState *c = &cpu->env;
+
     /* FIXME: TC reschedule.  */
     if (!mips_vpe_active(c)) {
         mips_vpe_sleep(c);
@@ -1352,7 +1354,7 @@  void helper_mtc0_tchalt(CPUMIPSState *env, target_ulong arg1)
 
     // TODO: Halt TC / Restart (if allocated+active) TC.
     if (env->active_tc.CP0_TCHalt & 1) {
-        mips_tc_sleep(env, env->current_tc);
+        mips_tc_sleep(cpu, env->current_tc);
     } else {
         mips_tc_wake(cpu, env->current_tc);
     }
@@ -1372,7 +1374,7 @@  void helper_mttc0_tchalt(CPUMIPSState *env, target_ulong arg1)
         other->tcs[other_tc].CP0_TCHalt = arg1;
 
     if (arg1 & 1) {
-        mips_tc_sleep(other, other_tc);
+        mips_tc_sleep(other_cpu, other_tc);
     } else {
         mips_tc_wake(other_cpu, other_tc);
     }