diff mbox

[qom-cpu,v2,16/40] cpu: Move exception_index field from CPU_COMMON to CPUState

Message ID 531F8E51.1010507@suse.de
State New
Headers show

Commit Message

Andreas Färber March 11, 2014, 10:29 p.m. UTC 
Am 10.03.2014 01:15, schrieb Andreas Färber:
> Signed-off-by: Andreas Färber <afaerber@suse.de>

Needs:


Andreas
diff mbox

Patch

diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
index 8434f6e..931536e 100644
--- a/target-arm/op_helper.c
+++ b/target-arm/op_helper.c
@@ -232,10 +232,12 @@  void HELPER(wfi)(CPUARMState *env)

 void HELPER(wfe)(CPUARMState *env)
 {
+    CPUState *cs = CPU(arm_env_get_cpu(env));
+
     /* Don't actually halt the CPU, just yield back to top
      * level loop
      */
-    env->exception_index = EXCP_YIELD;
+    cs->exception_index = EXCP_YIELD;
     cpu_loop_exit(env);
 }