RFC: fix hardwired constants

Gary Benson
2012-01-19T12:01:14Z

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

Hi all,

This is a cleanup I made while poking around in the blockvector code.
I think it's obvious but I wanted to check; I've not invoked the
obvious rule before.

Thanks,
Gary

--
http://gbenson.net/

[-- Attachment #2: patch --]
[-- Type: text/plain, Size: 961 bytes --]

2012-01-19 Gary Benson <gbenson@redhat.com>

* mdebugread.c (sort_blocks): Replace integer constants with ones
derived from FIRST_LOCAL_BLOCK.

diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c
index c95c09b..e6d3b8c 100644
--- a/gdb/mdebugread.c
+++ b/gdb/mdebugread.c
@@ -4713,7 +4713,7 @@ sort_blocks (struct symtab *s)
{
struct blockvector *bv = BLOCKVECTOR (s);

- if (BLOCKVECTOR_NBLOCKS (bv) <= 2)
+ if (BLOCKVECTOR_NBLOCKS (bv) <= FIRST_LOCAL_BLOCK)
{
/* Cosmetic */
if (BLOCK_END (BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK)) == 0)
@@ -4728,7 +4728,7 @@ sort_blocks (struct symtab *s)
* are very different. It would be nice to find a reliable test
* to detect -O3 images in advance.
*/
- if (BLOCKVECTOR_NBLOCKS (bv) > 3)
+ if (BLOCKVECTOR_NBLOCKS (bv) > FIRST_LOCAL_BLOCK + 1)
qsort (&BLOCKVECTOR_BLOCK (bv, FIRST_LOCAL_BLOCK),
BLOCKVECTOR_NBLOCKS (bv) - FIRST_LOCAL_BLOCK,
sizeof (struct block *),