From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7253 invoked by alias); 19 Jan 2012 12:57:24 -0000 Received: (qmail 7047 invoked by uid 22791); 19 Jan 2012 12:57:23 -0000 X-SWARE-Spam-Status: No, hits=0.1 required=5.0 tests=AWL,BAYES_50,SPF_FAIL X-Spam-Check-By: sourceware.org Received: from gbenson.demon.co.uk (HELO gbenson.demon.co.uk) (80.177.220.214) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 19 Jan 2012 12:57:06 +0000 Date: Thu, 19 Jan 2012 15:33:00 -0000 From: Gary Benson To: gdb-patches@sourceware.org Subject: [commit] Re: RFC: fix hardwired constants Message-ID: <20120119125703.GB7798@redhat.com> Mail-Followup-To: gdb-patches@sourceware.org References: <20120119120052.GA7798@redhat.com> <4F18103D.8090004@redhat.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="GRPZ8SYKNexpdSJ7" Content-Disposition: inline In-Reply-To: <4F18103D.8090004@redhat.com> X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-01/txt/msg00697.txt.bz2 --GRPZ8SYKNexpdSJ7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-length: 366 Pedro Alves wrote: > On 01/19/2012 12:00 PM, Gary Benson wrote: > > 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. > > I think is obvious too. Go ahead and check it in. Thanks Pedro, I've committed it now. Cheers, Gary -- http://gbenson.net/ --GRPZ8SYKNexpdSJ7 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch Content-length: 1537 Index: gdb/ChangeLog =================================================================== RCS file: /cvs/src/src/gdb/ChangeLog,v retrieving revision 1.13748 retrieving revision 1.13749 diff -u -r1.13748 -r1.13749 --- gdb/ChangeLog 18 Jan 2012 18:58:42 -0000 1.13748 +++ gdb/ChangeLog 19 Jan 2012 12:51:04 -0000 1.13749 @@ -1,3 +1,8 @@ +2012-01-19 Gary Benson + + * mdebugread.c (sort_blocks): Replace integer constants with ones + derived from FIRST_LOCAL_BLOCK. + 2012-01-18 Paul Pluzhnikov Jan Kratochvil Index: gdb/mdebugread.c =================================================================== RCS file: /cvs/src/src/gdb/mdebugread.c,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- gdb/mdebugread.c 4 Jan 2012 08:17:06 -0000 1.127 +++ gdb/mdebugread.c 19 Jan 2012 12:51:04 -0000 1.128 @@ -4713,7 +4713,7 @@ { 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 @@ * 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 *), --GRPZ8SYKNexpdSJ7--