[patch] Replace magic numbers with macros in gdbserver/tracepoint.c

[patch] Replace magic numbers with macros in gdbserver/tracepoint.c

[Yao Qi]

[-- Attachment #1: Type: text/plain, Size: 247 bytes --]

I happen to read gdbserver/tracepoint.c and find there have been some
macros defined but some magic numbers are still there.  This patch is
replace exiting magic numbers with existing macros.

I'll check it in later today.

-- 
Yao (齐尧)

[-- Attachment #2: 0002-replace-magic-number.patch --]
[-- Type: text/x-patch, Size: 1885 bytes --]

gdb/gdbserver/

2011-12-12  Yao Qi  <yao@codesourcery.com>

	* tracepoint.c (trace_buffer_alloc): Replace magic numbers with macros.
	(upload_fast_traceframes, upload_fast_traceframes): Likewise.
---
 gdb/gdbserver/tracepoint.c |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c
index 585f18d..d53d26b 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);
-- 
1.7.0.4

Re: [patch] Replace magic numbers with macros in gdbserver/tracepoint.c

[Jan Kratochvil]

On Mon, 12 Dec 2011 03:30:35 +0100, Yao Qi wrote:
> -    ipa_trace_buffer_ctrl_curr = (0x80000000
> +    ipa_trace_buffer_ctrl_curr = ( GDBSERVER_UPDATED_FLUSH_COUNT_BIT
                                     ^ excessive space
therefore:
# +    ipa_trace_buffer_ctrl_curr = (GDBSERVER_UPDATED_FLUSH_COUNT_BIT


>  				  | (prev << 12)
>  				  | counter
>  				  | curr_tbctrl_idx);

I have verified the constants.


Thanks,
Jan

[committed] [patch] Replace magic numbers with macros in gdbserver/tracepoint.c

[Yao Qi]

On 12/12/2011 05:43 PM, Jan Kratochvil wrote:
> On Mon, 12 Dec 2011 03:30:35 +0100, Yao Qi wrote:
>> -    ipa_trace_buffer_ctrl_curr = (0x80000000
>> +    ipa_trace_buffer_ctrl_curr = ( GDBSERVER_UPDATED_FLUSH_COUNT_BIT
>                                      ^ excessive space
> therefore:
> # +    ipa_trace_buffer_ctrl_curr = (GDBSERVER_UPDATED_FLUSH_COUNT_BIT
> 

Right, get it fixed.

> 
>>  				  | (prev << 12)
>>  				  | counter
>>  				  | curr_tbctrl_idx);
> 
> I have verified the constants.
> 

Thanks for the review.  Committed.
http://sourceware.org/ml/gdb-cvs/2011-12/msg00106.html

-- 
Yao (齐尧)