From: Pedro Alves Date: Sun, 20 Jun 2010 22:18:48 +0000 (+0000) Subject: * tracepoint.c (condition_true_at_tracepoint): Don't run compiled X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c6beb2cba632df8ac2cd5fa9392c5c91333fe091;p=deliverable%2Fbinutils-gdb.git * tracepoint.c (condition_true_at_tracepoint): Don't run compiled conditions in gdbserver. --- diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 06c6343032..f25e40980f 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2010-06-20 Pedro Alves + + * tracepoint.c (condition_true_at_tracepoint): Don't run compiled + conditions in gdbserver. + 2010-06-19 Ulrich Weigand * spu-low.c (spu_read_memory): Wrap around local store limit. diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c index 5f2e6b6ffb..6557749273 100644 --- a/gdb/gdbserver/tracepoint.c +++ b/gdb/gdbserver/tracepoint.c @@ -3923,9 +3923,25 @@ condition_true_at_tracepoint (struct tracepoint_hit_ctx *ctx, ULONGEST value = 0; enum eval_result_type err; + /* Presently, gdbserver doesn't run compiled conditions, only the + IPA does. If the program stops at a fast tracepoint's address + (e.g., due to a breakpoint, trap tracepoint, or stepping), + gdbserver preemptively collect the fast tracepoint. Later, on + resume, gdbserver steps over the fast tracepoint like it steps + over breakpoints, so that the IPA doesn't see that fast + tracepoint. This avoids double collects of fast tracepoints in + that stopping scenario. Having gdbserver itself handle the fast + tracepoint gives the user a consistent view of when fast or trap + tracepoints are collected, compared to an alternative where only + trap tracepoints are collected on stop, and fast tracepoints on + resume. When a fast tracepoint is being processed by gdbserver, + it is always the non-compiled condition expression that is + used. */ +#ifdef IN_PROCESS_AGENT if (tpoint->compiled_cond) err = ((condfn) (uintptr_t) (tpoint->compiled_cond)) (ctx, &value); else +#endif err = eval_agent_expr (ctx, NULL, tpoint->cond, &value); if (err != expr_eval_no_error)