commit fed223d2bab55eda155e3463b9cb6966e69dd73c
author David 'Digit' Turner <digit@google.com> Mon Mar 24 17:42:47 2014 +0100
committer David 'Digit' Turner <digit@google.com> Wed Apr 09 19:43:25 2014 +0200
tree 4de208a036aead0674b7d640341502304e88f696
parent 6657678c3d86395084f6a699e73614195f06c445

Move singlestep_enabled to CPUState.

The previous patch forgot to move this field from CPU_COMMON to
CPUState, so do it here.

Change-Id: I71ed4605c939eb6c23d3e70b08ea89e59842cdd0

gdbstub.c

diff --git a/gdbstub.c b/gdbstub.c
index 92c4153..28cfe1c 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -1650,7 +1650,7 @@
             addr = strtoull(p, (char **)&p, 16);
             gdb_set_cpu_pc(s, addr);
         }
-        cpu_single_step(s->c_cpu, sstep_flags);
+        cpu_single_step(ENV_GET_CPU(s->c_cpu), sstep_flags);
         gdb_continue(s);
 	return RS_IDLE;
     case 'F':
@@ -1971,7 +1971,7 @@
         return;
 
     /* disable single step if it was enable */
-    cpu_single_step(env, 0);
+    cpu_single_step(ENV_GET_CPU(env), 0);
 
     if (reason == EXCP_DEBUG) {
         if (env->watchpoint_hit) {