From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20828 invoked by alias); 13 Jan 2005 18:37:47 -0000 Mailing-List: contact binutils-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sources.redhat.com Received: (qmail 20479 invoked from network); 13 Jan 2005 18:37:22 -0000 Received: from unknown (HELO rwcrmhc13.comcast.net) (204.127.198.39) by sourceware.org with SMTP; 13 Jan 2005 18:37:22 -0000 Received: from lucon.org ([24.6.212.230]) by comcast.net (rwcrmhc13) with ESMTP id <2005011318372101500co61ee>; Thu, 13 Jan 2005 18:37:21 +0000 Received: by lucon.org (Postfix, from userid 1000) id F1F77640F4; Thu, 13 Jan 2005 10:37:20 -0800 (PST) Date: Thu, 13 Jan 2005 18:37:00 -0000 From: "H. J. Lu" To: binutils@sources.redhat.com Subject: Re: PATCH: Support more than 1 comp unit Message-ID: <20050113183720.GA32092@lucon.org> References: <20050112015043.GA30123@lucon.org> <20050112015845.GA17796@nevyn.them.org> <20050112041818.GA32039@lucon.org> <20050112172628.GA10871@lucon.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20050112172628.GA10871@lucon.org> User-Agent: Mutt/1.4.1i X-SW-Source: 2005-01/txt/msg00128.txt.bz2 On Wed, Jan 12, 2005 at 09:26:28AM -0800, H. J. Lu wrote: > On Tue, Jan 11, 2005 at 08:18:18PM -0800, H. J. Lu wrote: > > On Tue, Jan 11, 2005 at 08:58:45PM -0500, Daniel Jacobowitz wrote: > > > On Tue, Jan 11, 2005 at 05:50:43PM -0800, H. J. Lu wrote: > > > > _bfd_dwarf2_find_nearest_line doesn't support more than one comp unit. > > > > > > That's obviously not true. Could you be a little more specific about > > > what the problem is that you are trying to solve? > > > > > > > dwarf2_debug has > > > > /* Preserve the original value of info_ptr for the current > > comp_unit so we can find a given entry by its reference. */ > > char* info_ptr_unit; > > > > which is used by find_abstract_instance_name: > > > > info_ptr = unit->stash->info_ptr_unit + die_ref; > > > > The problem is there is only one info_ptr_unit per file for multiple > > CUs. To work with more than one CU, info_ptr_unit has to be updated > > for the current CU when find_abstract_instance_name is called. My > > patch adds the CU offset to comp_unit, which can be used by > > find_abstract_instance_name to adjust info_ptr_unit. > > > > BTW, I have a testcase of a several MB ia64 libc_pic.os generated by > > "ld -r". > > > > This is an updated patch. The last CU is alaway the first on the CU > list. We just need to get the next CU offset from it. > > The fix can be much simpler. We just need to change info_ptr_unit from per file to per comp unit. This patch does that. H.J. --- 2005-01-13 H.J. Lu * dwarf2.c (dwarf2_debug): Move info_ptr_unit to ... (comp_unit): Here. (read_unsigned_leb128): Removed. (read_signed_leb128): Removed. (find_abstract_instance_name): Updated. (parse_comp_unit): Accept info_ptr_unit. (_bfd_dwarf2_find_nearest_line): Set info_ptr_unit for each comp unit and pass it to parse_comp_unit. * elf-eh-frame.c (read_unsigned_leb128): Moved to ... (read_signed_leb128): Moved to ... * libbfd.c: Here. * libbfd-in.h (read_unsigned_leb128): New prototype. (read_signed_leb128): Likewise. * libbfd.h: Regenerated. --- bfd/dwarf2.c.leb128 2005-01-05 09:07:58.000000000 -0800 +++ bfd/dwarf2.c 2005-01-13 10:30:34.041879290 -0800 @@ -84,10 +84,6 @@ struct dwarf2_debug into a buffer yet. */ char* info_ptr; - /* Preserve the original value of info_ptr for the current - comp_unit so we can find a given entry by its reference. */ - char* info_ptr_unit; - /* Pointer to the end of the .debug_info section memory buffer. */ char* info_ptr_end; @@ -155,6 +151,10 @@ struct comp_unit /* TRUE if there is a line number table associated with this comp. unit. */ int stmtlist; + /* Pointer to the current comp_unit so that we can find a given entry + by its reference. */ + char *info_ptr_unit; + /* The offset into .debug_line of the line number table. */ unsigned long line_offset; @@ -321,67 +321,6 @@ read_indirect_string (struct comp_unit* return buf; } -static unsigned int -read_unsigned_leb128 (bfd *abfd ATTRIBUTE_UNUSED, - char *buf, - unsigned int *bytes_read_ptr) -{ - unsigned int result; - unsigned int num_read; - int shift; - unsigned char byte; - - result = 0; - shift = 0; - num_read = 0; - - do - { - byte = bfd_get_8 (abfd, buf); - buf ++; - num_read ++; - result |= ((byte & 0x7f) << shift); - shift += 7; - } - while (byte & 0x80); - - * bytes_read_ptr = num_read; - - return result; -} - -static int -read_signed_leb128 (bfd *abfd ATTRIBUTE_UNUSED, - char *buf, - unsigned int * bytes_read_ptr) -{ - int result; - int shift; - int num_read; - unsigned char byte; - - result = 0; - shift = 0; - num_read = 0; - - do - { - byte = bfd_get_8 (abfd, buf); - buf ++; - num_read ++; - result |= ((byte & 0x7f) << shift); - shift += 7; - } - while (byte & 0x80); - - if ((shift < 32) && (byte & 0x40)) - result |= -(1 << shift); - - * bytes_read_ptr = num_read; - - return result; -} - /* END VERBATIM */ static bfd_uint64_t @@ -1332,7 +1271,7 @@ find_abstract_instance_name (struct comp struct attribute attr; char *name = 0; - info_ptr = unit->stash->info_ptr_unit + die_ref; + info_ptr = unit->info_ptr_unit + die_ref; abbrev_number = read_unsigned_leb128 (abfd, info_ptr, &bytes_read); info_ptr += bytes_read; @@ -1478,6 +1417,7 @@ static struct comp_unit * parse_comp_unit (bfd *abfd, struct dwarf2_debug *stash, bfd_vma unit_length, + char *info_ptr_unit, unsigned int offset_size) { struct comp_unit* unit; @@ -1558,6 +1498,7 @@ parse_comp_unit (bfd *abfd, unit->abbrevs = abbrevs; unit->end_ptr = end_ptr; unit->stash = stash; + unit->info_ptr_unit = info_ptr_unit; for (i = 0; i < abbrev->num_attrs; ++i) { @@ -1803,7 +1744,6 @@ _bfd_dwarf2_find_nearest_line (bfd *abfd if (stash->info_ptr == NULL) return FALSE; - stash->info_ptr_unit = stash->info_ptr; stash->info_ptr_end = stash->info_ptr; for (msec = find_debug_info (abfd, NULL); @@ -1851,6 +1791,7 @@ _bfd_dwarf2_find_nearest_line (bfd *abfd bfd_vma length; bfd_boolean found; unsigned int offset_size = addr_size; + char *info_ptr_unit = stash->info_ptr; length = read_4_bytes (abfd, stash->info_ptr); /* A 0xffffff length is the DWARF3 way of indicating we use @@ -1883,7 +1824,8 @@ _bfd_dwarf2_find_nearest_line (bfd *abfd if (length > 0) { - each = parse_comp_unit (abfd, stash, length, offset_size); + each = parse_comp_unit (abfd, stash, length, info_ptr_unit, + offset_size); stash->info_ptr += length; if ((bfd_vma) (stash->info_ptr - stash->sec_info_ptr) --- bfd/elf-eh-frame.c.leb128 2004-11-16 09:59:14.000000000 -0800 +++ bfd/elf-eh-frame.c 2005-01-12 09:05:48.000000000 -0800 @@ -26,64 +26,6 @@ #define EH_FRAME_HDR_SIZE 8 -/* Helper function for reading uleb128 encoded data. */ - -static bfd_vma -read_unsigned_leb128 (bfd *abfd ATTRIBUTE_UNUSED, - char *buf, - unsigned int *bytes_read_ptr) -{ - bfd_vma result; - unsigned int num_read; - int shift; - unsigned char byte; - - result = 0; - shift = 0; - num_read = 0; - do - { - byte = bfd_get_8 (abfd, (bfd_byte *) buf); - buf++; - num_read++; - result |= (((bfd_vma) byte & 0x7f) << shift); - shift += 7; - } - while (byte & 0x80); - *bytes_read_ptr = num_read; - return result; -} - -/* Helper function for reading sleb128 encoded data. */ - -static bfd_signed_vma -read_signed_leb128 (bfd *abfd ATTRIBUTE_UNUSED, - char *buf, - unsigned int * bytes_read_ptr) -{ - bfd_vma result; - int shift; - int num_read; - unsigned char byte; - - result = 0; - shift = 0; - num_read = 0; - do - { - byte = bfd_get_8 (abfd, (bfd_byte *) buf); - buf ++; - num_read ++; - result |= (((bfd_vma) byte & 0x7f) << shift); - shift += 7; - } - while (byte & 0x80); - if (byte & 0x40) - result |= (((bfd_vma) -1) << (shift - 7)) << 7; - *bytes_read_ptr = num_read; - return result; -} - #define read_uleb128(VAR, BUF) \ do \ { \ --- bfd/libbfd-in.h.leb128 2004-10-11 09:36:15.000000000 -0700 +++ bfd/libbfd-in.h 2005-01-12 09:05:48.000000000 -0800 @@ -686,3 +686,6 @@ extern void bfd_section_already_linked_t (bfd_boolean (*) (struct bfd_section_already_linked_hash_entry *, void *), void *); +extern bfd_vma read_unsigned_leb128 (bfd *, char *, unsigned int *); +extern bfd_signed_vma read_signed_leb128 (bfd *, char *, unsigned int *); + --- bfd/libbfd.c.leb128 2004-08-13 08:00:10.000000000 -0700 +++ bfd/libbfd.c 2005-01-12 09:05:48.000000000 -0800 @@ -860,3 +860,61 @@ warn_deprecated (const char *what, mask |= ~(size_t) func; } } + +/* Helper function for reading uleb128 encoded data. */ + +bfd_vma +read_unsigned_leb128 (bfd *abfd ATTRIBUTE_UNUSED, + char *buf, + unsigned int *bytes_read_ptr) +{ + bfd_vma result; + unsigned int num_read; + int shift; + unsigned char byte; + + result = 0; + shift = 0; + num_read = 0; + do + { + byte = bfd_get_8 (abfd, (bfd_byte *) buf); + buf++; + num_read++; + result |= (((bfd_vma) byte & 0x7f) << shift); + shift += 7; + } + while (byte & 0x80); + *bytes_read_ptr = num_read; + return result; +} + +/* Helper function for reading sleb128 encoded data. */ + +bfd_signed_vma +read_signed_leb128 (bfd *abfd ATTRIBUTE_UNUSED, + char *buf, + unsigned int * bytes_read_ptr) +{ + bfd_vma result; + int shift; + int num_read; + unsigned char byte; + + result = 0; + shift = 0; + num_read = 0; + do + { + byte = bfd_get_8 (abfd, (bfd_byte *) buf); + buf ++; + num_read ++; + result |= (((bfd_vma) byte & 0x7f) << shift); + shift += 7; + } + while (byte & 0x80); + if ((shift < 8 * sizeof (result)) && (byte & 0x40)) + result |= (((bfd_vma) -1) << shift); + *bytes_read_ptr = num_read; + return result; +}