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.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index e08900ac0d3d96f79b57c70504f04ebde3376b69..4798660b184a702b0142e8ff12e7295c60bfbe3d 100644 (file)
--- 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 585f18df1336ff487046b31a65e1f9307cae6c37..d50b5f38bdace843b51d597b9feb5eb95d307292 100644 (file)
--- 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);