aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorYao Qi <yao@codesourcery.com>2011-12-13 01:26:56 +0000
committerYao Qi <yao@codesourcery.com>2011-12-13 01:26:56 +0000
commit2ece82445dd5d00bc07bfcecd0aac5f7716cb6e0 (patch)
treecb406ecdda2f598da3285289a592662f8d88bff4 /gdb
parent8a40f881952f4de4c66bf63eee9661b3ef92d5f0 (diff)
downloadgdb-2ece82445dd5d00bc07bfcecd0aac5f7716cb6e0.zip
gdb-2ece82445dd5d00bc07bfcecd0aac5f7716cb6e0.tar.gz
gdb-2ece82445dd5d00bc07bfcecd0aac5f7716cb6e0.tar.bz2
2011-12-13 Yao Qi <yao@codesourcery.com>
* tracepoint.c (trace_buffer_alloc): Replace magic numbers with macros. (upload_fast_traceframes, upload_fast_traceframes): Likewise.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/gdbserver/ChangeLog6
-rw-r--r--gdb/gdbserver/tracepoint.c15
2 files changed, 14 insertions, 7 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index e08900a..4798660 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-13 Yao Qi <yao@codesourcery.com>
+
+ * tracepoint.c (trace_buffer_alloc): Replace magic numbers with
+ macros.
+ (upload_fast_traceframes, upload_fast_traceframes): Likewise.
+
2011-12-08 Jan Kratochvil <jan.kratochvil@redhat.com>
* linux-low.c (linux_kill): Skip PTRACE_KILL if LWP does not exist.
diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c
index 585f18d..d50b5f3 100644
--- a/gdb/gdbserver/tracepoint.c
+++ b/gdb/gdbserver/tracepoint.c
@@ -1588,8 +1588,9 @@ trace_buffer_alloc (size_t amt)
#ifdef IN_PROCESS_AGENT
/* Build the tentative token. */
- commit_count = (((prev & 0x0007ff00) + 0x100) & 0x0007ff00);
- commit = (((prev & 0x0007ff00) << 12)
+ commit_count = (((prev & GDBSERVER_FLUSH_COUNT_MASK_CURR) + 0x100)
+ & GDBSERVER_FLUSH_COUNT_MASK_CURR);
+ commit = (((prev & GDBSERVER_FLUSH_COUNT_MASK_CURR) << 12)
| commit_count
| curr);
@@ -1621,8 +1622,8 @@ trace_buffer_alloc (size_t amt)
refetch = trace_buffer_ctrl_curr;
- if ((refetch == commit
- || ((refetch & 0x7ff00000) >> 12) == commit_count))
+ if (refetch == commit
+ || ((refetch & GDBSERVER_FLUSH_COUNT_MASK_PREV) >> 12) == commit_count)
{
/* effective */
trace_debug ("change is effective: (prev=%08x, commit=%08x, "
@@ -7080,10 +7081,10 @@ upload_fast_traceframes (void)
/* Update the token, with new counters, and the GDBserver stamp
bit. Alway reuse the current TBC index. */
- prev = ipa_trace_buffer_ctrl_curr & 0x0007ff00;
- counter = (prev + 0x100) & 0x0007ff00;
+ prev = ipa_trace_buffer_ctrl_curr & GDBSERVER_FLUSH_COUNT_MASK_CURR;
+ counter = (prev + 0x100) & GDBSERVER_FLUSH_COUNT_MASK_CURR;
- ipa_trace_buffer_ctrl_curr = (0x80000000
+ ipa_trace_buffer_ctrl_curr = (GDBSERVER_UPDATED_FLUSH_COUNT_BIT
| (prev << 12)
| counter
| curr_tbctrl_idx);