summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Touron2013-03-24 17:17:56 (EDT)
committerEugene Tarassov2013-03-27 14:45:02 (EDT)
commit698ffa290d2ec414a10804710e7d5878fd9a6b4e (patch)
treec480ecd4b0fb16d100ef106548cdb452d9c30c44
parentc84feeeda7451fdd0d12eb74d1086af608acd181 (diff)
downloadorg.eclipse.tcf.agent-698ffa290d2ec414a10804710e7d5878fd9a6b4e.zip
org.eclipse.tcf.agent-698ffa290d2ec414a10804710e7d5878fd9a6b4e.tar.gz
org.eclipse.tcf.agent-698ffa290d2ec414a10804710e7d5878fd9a6b4e.tar.bz2
update cpu_disable_stepping mode prototype
-rw-r--r--agent/machine/armv6l/tcf/cpudefs-mdep.c2
-rw-r--r--agent/system/GNU/Linux/tcf/context-linux.c4
-rw-r--r--agent/tcf/framework/cpudefs.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/agent/machine/armv6l/tcf/cpudefs-mdep.c b/agent/machine/armv6l/tcf/cpudefs-mdep.c
index 63b0cb2..cba02f4 100644
--- a/agent/machine/armv6l/tcf/cpudefs-mdep.c
+++ b/agent/machine/armv6l/tcf/cpudefs-mdep.c
@@ -234,7 +234,7 @@ int cpu_enable_stepping_mode (Context * ctx, uint32_t * is_cont) {
return 0;
}
-int cpu_disable_stepping_mode (Context * ctx, ContextAddress unpatched_pc) {
+int cpu_disable_stepping_mode (Context * ctx) {
Context * grp = context_get_group(ctx, CONTEXT_GROUP_PROCESS);
ContextExtensionARM * ext = EXT(grp);
trace (LOG_ALWAYS, "cpu_disable_stepping_mode");
diff --git a/agent/system/GNU/Linux/tcf/context-linux.c b/agent/system/GNU/Linux/tcf/context-linux.c
index dcbf18d..65a450d 100644
--- a/agent/system/GNU/Linux/tcf/context-linux.c
+++ b/agent/system/GNU/Linux/tcf/context-linux.c
@@ -422,7 +422,7 @@ static int do_single_step(Context * ctx) {
if (skip_breakpoint(ctx, 1)) return 0;
trace(LOG_CONTEXT, "context: single step ctx %#lx, id %s", ctx, ctx->id);
- cpu_enable_stepping_mode(ctx, &is_cont);
+ if (cpu_enable_stepping_mode(ctx, &is_cont) < 0) return -1;
if (flush_regs(ctx) < 0) return -1;
if (!ctx->stopped) return 0;
if (is_cont) {
@@ -1385,7 +1385,7 @@ static void event_pid_stopped(pid_t pid, int signal, int event, int syscall) {
else ctx->stopped_by_bp = is_breakpoint_address(ctx, pc1);
ext->end_of_step = !ctx->stopped_by_cb && !ctx->stopped_by_bp && ext->pending_step;
}
- cpu_disable_stepping_mode(ctx, pc1);
+ cpu_disable_stepping_mode(ctx);
ext->pending_step = 0;
send_context_stopped_event(ctx);
}
diff --git a/agent/tcf/framework/cpudefs.h b/agent/tcf/framework/cpudefs.h
index 8ad54eb..0df3826 100644
--- a/agent/tcf/framework/cpudefs.h
+++ b/agent/tcf/framework/cpudefs.h
@@ -319,7 +319,7 @@ extern int cpu_bp_on_suspend(Context * ctx, int * triggered);
/*** CPU external stepping mode API ***/
/* Disable the stepping mode */
-extern int cpu_disable_stepping_mode (Context * ctx, ContextAddress pc);
+extern int cpu_disable_stepping_mode (Context * ctx);
/* Enable the stepping mode */
extern int cpu_enable_stepping_mode (Context * ctx, uint32_t * is_cont);