diff options
| author | Alan Modra <amodra@gmail.com> | 2020-12-15 22:09:30 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2020-12-16 15:17:52 +1030 |
| commit | cf7a3c01d82abdf110ef85ab770e5997d8ac28ac (patch) | |
| tree | 13ec1df3179075cf8bf216fd986387978ffddc73 /bfd/coffcode.h | |
| parent | a33fc9aed4b3b4384df63850c6fc9046ecbd97f4 (diff) | |
| download | binutils-gdb-cf7a3c01d82abdf110ef85ab770e5997d8ac28ac.tar.gz | |
Lose some COFF/PE static vars, and peicode.h constify
This patch tidies some COFF and PE code that unnecessarily used static
variables to communicate between functions.
* coffcode.h (pelength, peheader): Delete static variables.
(coff_apply_checksum): Instead, define them as auto vars, and pass..
(coff_read_word, coff_compute_checksum): ..to here. Delete
unnecessary forward declarations.
* pei-x86_64.c (pdata_count): Delete static variable.
(struct pex64_paps): New.
(pex64_print_all_pdata_sections, pex64_bfd_print_pdata): Pass
a pex64_paps for counting.
* peicode.h (jtab): Constify.
Diffstat (limited to 'bfd/coffcode.h')
| -rw-r--r-- | bfd/coffcode.h | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/bfd/coffcode.h b/bfd/coffcode.h index 4b934b9b2b9..2a0eeedcd7e 100644 --- a/bfd/coffcode.h +++ b/bfd/coffcode.h @@ -445,14 +445,6 @@ static void * coff_mkobject_hook static flagword handle_COMDAT (bfd *, flagword, void *, const char *, asection *); #endif -#ifdef COFF_IMAGE_WITH_PE -static bfd_boolean coff_read_word - (bfd *, unsigned int *); -static unsigned int coff_compute_checksum - (bfd *); -static bfd_boolean coff_apply_checksum - (bfd *); -#endif #ifdef TICOFF static bfd_boolean ticoff0_bad_format_hook (bfd *, void * ); @@ -3274,11 +3266,8 @@ coff_compute_section_file_positions (bfd * abfd) #ifdef COFF_IMAGE_WITH_PE -static unsigned int pelength; -static unsigned int peheader; - static bfd_boolean -coff_read_word (bfd *abfd, unsigned int *value) +coff_read_word (bfd *abfd, unsigned int *value, unsigned int *pelength) { unsigned char b[2]; int status; @@ -3295,13 +3284,13 @@ coff_read_word (bfd *abfd, unsigned int *value) else *value = (unsigned int) (b[0] + (b[1] << 8)); - pelength += (unsigned int) status; + *pelength += status; return TRUE; } static unsigned int -coff_compute_checksum (bfd *abfd) +coff_compute_checksum (bfd *abfd, unsigned int *pelength) { bfd_boolean more_data; file_ptr filepos; @@ -3309,7 +3298,7 @@ coff_compute_checksum (bfd *abfd) unsigned int total; total = 0; - pelength = 0; + *pelength = 0; filepos = (file_ptr) 0; do @@ -3317,7 +3306,7 @@ coff_compute_checksum (bfd *abfd) if (bfd_seek (abfd, filepos, SEEK_SET) != 0) return 0; - more_data = coff_read_word (abfd, &value); + more_data = coff_read_word (abfd, &value, pelength); total += value; total = 0xffff & (total + (total >> 0x10)); filepos += 2; @@ -3332,11 +3321,13 @@ coff_apply_checksum (bfd *abfd) { unsigned int computed; unsigned int checksum = 0; + unsigned int peheader; + unsigned int pelength; if (bfd_seek (abfd, 0x3c, SEEK_SET) != 0) return FALSE; - if (!coff_read_word (abfd, &peheader)) + if (!coff_read_word (abfd, &peheader, &pelength)) return FALSE; if (bfd_seek (abfd, peheader + 0x58, SEEK_SET) != 0) @@ -3348,7 +3339,7 @@ coff_apply_checksum (bfd *abfd) if (bfd_seek (abfd, peheader, SEEK_SET) != 0) return FALSE; - computed = coff_compute_checksum (abfd); + computed = coff_compute_checksum (abfd, &pelength); checksum = computed + pelength; |