espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-25 13:27:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix test for records crossing a 64K boundary

Browse Source
This commit is contained in:
Nick Clifton
2002-04-16 10:18:14 +00:00
parent ea91f8bb52
commit 3d8dbe36e2
2 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2002-04-16 Nick Clifton <nickc@cambridge.redhat.com>
* ihex.c (ihex_write_object_contents): Fix check for records
crossing 64K boundaries.
2002-04-16 Alan Modra <amodra@bigpond.net.au>
* elf32-m32r.c (m32r_elf_add_symbol_hook): Check the hash table

9
bfd/ihex.c
View File

@ -288,6 +288,7 @@ ihex_scan (abfd)
lineno = 1;
error = false;
bufsize = 0;
while ((c = ihex_get_byte (abfd, &error)) != EOF)
{
if (c == '\r')
@ -314,11 +315,9 @@ ihex_scan (abfd)
unsigned int chksum;
/* This is a data record. */
pos = bfd_tell (abfd) - 1;
/* Read the header bytes. */
if (bfd_bread (hdr, (bfd_size_type) 8, abfd) != 8)
goto error_return;
@ -336,7 +335,6 @@ ihex_scan (abfd)
type = HEX2 (hdr + 6);
/* Read the data bytes. */
chars = len * 2 + 2;
if (chars >= bufsize)
{
@ -553,7 +551,6 @@ ihex_object_p (abfd)
}
/* OK, it looks like it really is an Intel Hex file. */
if (! ihex_mkobject (abfd)
|| ! ihex_scan (abfd))
return NULL;
@ -875,8 +872,8 @@ ihex_write_object_contents (abfd)
rec_addr = where - (extbase + segbase);
/* Output records shouldn't cross 64K boundaries. */
if (rec_addr + now > 0xfffff)
now = 0xffff - rec_addr;
if (rec_addr + now > 0xffff)
now = 0x10000 - rec_addr;
if (! ihex_write_record (abfd, now, rec_addr, 0, p))
return false;