Extract get_uncompressed_size

* compress.c (get_uncompressed_size): New.  Extracted from ...
	(bfd_init_section_decompress_status): This.  Use it.
This commit is contained in:
H.J. Lu 2015-04-04 07:49:35 -07:00
parent e268c0a63c
commit 8bed4e0f7b
2 changed files with 27 additions and 9 deletions

View File

@ -1,3 +1,8 @@
2015-04-04 H.J. Lu <hongjiu.lu@intel.com>
* compress.c (get_uncompressed_size): New. Extracted from ...
(bfd_init_section_decompress_status): This. Use it.
2015-04-02 Andrew Turner <andrew@freebsd.org>
* config.bfd: Add aarch64-*-freebsd* target triple.

View File

@ -59,6 +59,27 @@ decompress_contents (bfd_byte *compressed_buffer,
return rc == Z_OK && strm.avail_out == 0;
}
static bfd_size_type
get_uncompressed_size (bfd_byte *uncompressed_size_buffer)
{
bfd_size_type uncompressed_size = uncompressed_size_buffer[0];
uncompressed_size <<= 8;
uncompressed_size += uncompressed_size_buffer[1];
uncompressed_size <<= 8;
uncompressed_size += uncompressed_size_buffer[2];
uncompressed_size <<= 8;
uncompressed_size += uncompressed_size_buffer[3];
uncompressed_size <<= 8;
uncompressed_size += uncompressed_size_buffer[4];
uncompressed_size <<= 8;
uncompressed_size += uncompressed_size_buffer[5];
uncompressed_size <<= 8;
uncompressed_size += uncompressed_size_buffer[6];
uncompressed_size <<= 8;
uncompressed_size += uncompressed_size_buffer[7];
return uncompressed_size;;
}
/* Compress data of the size specified in @var{uncompressed_size}
and pointed to by @var{uncompressed_buffer} using zlib and store
as the contents field. This function assumes the contents
@ -347,15 +368,7 @@ bfd_init_section_decompress_status (bfd *abfd, sec_ptr sec)
return FALSE;
}
uncompressed_size = compressed_buffer[4]; uncompressed_size <<= 8;
uncompressed_size += compressed_buffer[5]; uncompressed_size <<= 8;
uncompressed_size += compressed_buffer[6]; uncompressed_size <<= 8;
uncompressed_size += compressed_buffer[7]; uncompressed_size <<= 8;
uncompressed_size += compressed_buffer[8]; uncompressed_size <<= 8;
uncompressed_size += compressed_buffer[9]; uncompressed_size <<= 8;
uncompressed_size += compressed_buffer[10]; uncompressed_size <<= 8;
uncompressed_size += compressed_buffer[11];
uncompressed_size = get_uncompressed_size (compressed_buffer + 4);
sec->compressed_size = sec->size;
sec->size = uncompressed_size;
sec->compress_status = DECOMPRESS_SECTION_SIZED;