Deleted Added
full compact
peXXigen.c (130562) peXXigen.c (218822)
1/* Support for the generic parts of PE/PEI; the common executable parts.
1/* Support for the generic parts of PE/PEI; the common executable parts.
2 Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
3 Free Software Foundation, Inc.
2 Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
3 2005, 2006, 2007 Free Software Foundation, Inc.
4 Written by Cygnus Solutions.
5
6 This file is part of BFD, the Binary File Descriptor library.
7
8 This program is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version.
12
13 This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details.
17
18 You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software
4 Written by Cygnus Solutions.
5
6 This file is part of BFD, the Binary File Descriptor library.
7
8 This program is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version.
12
13 This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details.
17
18 You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software
20 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
20 Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */
21
22/* Most of this hacked by Steve Chamberlain <sac@cygnus.com>.
23
24 PE/PEI rearrangement (and code added): Donn Terry
25 Softway Systems, Inc. */
26
27/* Hey look, some documentation [and in a place you expect to find it]!
28

--- 18 unchanged lines hidden (view full) ---

47 because the `i' in `pei' also refers to "image". The `pe' format can
48 also create images (i.e. executables), it's just that to run on a win32
49 system you need to use the pei format.
50
51 FIXME: Please add more docs here so the next poor fool that has to hack
52 on this code has a chance of getting something accomplished without
53 wasting too much time. */
54
21
22/* Most of this hacked by Steve Chamberlain <sac@cygnus.com>.
23
24 PE/PEI rearrangement (and code added): Donn Terry
25 Softway Systems, Inc. */
26
27/* Hey look, some documentation [and in a place you expect to find it]!
28

--- 18 unchanged lines hidden (view full) ---

47 because the `i' in `pei' also refers to "image". The `pe' format can
48 also create images (i.e. executables), it's just that to run on a win32
49 system you need to use the pei format.
50
51 FIXME: Please add more docs here so the next poor fool that has to hack
52 on this code has a chance of getting something accomplished without
53 wasting too much time. */
54
55/* This expands into COFF_WITH_pe or COFF_WITH_pep depending on whether
56 we're compiling for straight PE or PE+. */
55/* This expands into COFF_WITH_pe, COFF_WITH_pep, or COFF_WITH_pex64
56 depending on whether we're compiling for straight PE or PE+. */
57#define COFF_WITH_XX
58
57#define COFF_WITH_XX
58
59#include "bfd.h"
60#include "sysdep.h"
59#include "sysdep.h"
60#include "bfd.h"
61#include "libbfd.h"
62#include "coff/internal.h"
63
64/* NOTE: it's strange to be including an architecture specific header
65 in what's supposed to be general (to PE/PEI) code. However, that's
66 where the definitions are, and they don't vary per architecture
67 within PE/PEI, so we get them from there. FIXME: The lack of
68 variance is an assumption which may prove to be incorrect if new
69 PE/PEI targets are created. */
61#include "libbfd.h"
62#include "coff/internal.h"
63
64/* NOTE: it's strange to be including an architecture specific header
65 in what's supposed to be general (to PE/PEI) code. However, that's
66 where the definitions are, and they don't vary per architecture
67 within PE/PEI, so we get them from there. FIXME: The lack of
68 variance is an assumption which may prove to be incorrect if new
69 PE/PEI targets are created. */
70#ifdef COFF_WITH_pep
70#if defined COFF_WITH_pex64
71# include "coff/x86_64.h"
72#elif defined COFF_WITH_pep
71# include "coff/ia64.h"
72#else
73# include "coff/i386.h"
74#endif
75
76#include "coff/pe.h"
77#include "libcoff.h"
78#include "libpei.h"
79
73# include "coff/ia64.h"
74#else
75# include "coff/i386.h"
76#endif
77
78#include "coff/pe.h"
79#include "libcoff.h"
80#include "libpei.h"
81
80#ifdef COFF_WITH_pep
82#if defined COFF_WITH_pep || defined COFF_WITH_pex64
81# undef AOUTSZ
82# define AOUTSZ PEPAOUTSZ
83# define PEAOUTHDR PEPAOUTHDR
84#endif
85
86/* FIXME: This file has various tests of POWERPC_LE_PE. Those tests
87 worked when the code was in peicode.h, but no longer work now that
88 the code is in peigen.c. PowerPC NT is said to be dead. If
89 anybody wants to revive the code, you will have to figure out how
90 to handle those issues. */
83# undef AOUTSZ
84# define AOUTSZ PEPAOUTSZ
85# define PEAOUTHDR PEPAOUTHDR
86#endif
87
88/* FIXME: This file has various tests of POWERPC_LE_PE. Those tests
89 worked when the code was in peicode.h, but no longer work now that
90 the code is in peigen.c. PowerPC NT is said to be dead. If
91 anybody wants to revive the code, you will have to figure out how
92 to handle those issues. */
91
92static void add_data_entry
93 PARAMS ((bfd *, struct internal_extra_pe_aouthdr *, int, char *, bfd_vma));
94static bfd_boolean pe_print_pdata PARAMS ((bfd *, PTR));
95static bfd_boolean pe_print_reloc PARAMS ((bfd *, PTR));
96static bfd_boolean pe_print_idata PARAMS ((bfd *, PTR));
97static bfd_boolean pe_print_edata PARAMS ((bfd *, PTR));
98
93
99
100void
94void
101_bfd_XXi_swap_sym_in (abfd, ext1, in1)
102 bfd *abfd;
103 PTR ext1;
104 PTR in1;
95_bfd_XXi_swap_sym_in (bfd * abfd, void * ext1, void * in1)
105{
106 SYMENT *ext = (SYMENT *) ext1;
107 struct internal_syment *in = (struct internal_syment *) in1;
108
109 if (ext->e.e_name[0] == 0)
110 {
111 in->_n._n_n._n_zeroes = 0;
112 in->_n._n_n._n_offset = H_GET_32 (abfd, ext->e.e.e_offset);

--- 20 unchanged lines hidden (view full) ---

133 symbol. Unfortunately, the value field in the symbol is simply a
134 copy of the .idata section's flags rather than something useful.
135 When these symbols are encountered, change the value to 0 so that
136 they will be handled somewhat correctly in the bfd code. */
137 if (in->n_sclass == C_SECTION)
138 {
139 in->n_value = 0x0;
140
96{
97 SYMENT *ext = (SYMENT *) ext1;
98 struct internal_syment *in = (struct internal_syment *) in1;
99
100 if (ext->e.e_name[0] == 0)
101 {
102 in->_n._n_n._n_zeroes = 0;
103 in->_n._n_n._n_offset = H_GET_32 (abfd, ext->e.e.e_offset);

--- 20 unchanged lines hidden (view full) ---

124 symbol. Unfortunately, the value field in the symbol is simply a
125 copy of the .idata section's flags rather than something useful.
126 When these symbols are encountered, change the value to 0 so that
127 they will be handled somewhat correctly in the bfd code. */
128 if (in->n_sclass == C_SECTION)
129 {
130 in->n_value = 0x0;
131
141#if 0
142 /* FIXME: This is clearly wrong. The problem seems to be that
143 undefined C_SECTION symbols appear in the first object of a
144 MS generated .lib file, and the symbols are not defined
145 anywhere. */
146 in->n_scnum = 1;
147
148 /* I have tried setting the class to 3 and using the following
149 to set the section number. This will put the address of the
150 pointer to the string kernel32.dll at addresses 0 and 0x10
151 off start of idata section which is not correct. */
152#if 0
153 if (strcmp (in->_n._n_name, ".idata$4") == 0)
154 in->n_scnum = 3;
155 else
156 in->n_scnum = 2;
157#endif
158#else
159 /* Create synthetic empty sections as needed. DJ */
160 if (in->n_scnum == 0)
161 {
162 asection *sec;
163
164 for (sec = abfd->sections; sec; sec = sec->next)
165 {
166 if (strcmp (sec->name, in->n_name) == 0)

--- 4 unchanged lines hidden (view full) ---

171 }
172 }
173
174 if (in->n_scnum == 0)
175 {
176 int unused_section_number = 0;
177 asection *sec;
178 char *name;
132 /* Create synthetic empty sections as needed. DJ */
133 if (in->n_scnum == 0)
134 {
135 asection *sec;
136
137 for (sec = abfd->sections; sec; sec = sec->next)
138 {
139 if (strcmp (sec->name, in->n_name) == 0)

--- 4 unchanged lines hidden (view full) ---

144 }
145 }
146
147 if (in->n_scnum == 0)
148 {
149 int unused_section_number = 0;
150 asection *sec;
151 char *name;
152 flagword flags;
179
180 for (sec = abfd->sections; sec; sec = sec->next)
181 if (unused_section_number <= sec->target_index)
182 unused_section_number = sec->target_index + 1;
183
184 name = bfd_alloc (abfd, (bfd_size_type) strlen (in->n_name) + 10);
185 if (name == NULL)
186 return;
187 strcpy (name, in->n_name);
153
154 for (sec = abfd->sections; sec; sec = sec->next)
155 if (unused_section_number <= sec->target_index)
156 unused_section_number = sec->target_index + 1;
157
158 name = bfd_alloc (abfd, (bfd_size_type) strlen (in->n_name) + 10);
159 if (name == NULL)
160 return;
161 strcpy (name, in->n_name);
188 sec = bfd_make_section_anyway (abfd, name);
162 flags = SEC_HAS_CONTENTS | SEC_ALLOC | SEC_DATA | SEC_LOAD;
163 sec = bfd_make_section_anyway_with_flags (abfd, name, flags);
189
190 sec->vma = 0;
191 sec->lma = 0;
164
165 sec->vma = 0;
166 sec->lma = 0;
192 sec->_cooked_size = 0;
193 sec->_raw_size = 0;
167 sec->size = 0;
194 sec->filepos = 0;
195 sec->rel_filepos = 0;
196 sec->reloc_count = 0;
197 sec->line_filepos = 0;
198 sec->lineno_count = 0;
199 sec->userdata = NULL;
168 sec->filepos = 0;
169 sec->rel_filepos = 0;
170 sec->reloc_count = 0;
171 sec->line_filepos = 0;
172 sec->lineno_count = 0;
173 sec->userdata = NULL;
200 sec->next = (asection *) NULL;
201 sec->flags = 0;
174 sec->next = NULL;
202 sec->alignment_power = 2;
175 sec->alignment_power = 2;
203 sec->flags = SEC_HAS_CONTENTS | SEC_ALLOC | SEC_DATA | SEC_LOAD;
204
205 sec->target_index = unused_section_number;
206
207 in->n_scnum = unused_section_number;
208 }
209 in->n_sclass = C_STAT;
176
177 sec->target_index = unused_section_number;
178
179 in->n_scnum = unused_section_number;
180 }
181 in->n_sclass = C_STAT;
210#endif
211 }
212#endif
213
214#ifdef coff_swap_sym_in_hook
215 /* This won't work in peigen.c, but since it's for PPC PE, it's not
216 worth fixing. */
217 coff_swap_sym_in_hook (abfd, ext1, in1);
218#endif
219}
220
221unsigned int
182 }
183#endif
184
185#ifdef coff_swap_sym_in_hook
186 /* This won't work in peigen.c, but since it's for PPC PE, it's not
187 worth fixing. */
188 coff_swap_sym_in_hook (abfd, ext1, in1);
189#endif
190}
191
192unsigned int
222_bfd_XXi_swap_sym_out (abfd, inp, extp)
223 bfd *abfd;
224 PTR inp;
225 PTR extp;
193_bfd_XXi_swap_sym_out (bfd * abfd, void * inp, void * extp)
226{
227 struct internal_syment *in = (struct internal_syment *) inp;
228 SYMENT *ext = (SYMENT *) extp;
229
230 if (in->_n._n_name[0] == 0)
231 {
232 H_PUT_32 (abfd, 0, ext->e.e.e_zeroes);
233 H_PUT_32 (abfd, in->_n._n_n._n_offset, ext->e.e.e_offset);

--- 11 unchanged lines hidden (view full) ---

245
246 H_PUT_8 (abfd, in->n_sclass, ext->e_sclass);
247 H_PUT_8 (abfd, in->n_numaux, ext->e_numaux);
248
249 return SYMESZ;
250}
251
252void
194{
195 struct internal_syment *in = (struct internal_syment *) inp;
196 SYMENT *ext = (SYMENT *) extp;
197
198 if (in->_n._n_name[0] == 0)
199 {
200 H_PUT_32 (abfd, 0, ext->e.e.e_zeroes);
201 H_PUT_32 (abfd, in->_n._n_n._n_offset, ext->e.e.e_offset);

--- 11 unchanged lines hidden (view full) ---

213
214 H_PUT_8 (abfd, in->n_sclass, ext->e_sclass);
215 H_PUT_8 (abfd, in->n_numaux, ext->e_numaux);
216
217 return SYMESZ;
218}
219
220void
253_bfd_XXi_swap_aux_in (abfd, ext1, type, class, indx, numaux, in1)
254 bfd *abfd;
255 PTR ext1;
256 int type;
257 int class;
258 int indx ATTRIBUTE_UNUSED;
259 int numaux ATTRIBUTE_UNUSED;
260 PTR in1;
221_bfd_XXi_swap_aux_in (bfd * abfd,
222 void * ext1,
223 int type,
224 int class,
225 int indx ATTRIBUTE_UNUSED,
226 int numaux ATTRIBUTE_UNUSED,
227 void * in1)
261{
262 AUXENT *ext = (AUXENT *) ext1;
263 union internal_auxent *in = (union internal_auxent *) in1;
264
265 switch (class)
266 {
267 case C_FILE:
268 if (ext->x_file.x_fname[0] == 0)

--- 48 unchanged lines hidden (view full) ---

317 else
318 {
319 in->x_sym.x_misc.x_lnsz.x_lnno = GET_LNSZ_LNNO (abfd, ext);
320 in->x_sym.x_misc.x_lnsz.x_size = GET_LNSZ_SIZE (abfd, ext);
321 }
322}
323
324unsigned int
228{
229 AUXENT *ext = (AUXENT *) ext1;
230 union internal_auxent *in = (union internal_auxent *) in1;
231
232 switch (class)
233 {
234 case C_FILE:
235 if (ext->x_file.x_fname[0] == 0)

--- 48 unchanged lines hidden (view full) ---

284 else
285 {
286 in->x_sym.x_misc.x_lnsz.x_lnno = GET_LNSZ_LNNO (abfd, ext);
287 in->x_sym.x_misc.x_lnsz.x_size = GET_LNSZ_SIZE (abfd, ext);
288 }
289}
290
291unsigned int
325_bfd_XXi_swap_aux_out (abfd, inp, type, class, indx, numaux, extp)
326 bfd *abfd;
327 PTR inp;
328 int type;
329 int class;
330 int indx ATTRIBUTE_UNUSED;
331 int numaux ATTRIBUTE_UNUSED;
332 PTR extp;
292_bfd_XXi_swap_aux_out (bfd * abfd,
293 void * inp,
294 int type,
295 int class,
296 int indx ATTRIBUTE_UNUSED,
297 int numaux ATTRIBUTE_UNUSED,
298 void * extp)
333{
334 union internal_auxent *in = (union internal_auxent *) inp;
335 AUXENT *ext = (AUXENT *) extp;
336
299{
300 union internal_auxent *in = (union internal_auxent *) inp;
301 AUXENT *ext = (AUXENT *) extp;
302
337 memset ((PTR) ext, 0, AUXESZ);
303 memset (ext, 0, AUXESZ);
304
338 switch (class)
339 {
340 case C_FILE:
341 if (in->x_file.x_fname[0] == 0)
342 {
343 H_PUT_32 (abfd, 0, ext->x_file.x_n.x_zeroes);
344 H_PUT_32 (abfd, in->x_file.x_n.x_offset, ext->x_file.x_n.x_offset);
345 }

--- 45 unchanged lines hidden (view full) ---

391 PUT_LNSZ_LNNO (abfd, in->x_sym.x_misc.x_lnsz.x_lnno, ext);
392 PUT_LNSZ_SIZE (abfd, in->x_sym.x_misc.x_lnsz.x_size, ext);
393 }
394
395 return AUXESZ;
396}
397
398void
305 switch (class)
306 {
307 case C_FILE:
308 if (in->x_file.x_fname[0] == 0)
309 {
310 H_PUT_32 (abfd, 0, ext->x_file.x_n.x_zeroes);
311 H_PUT_32 (abfd, in->x_file.x_n.x_offset, ext->x_file.x_n.x_offset);
312 }

--- 45 unchanged lines hidden (view full) ---

358 PUT_LNSZ_LNNO (abfd, in->x_sym.x_misc.x_lnsz.x_lnno, ext);
359 PUT_LNSZ_SIZE (abfd, in->x_sym.x_misc.x_lnsz.x_size, ext);
360 }
361
362 return AUXESZ;
363}
364
365void
399_bfd_XXi_swap_lineno_in (abfd, ext1, in1)
400 bfd *abfd;
401 PTR ext1;
402 PTR in1;
366_bfd_XXi_swap_lineno_in (bfd * abfd, void * ext1, void * in1)
403{
404 LINENO *ext = (LINENO *) ext1;
405 struct internal_lineno *in = (struct internal_lineno *) in1;
406
407 in->l_addr.l_symndx = H_GET_32 (abfd, ext->l_addr.l_symndx);
408 in->l_lnno = GET_LINENO_LNNO (abfd, ext);
409}
410
411unsigned int
367{
368 LINENO *ext = (LINENO *) ext1;
369 struct internal_lineno *in = (struct internal_lineno *) in1;
370
371 in->l_addr.l_symndx = H_GET_32 (abfd, ext->l_addr.l_symndx);
372 in->l_lnno = GET_LINENO_LNNO (abfd, ext);
373}
374
375unsigned int
412_bfd_XXi_swap_lineno_out (abfd, inp, outp)
413 bfd *abfd;
414 PTR inp;
415 PTR outp;
376_bfd_XXi_swap_lineno_out (bfd * abfd, void * inp, void * outp)
416{
417 struct internal_lineno *in = (struct internal_lineno *) inp;
418 struct external_lineno *ext = (struct external_lineno *) outp;
419 H_PUT_32 (abfd, in->l_addr.l_symndx, ext->l_addr.l_symndx);
420
421 PUT_LINENO_LNNO (abfd, in->l_lnno, ext);
422 return LINESZ;
423}
424
425void
377{
378 struct internal_lineno *in = (struct internal_lineno *) inp;
379 struct external_lineno *ext = (struct external_lineno *) outp;
380 H_PUT_32 (abfd, in->l_addr.l_symndx, ext->l_addr.l_symndx);
381
382 PUT_LINENO_LNNO (abfd, in->l_lnno, ext);
383 return LINESZ;
384}
385
386void
426_bfd_XXi_swap_aouthdr_in (abfd, aouthdr_ext1, aouthdr_int1)
427 bfd *abfd;
428 PTR aouthdr_ext1;
429 PTR aouthdr_int1;
387_bfd_XXi_swap_aouthdr_in (bfd * abfd,
388 void * aouthdr_ext1,
389 void * aouthdr_int1)
430{
390{
431 struct internal_extra_pe_aouthdr *a;
432 PEAOUTHDR *src = (PEAOUTHDR *) (aouthdr_ext1);
433 AOUTHDR *aouthdr_ext = (AOUTHDR *) aouthdr_ext1;
434 struct internal_aouthdr *aouthdr_int = (struct internal_aouthdr *)aouthdr_int1;
391 PEAOUTHDR * src = (PEAOUTHDR *) aouthdr_ext1;
392 AOUTHDR * aouthdr_ext = (AOUTHDR *) aouthdr_ext1;
393 struct internal_aouthdr *aouthdr_int
394 = (struct internal_aouthdr *) aouthdr_int1;
395 struct internal_extra_pe_aouthdr *a = &aouthdr_int->pe;
435
436 aouthdr_int->magic = H_GET_16 (abfd, aouthdr_ext->magic);
437 aouthdr_int->vstamp = H_GET_16 (abfd, aouthdr_ext->vstamp);
438 aouthdr_int->tsize = GET_AOUTHDR_TSIZE (abfd, aouthdr_ext->tsize);
439 aouthdr_int->dsize = GET_AOUTHDR_DSIZE (abfd, aouthdr_ext->dsize);
440 aouthdr_int->bsize = GET_AOUTHDR_BSIZE (abfd, aouthdr_ext->bsize);
441 aouthdr_int->entry = GET_AOUTHDR_ENTRY (abfd, aouthdr_ext->entry);
442 aouthdr_int->text_start =
443 GET_AOUTHDR_TEXT_START (abfd, aouthdr_ext->text_start);
396
397 aouthdr_int->magic = H_GET_16 (abfd, aouthdr_ext->magic);
398 aouthdr_int->vstamp = H_GET_16 (abfd, aouthdr_ext->vstamp);
399 aouthdr_int->tsize = GET_AOUTHDR_TSIZE (abfd, aouthdr_ext->tsize);
400 aouthdr_int->dsize = GET_AOUTHDR_DSIZE (abfd, aouthdr_ext->dsize);
401 aouthdr_int->bsize = GET_AOUTHDR_BSIZE (abfd, aouthdr_ext->bsize);
402 aouthdr_int->entry = GET_AOUTHDR_ENTRY (abfd, aouthdr_ext->entry);
403 aouthdr_int->text_start =
404 GET_AOUTHDR_TEXT_START (abfd, aouthdr_ext->text_start);
444#ifndef COFF_WITH_pep
445 /* PE32+ does not have data_start member! */
405#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
406 /* PE32+ does not have data_start member! */
446 aouthdr_int->data_start =
447 GET_AOUTHDR_DATA_START (abfd, aouthdr_ext->data_start);
407 aouthdr_int->data_start =
408 GET_AOUTHDR_DATA_START (abfd, aouthdr_ext->data_start);
409 a->BaseOfData = aouthdr_int->data_start;
448#endif
449
410#endif
411
450 a = &aouthdr_int->pe;
412 a->Magic = aouthdr_int->magic;
413 a->MajorLinkerVersion = H_GET_8 (abfd, aouthdr_ext->vstamp);
414 a->MinorLinkerVersion = H_GET_8 (abfd, aouthdr_ext->vstamp + 1);
415 a->SizeOfCode = aouthdr_int->tsize ;
416 a->SizeOfInitializedData = aouthdr_int->dsize ;
417 a->SizeOfUninitializedData = aouthdr_int->bsize ;
418 a->AddressOfEntryPoint = aouthdr_int->entry;
419 a->BaseOfCode = aouthdr_int->text_start;
451 a->ImageBase = GET_OPTHDR_IMAGE_BASE (abfd, src->ImageBase);
452 a->SectionAlignment = H_GET_32 (abfd, src->SectionAlignment);
453 a->FileAlignment = H_GET_32 (abfd, src->FileAlignment);
454 a->MajorOperatingSystemVersion =
455 H_GET_16 (abfd, src->MajorOperatingSystemVersion);
456 a->MinorOperatingSystemVersion =
457 H_GET_16 (abfd, src->MinorOperatingSystemVersion);
458 a->MajorImageVersion = H_GET_16 (abfd, src->MajorImageVersion);

--- 20 unchanged lines hidden (view full) ---

479 {
480 int idx;
481
482 for (idx = 0; idx < 16; idx++)
483 {
484 /* If data directory is empty, rva also should be 0. */
485 int size =
486 H_GET_32 (abfd, src->DataDirectory[idx][1]);
420 a->ImageBase = GET_OPTHDR_IMAGE_BASE (abfd, src->ImageBase);
421 a->SectionAlignment = H_GET_32 (abfd, src->SectionAlignment);
422 a->FileAlignment = H_GET_32 (abfd, src->FileAlignment);
423 a->MajorOperatingSystemVersion =
424 H_GET_16 (abfd, src->MajorOperatingSystemVersion);
425 a->MinorOperatingSystemVersion =
426 H_GET_16 (abfd, src->MinorOperatingSystemVersion);
427 a->MajorImageVersion = H_GET_16 (abfd, src->MajorImageVersion);

--- 20 unchanged lines hidden (view full) ---

448 {
449 int idx;
450
451 for (idx = 0; idx < 16; idx++)
452 {
453 /* If data directory is empty, rva also should be 0. */
454 int size =
455 H_GET_32 (abfd, src->DataDirectory[idx][1]);
456
487 a->DataDirectory[idx].Size = size;
488
489 if (size)
490 a->DataDirectory[idx].VirtualAddress =
491 H_GET_32 (abfd, src->DataDirectory[idx][0]);
492 else
493 a->DataDirectory[idx].VirtualAddress = 0;
494 }
495 }
496
497 if (aouthdr_int->entry)
498 {
499 aouthdr_int->entry += a->ImageBase;
457 a->DataDirectory[idx].Size = size;
458
459 if (size)
460 a->DataDirectory[idx].VirtualAddress =
461 H_GET_32 (abfd, src->DataDirectory[idx][0]);
462 else
463 a->DataDirectory[idx].VirtualAddress = 0;
464 }
465 }
466
467 if (aouthdr_int->entry)
468 {
469 aouthdr_int->entry += a->ImageBase;
500#ifndef COFF_WITH_pep
470#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
501 aouthdr_int->entry &= 0xffffffff;
502#endif
503 }
504
505 if (aouthdr_int->tsize)
506 {
507 aouthdr_int->text_start += a->ImageBase;
471 aouthdr_int->entry &= 0xffffffff;
472#endif
473 }
474
475 if (aouthdr_int->tsize)
476 {
477 aouthdr_int->text_start += a->ImageBase;
508#ifndef COFF_WITH_pep
478#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
509 aouthdr_int->text_start &= 0xffffffff;
510#endif
511 }
512
479 aouthdr_int->text_start &= 0xffffffff;
480#endif
481 }
482
513#ifndef COFF_WITH_pep
514 /* PE32+ does not have data_start member! */
483#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
484 /* PE32+ does not have data_start member! */
515 if (aouthdr_int->dsize)
516 {
517 aouthdr_int->data_start += a->ImageBase;
518 aouthdr_int->data_start &= 0xffffffff;
519 }
520#endif
521
522#ifdef POWERPC_LE_PE
523 /* These three fields are normally set up by ppc_relocate_section.
524 In the case of reading a file in, we can pick them up from the
525 DataDirectory. */
485 if (aouthdr_int->dsize)
486 {
487 aouthdr_int->data_start += a->ImageBase;
488 aouthdr_int->data_start &= 0xffffffff;
489 }
490#endif
491
492#ifdef POWERPC_LE_PE
493 /* These three fields are normally set up by ppc_relocate_section.
494 In the case of reading a file in, we can pick them up from the
495 DataDirectory. */
526 first_thunk_address = a->DataDirectory[12].VirtualAddress;
527 thunk_size = a->DataDirectory[12].Size;
528 import_table_size = a->DataDirectory[1].Size;
496 first_thunk_address = a->DataDirectory[PE_IMPORT_ADDRESS_TABLE].VirtualAddress;
497 thunk_size = a->DataDirectory[PE_IMPORT_ADDRESS_TABLE].Size;
498 import_table_size = a->DataDirectory[PE_IMPORT_TABLE].Size;
529#endif
530}
531
532/* A support function for below. */
533
534static void
499#endif
500}
501
502/* A support function for below. */
503
504static void
535add_data_entry (abfd, aout, idx, name, base)
536 bfd *abfd;
537 struct internal_extra_pe_aouthdr *aout;
538 int idx;
539 char *name;
540 bfd_vma base;
505add_data_entry (bfd * abfd,
506 struct internal_extra_pe_aouthdr *aout,
507 int idx,
508 char *name,
509 bfd_vma base)
541{
542 asection *sec = bfd_get_section_by_name (abfd, name);
543
544 /* Add import directory information if it exists. */
545 if ((sec != NULL)
546 && (coff_section_data (abfd, sec) != NULL)
547 && (pei_section_data (abfd, sec) != NULL))
548 {

--- 6 unchanged lines hidden (view full) ---

555 aout->DataDirectory[idx].VirtualAddress =
556 (sec->vma - base) & 0xffffffff;
557 sec->flags |= SEC_DATA;
558 }
559 }
560}
561
562unsigned int
510{
511 asection *sec = bfd_get_section_by_name (abfd, name);
512
513 /* Add import directory information if it exists. */
514 if ((sec != NULL)
515 && (coff_section_data (abfd, sec) != NULL)
516 && (pei_section_data (abfd, sec) != NULL))
517 {

--- 6 unchanged lines hidden (view full) ---

524 aout->DataDirectory[idx].VirtualAddress =
525 (sec->vma - base) & 0xffffffff;
526 sec->flags |= SEC_DATA;
527 }
528 }
529}
530
531unsigned int
563_bfd_XXi_swap_aouthdr_out (abfd, in, out)
564 bfd *abfd;
565 PTR in;
566 PTR out;
532_bfd_XXi_swap_aouthdr_out (bfd * abfd, void * in, void * out)
567{
568 struct internal_aouthdr *aouthdr_in = (struct internal_aouthdr *) in;
569 pe_data_type *pe = pe_data (abfd);
570 struct internal_extra_pe_aouthdr *extra = &pe->pe_opthdr;
571 PEAOUTHDR *aouthdr_out = (PEAOUTHDR *) out;
572 bfd_vma sa, fa, ib;
573 IMAGE_DATA_DIRECTORY idata2, idata5, tls;
574

--- 7 unchanged lines hidden (view full) ---

582
583 if (extra->Subsystem == IMAGE_SUBSYSTEM_UNKNOWN)
584 extra->Subsystem = pe->target_subsystem;
585
586 sa = extra->SectionAlignment;
587 fa = extra->FileAlignment;
588 ib = extra->ImageBase;
589
533{
534 struct internal_aouthdr *aouthdr_in = (struct internal_aouthdr *) in;
535 pe_data_type *pe = pe_data (abfd);
536 struct internal_extra_pe_aouthdr *extra = &pe->pe_opthdr;
537 PEAOUTHDR *aouthdr_out = (PEAOUTHDR *) out;
538 bfd_vma sa, fa, ib;
539 IMAGE_DATA_DIRECTORY idata2, idata5, tls;
540

--- 7 unchanged lines hidden (view full) ---

548
549 if (extra->Subsystem == IMAGE_SUBSYSTEM_UNKNOWN)
550 extra->Subsystem = pe->target_subsystem;
551
552 sa = extra->SectionAlignment;
553 fa = extra->FileAlignment;
554 ib = extra->ImageBase;
555
590 idata2 = pe->pe_opthdr.DataDirectory[1];
591 idata5 = pe->pe_opthdr.DataDirectory[12];
592 tls = pe->pe_opthdr.DataDirectory[9];
556 idata2 = pe->pe_opthdr.DataDirectory[PE_IMPORT_TABLE];
557 idata5 = pe->pe_opthdr.DataDirectory[PE_IMPORT_ADDRESS_TABLE];
558 tls = pe->pe_opthdr.DataDirectory[PE_TLS_TABLE];
593
594 if (aouthdr_in->tsize)
595 {
596 aouthdr_in->text_start -= ib;
559
560 if (aouthdr_in->tsize)
561 {
562 aouthdr_in->text_start -= ib;
597#ifndef COFF_WITH_pep
563#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
598 aouthdr_in->text_start &= 0xffffffff;
599#endif
600 }
601
602 if (aouthdr_in->dsize)
603 {
604 aouthdr_in->data_start -= ib;
564 aouthdr_in->text_start &= 0xffffffff;
565#endif
566 }
567
568 if (aouthdr_in->dsize)
569 {
570 aouthdr_in->data_start -= ib;
605#ifndef COFF_WITH_pep
571#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
606 aouthdr_in->data_start &= 0xffffffff;
607#endif
608 }
609
610 if (aouthdr_in->entry)
611 {
612 aouthdr_in->entry -= ib;
572 aouthdr_in->data_start &= 0xffffffff;
573#endif
574 }
575
576 if (aouthdr_in->entry)
577 {
578 aouthdr_in->entry -= ib;
613#ifndef COFF_WITH_pep
579#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
614 aouthdr_in->entry &= 0xffffffff;
615#endif
616 }
617
618#define FA(x) (((x) + fa -1 ) & (- fa))
619#define SA(x) (((x) + sa -1 ) & (- sa))
620
621 /* We like to have the sizes aligned. */

--- 12 unchanged lines hidden (view full) ---

634 .idata$5. It will be done in bfd_coff_final_link where all the
635 required information is available. If however, we are not going
636 to perform a final link, eg because we have been invoked by objcopy
637 or strip, then we need to make sure that these Data Directory
638 entries are initialised properly.
639
640 So - we copy the input values into the output values, and then, if
641 a final link is going to be performed, it can overwrite them. */
580 aouthdr_in->entry &= 0xffffffff;
581#endif
582 }
583
584#define FA(x) (((x) + fa -1 ) & (- fa))
585#define SA(x) (((x) + sa -1 ) & (- sa))
586
587 /* We like to have the sizes aligned. */

--- 12 unchanged lines hidden (view full) ---

600 .idata$5. It will be done in bfd_coff_final_link where all the
601 required information is available. If however, we are not going
602 to perform a final link, eg because we have been invoked by objcopy
603 or strip, then we need to make sure that these Data Directory
604 entries are initialised properly.
605
606 So - we copy the input values into the output values, and then, if
607 a final link is going to be performed, it can overwrite them. */
642 extra->DataDirectory[1] = idata2;
643 extra->DataDirectory[12] = idata5;
644 extra->DataDirectory[9] = tls;
608 extra->DataDirectory[PE_IMPORT_TABLE] = idata2;
609 extra->DataDirectory[PE_IMPORT_ADDRESS_TABLE] = idata5;
610 extra->DataDirectory[PE_TLS_TABLE] = tls;
645
611
646 if (extra->DataDirectory[1].VirtualAddress == 0)
612 if (extra->DataDirectory[PE_IMPORT_TABLE].VirtualAddress == 0)
647 /* Until other .idata fixes are made (pending patch), the entry for
648 .idata is needed for backwards compatibility. FIXME. */
649 add_data_entry (abfd, extra, 1, ".idata", ib);
650
651 /* For some reason, the virtual size (which is what's set by
652 add_data_entry) for .reloc is not the same as the size recorded
653 in this slot by MSVC; it doesn't seem to cause problems (so far),
654 but since it's the best we've got, use it. It does do the right
655 thing for .pdata. */
656 if (pe->has_reloc_section)
657 add_data_entry (abfd, extra, 5, ".reloc", ib);
658
659 {
660 asection *sec;
613 /* Until other .idata fixes are made (pending patch), the entry for
614 .idata is needed for backwards compatibility. FIXME. */
615 add_data_entry (abfd, extra, 1, ".idata", ib);
616
617 /* For some reason, the virtual size (which is what's set by
618 add_data_entry) for .reloc is not the same as the size recorded
619 in this slot by MSVC; it doesn't seem to cause problems (so far),
620 but since it's the best we've got, use it. It does do the right
621 thing for .pdata. */
622 if (pe->has_reloc_section)
623 add_data_entry (abfd, extra, 5, ".reloc", ib);
624
625 {
626 asection *sec;
627 bfd_vma hsize = 0;
661 bfd_vma dsize = 0;
628 bfd_vma dsize = 0;
662 bfd_vma isize = SA(abfd->sections->filepos);
629 bfd_vma isize = 0;
663 bfd_vma tsize = 0;
664
665 for (sec = abfd->sections; sec; sec = sec->next)
666 {
630 bfd_vma tsize = 0;
631
632 for (sec = abfd->sections; sec; sec = sec->next)
633 {
667 int rounded = FA(sec->_raw_size);
634 int rounded = FA (sec->size);
668
635
636 /* The first non-zero section filepos is the header size.
637 Sections without contents will have a filepos of 0. */
638 if (hsize == 0)
639 hsize = sec->filepos;
669 if (sec->flags & SEC_DATA)
670 dsize += rounded;
671 if (sec->flags & SEC_CODE)
672 tsize += rounded;
673 /* The image size is the total VIRTUAL size (which is what is
674 in the virt_size field). Files have been seen (from MSVC
675 5.0 link.exe) where the file size of the .data segment is
676 quite small compared to the virtual size. Without this
640 if (sec->flags & SEC_DATA)
641 dsize += rounded;
642 if (sec->flags & SEC_CODE)
643 tsize += rounded;
644 /* The image size is the total VIRTUAL size (which is what is
645 in the virt_size field). Files have been seen (from MSVC
646 5.0 link.exe) where the file size of the .data segment is
647 quite small compared to the virtual size. Without this
677 fix, strip munges the file. */
648 fix, strip munges the file.
649
650 FIXME: We need to handle holes between sections, which may
651 happpen when we covert from another format. We just use
652 the virtual address and virtual size of the last section
653 for the image size. */
678 if (coff_section_data (abfd, sec) != NULL
679 && pei_section_data (abfd, sec) != NULL)
654 if (coff_section_data (abfd, sec) != NULL
655 && pei_section_data (abfd, sec) != NULL)
680 isize += SA (FA (pei_section_data (abfd, sec)->virt_size));
656 isize = (sec->vma - extra->ImageBase
657 + SA (FA (pei_section_data (abfd, sec)->virt_size)));
681 }
682
683 aouthdr_in->dsize = dsize;
684 aouthdr_in->tsize = tsize;
658 }
659
660 aouthdr_in->dsize = dsize;
661 aouthdr_in->tsize = tsize;
662 extra->SizeOfHeaders = hsize;
685 extra->SizeOfImage = isize;
686 }
687
663 extra->SizeOfImage = isize;
664 }
665
688 extra->SizeOfHeaders = abfd->sections->filepos;
689 H_PUT_16 (abfd, aouthdr_in->magic, aouthdr_out->standard.magic);
690
691#define LINKER_VERSION 256 /* That is, 2.56 */
692
693 /* This piece of magic sets the "linker version" field to
694 LINKER_VERSION. */
695 H_PUT_16 (abfd, (LINKER_VERSION / 100 + (LINKER_VERSION % 100) * 256),
696 aouthdr_out->standard.vstamp);
697
698 PUT_AOUTHDR_TSIZE (abfd, aouthdr_in->tsize, aouthdr_out->standard.tsize);
699 PUT_AOUTHDR_DSIZE (abfd, aouthdr_in->dsize, aouthdr_out->standard.dsize);
700 PUT_AOUTHDR_BSIZE (abfd, aouthdr_in->bsize, aouthdr_out->standard.bsize);
701 PUT_AOUTHDR_ENTRY (abfd, aouthdr_in->entry, aouthdr_out->standard.entry);
702 PUT_AOUTHDR_TEXT_START (abfd, aouthdr_in->text_start,
703 aouthdr_out->standard.text_start);
704
666 H_PUT_16 (abfd, aouthdr_in->magic, aouthdr_out->standard.magic);
667
668#define LINKER_VERSION 256 /* That is, 2.56 */
669
670 /* This piece of magic sets the "linker version" field to
671 LINKER_VERSION. */
672 H_PUT_16 (abfd, (LINKER_VERSION / 100 + (LINKER_VERSION % 100) * 256),
673 aouthdr_out->standard.vstamp);
674
675 PUT_AOUTHDR_TSIZE (abfd, aouthdr_in->tsize, aouthdr_out->standard.tsize);
676 PUT_AOUTHDR_DSIZE (abfd, aouthdr_in->dsize, aouthdr_out->standard.dsize);
677 PUT_AOUTHDR_BSIZE (abfd, aouthdr_in->bsize, aouthdr_out->standard.bsize);
678 PUT_AOUTHDR_ENTRY (abfd, aouthdr_in->entry, aouthdr_out->standard.entry);
679 PUT_AOUTHDR_TEXT_START (abfd, aouthdr_in->text_start,
680 aouthdr_out->standard.text_start);
681
705#ifndef COFF_WITH_pep
682#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
706 /* PE32+ does not have data_start member! */
707 PUT_AOUTHDR_DATA_START (abfd, aouthdr_in->data_start,
708 aouthdr_out->standard.data_start);
709#endif
710
711 PUT_OPTHDR_IMAGE_BASE (abfd, extra->ImageBase, aouthdr_out->ImageBase);
712 H_PUT_32 (abfd, extra->SectionAlignment, aouthdr_out->SectionAlignment);
713 H_PUT_32 (abfd, extra->FileAlignment, aouthdr_out->FileAlignment);

--- 35 unchanged lines hidden (view full) ---

749 aouthdr_out->DataDirectory[idx][1]);
750 }
751 }
752
753 return AOUTSZ;
754}
755
756unsigned int
683 /* PE32+ does not have data_start member! */
684 PUT_AOUTHDR_DATA_START (abfd, aouthdr_in->data_start,
685 aouthdr_out->standard.data_start);
686#endif
687
688 PUT_OPTHDR_IMAGE_BASE (abfd, extra->ImageBase, aouthdr_out->ImageBase);
689 H_PUT_32 (abfd, extra->SectionAlignment, aouthdr_out->SectionAlignment);
690 H_PUT_32 (abfd, extra->FileAlignment, aouthdr_out->FileAlignment);

--- 35 unchanged lines hidden (view full) ---

726 aouthdr_out->DataDirectory[idx][1]);
727 }
728 }
729
730 return AOUTSZ;
731}
732
733unsigned int
757_bfd_XXi_only_swap_filehdr_out (abfd, in, out)
758 bfd *abfd;
759 PTR in;
760 PTR out;
734_bfd_XXi_only_swap_filehdr_out (bfd * abfd, void * in, void * out)
761{
762 int idx;
763 struct internal_filehdr *filehdr_in = (struct internal_filehdr *) in;
764 struct external_PEI_filehdr *filehdr_out = (struct external_PEI_filehdr *) out;
765
766 if (pe_data (abfd)->has_reloc_section)
767 filehdr_in->f_flags &= ~F_RELFLG;
768

--- 91 unchanged lines hidden (view full) ---

860
861 /* Also put in the NT signature. */
862 H_PUT_32 (abfd, filehdr_in->pe.nt_signature, filehdr_out->nt_signature);
863
864 return FILHSZ;
865}
866
867unsigned int
735{
736 int idx;
737 struct internal_filehdr *filehdr_in = (struct internal_filehdr *) in;
738 struct external_PEI_filehdr *filehdr_out = (struct external_PEI_filehdr *) out;
739
740 if (pe_data (abfd)->has_reloc_section)
741 filehdr_in->f_flags &= ~F_RELFLG;
742

--- 91 unchanged lines hidden (view full) ---

834
835 /* Also put in the NT signature. */
836 H_PUT_32 (abfd, filehdr_in->pe.nt_signature, filehdr_out->nt_signature);
837
838 return FILHSZ;
839}
840
841unsigned int
868_bfd_XX_only_swap_filehdr_out (abfd, in, out)
869 bfd *abfd;
870 PTR in;
871 PTR out;
842_bfd_XX_only_swap_filehdr_out (bfd * abfd, void * in, void * out)
872{
873 struct internal_filehdr *filehdr_in = (struct internal_filehdr *) in;
874 FILHDR *filehdr_out = (FILHDR *) out;
875
876 H_PUT_16 (abfd, filehdr_in->f_magic, filehdr_out->f_magic);
877 H_PUT_16 (abfd, filehdr_in->f_nscns, filehdr_out->f_nscns);
878 H_PUT_32 (abfd, filehdr_in->f_timdat, filehdr_out->f_timdat);
879 PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, filehdr_out->f_symptr);
880 H_PUT_32 (abfd, filehdr_in->f_nsyms, filehdr_out->f_nsyms);
881 H_PUT_16 (abfd, filehdr_in->f_opthdr, filehdr_out->f_opthdr);
882 H_PUT_16 (abfd, filehdr_in->f_flags, filehdr_out->f_flags);
883
884 return FILHSZ;
885}
886
887unsigned int
843{
844 struct internal_filehdr *filehdr_in = (struct internal_filehdr *) in;
845 FILHDR *filehdr_out = (FILHDR *) out;
846
847 H_PUT_16 (abfd, filehdr_in->f_magic, filehdr_out->f_magic);
848 H_PUT_16 (abfd, filehdr_in->f_nscns, filehdr_out->f_nscns);
849 H_PUT_32 (abfd, filehdr_in->f_timdat, filehdr_out->f_timdat);
850 PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, filehdr_out->f_symptr);
851 H_PUT_32 (abfd, filehdr_in->f_nsyms, filehdr_out->f_nsyms);
852 H_PUT_16 (abfd, filehdr_in->f_opthdr, filehdr_out->f_opthdr);
853 H_PUT_16 (abfd, filehdr_in->f_flags, filehdr_out->f_flags);
854
855 return FILHSZ;
856}
857
858unsigned int
888_bfd_XXi_swap_scnhdr_out (abfd, in, out)
889 bfd *abfd;
890 PTR in;
891 PTR out;
859_bfd_XXi_swap_scnhdr_out (bfd * abfd, void * in, void * out)
892{
893 struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
894 SCNHDR *scnhdr_ext = (SCNHDR *) out;
895 unsigned int ret = SCNHSZ;
896 bfd_vma ps;
897 bfd_vma ss;
898
899 memcpy (scnhdr_ext->s_name, scnhdr_int->s_name, sizeof (scnhdr_int->s_name));

--- 78 unchanged lines hidden (view full) ---

978 { ".rsrc", IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE },
979 { ".text" , IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_CODE | IMAGE_SCN_MEM_EXECUTE },
980 { ".tls", IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE },
981 { ".xdata", IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_INITIALIZED_DATA },
982 { NULL, 0}
983 };
984
985 pe_required_section_flags * p;
860{
861 struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
862 SCNHDR *scnhdr_ext = (SCNHDR *) out;
863 unsigned int ret = SCNHSZ;
864 bfd_vma ps;
865 bfd_vma ss;
866
867 memcpy (scnhdr_ext->s_name, scnhdr_int->s_name, sizeof (scnhdr_int->s_name));

--- 78 unchanged lines hidden (view full) ---

946 { ".rsrc", IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE },
947 { ".text" , IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_CODE | IMAGE_SCN_MEM_EXECUTE },
948 { ".tls", IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE },
949 { ".xdata", IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_INITIALIZED_DATA },
950 { NULL, 0}
951 };
952
953 pe_required_section_flags * p;
986 int flags = scnhdr_int->s_flags;
987
988 /* We have defaulted to adding the IMAGE_SCN_MEM_WRITE flag, but now
989 we know exactly what this specific section wants so we remove it
990 and then allow the must_have field to add it back in if necessary.
991 However, we don't remove IMAGE_SCN_MEM_WRITE flag from .text if the
992 default WP_TEXT file flag has been cleared. WP_TEXT may be cleared
993 by ld --enable-auto-import (if auto-import is actually needed),
994 by ld --omagic, or by obcopy --writable-text. */
995
996 for (p = known_sections; p->section_name; p++)
997 if (strcmp (scnhdr_int->s_name, p->section_name) == 0)
998 {
999 if (strcmp (scnhdr_int->s_name, ".text")
1000 || (bfd_get_file_flags (abfd) & WP_TEXT))
954
955 /* We have defaulted to adding the IMAGE_SCN_MEM_WRITE flag, but now
956 we know exactly what this specific section wants so we remove it
957 and then allow the must_have field to add it back in if necessary.
958 However, we don't remove IMAGE_SCN_MEM_WRITE flag from .text if the
959 default WP_TEXT file flag has been cleared. WP_TEXT may be cleared
960 by ld --enable-auto-import (if auto-import is actually needed),
961 by ld --omagic, or by obcopy --writable-text. */
962
963 for (p = known_sections; p->section_name; p++)
964 if (strcmp (scnhdr_int->s_name, p->section_name) == 0)
965 {
966 if (strcmp (scnhdr_int->s_name, ".text")
967 || (bfd_get_file_flags (abfd) & WP_TEXT))
1001 flags &= ~IMAGE_SCN_MEM_WRITE;
1002 flags |= p->must_have;
968 scnhdr_int->s_flags &= ~IMAGE_SCN_MEM_WRITE;
969 scnhdr_int->s_flags |= p->must_have;
1003 break;
1004 }
1005
970 break;
971 }
972
1006 H_PUT_32 (abfd, flags, scnhdr_ext->s_flags);
973 H_PUT_32 (abfd, scnhdr_int->s_flags, scnhdr_ext->s_flags);
1007 }
1008
1009 if (coff_data (abfd)->link_info
1010 && ! coff_data (abfd)->link_info->relocatable
1011 && ! coff_data (abfd)->link_info->shared
1012 && strcmp (scnhdr_int->s_name, ".text") == 0)
1013 {
1014 /* By inference from looking at MS output, the 32 bit field

--- 28 unchanged lines hidden (view full) ---

1043 if (scnhdr_int->s_nreloc < 0xffff)
1044 H_PUT_16 (abfd, scnhdr_int->s_nreloc, scnhdr_ext->s_nreloc);
1045 else
1046 {
1047 /* PE can deal with large #s of relocs, but not here. */
1048 H_PUT_16 (abfd, 0xffff, scnhdr_ext->s_nreloc);
1049 scnhdr_int->s_flags |= IMAGE_SCN_LNK_NRELOC_OVFL;
1050 H_PUT_32 (abfd, scnhdr_int->s_flags, scnhdr_ext->s_flags);
974 }
975
976 if (coff_data (abfd)->link_info
977 && ! coff_data (abfd)->link_info->relocatable
978 && ! coff_data (abfd)->link_info->shared
979 && strcmp (scnhdr_int->s_name, ".text") == 0)
980 {
981 /* By inference from looking at MS output, the 32 bit field

--- 28 unchanged lines hidden (view full) ---

1010 if (scnhdr_int->s_nreloc < 0xffff)
1011 H_PUT_16 (abfd, scnhdr_int->s_nreloc, scnhdr_ext->s_nreloc);
1012 else
1013 {
1014 /* PE can deal with large #s of relocs, but not here. */
1015 H_PUT_16 (abfd, 0xffff, scnhdr_ext->s_nreloc);
1016 scnhdr_int->s_flags |= IMAGE_SCN_LNK_NRELOC_OVFL;
1017 H_PUT_32 (abfd, scnhdr_int->s_flags, scnhdr_ext->s_flags);
1051#if 0
1052 (*_bfd_error_handler) (_("%s: reloc overflow 1: 0x%lx > 0xffff"),
1053 bfd_get_filename (abfd),
1054 scnhdr_int->s_nreloc);
1055 bfd_set_error (bfd_error_file_truncated);
1056 H_PUT_16 (abfd, 0xffff, scnhdr_ext->s_nreloc);
1057 ret = 0;
1058#endif
1059 }
1060 }
1061 return ret;
1062}
1063
1064static char * dir_names[IMAGE_NUMBEROF_DIRECTORY_ENTRIES] =
1018 }
1019 }
1020 return ret;
1021}
1022
1023static char * dir_names[IMAGE_NUMBEROF_DIRECTORY_ENTRIES] =
1065 {
1066 N_("Export Directory [.edata (or where ever we found it)]"),
1067 N_("Import Directory [parts of .idata]"),
1068 N_("Resource Directory [.rsrc]"),
1069 N_("Exception Directory [.pdata]"),
1070 N_("Security Directory"),
1071 N_("Base Relocation Directory [.reloc]"),
1072 N_("Debug Directory"),
1073 N_("Description Directory"),
1074 N_("Special Directory"),
1075 N_("Thread Storage Directory [.tls]"),
1076 N_("Load Configuration Directory"),
1077 N_("Bound Import Directory"),
1078 N_("Import Address Table Directory"),
1079 N_("Delay Import Directory"),
1080 N_("Reserved"),
1081 N_("Reserved")
1082 };
1024{
1025 N_("Export Directory [.edata (or where ever we found it)]"),
1026 N_("Import Directory [parts of .idata]"),
1027 N_("Resource Directory [.rsrc]"),
1028 N_("Exception Directory [.pdata]"),
1029 N_("Security Directory"),
1030 N_("Base Relocation Directory [.reloc]"),
1031 N_("Debug Directory"),
1032 N_("Description Directory"),
1033 N_("Special Directory"),
1034 N_("Thread Storage Directory [.tls]"),
1035 N_("Load Configuration Directory"),
1036 N_("Bound Import Directory"),
1037 N_("Import Address Table Directory"),
1038 N_("Delay Import Directory"),
1039 N_("CLR Runtime Header"),
1040 N_("Reserved")
1041};
1083
1084#ifdef POWERPC_LE_PE
1085/* The code for the PPC really falls in the "architecture dependent"
1086 category. However, it's not clear that anyone will ever care, so
1087 we're ignoring the issue for now; if/when PPC matters, some of this
1088 may need to go into peicode.h, or arguments passed to enable the
1089 PPC- specific code. */
1090#endif
1091
1092static bfd_boolean
1042
1043#ifdef POWERPC_LE_PE
1044/* The code for the PPC really falls in the "architecture dependent"
1045 category. However, it's not clear that anyone will ever care, so
1046 we're ignoring the issue for now; if/when PPC matters, some of this
1047 may need to go into peicode.h, or arguments passed to enable the
1048 PPC- specific code. */
1049#endif
1050
1051static bfd_boolean
1093pe_print_idata (abfd, vfile)
1094 bfd *abfd;
1095 PTR vfile;
1052pe_print_idata (bfd * abfd, void * vfile)
1096{
1097 FILE *file = (FILE *) vfile;
1098 bfd_byte *data;
1099 asection *section;
1100 bfd_signed_vma adj;
1101
1102#ifdef POWERPC_LE_PE
1103 asection *rel_section = bfd_get_section_by_name (abfd, ".reldata");
1104#endif
1105
1106 bfd_size_type datasize = 0;
1107 bfd_size_type dataoff;
1108 bfd_size_type i;
1053{
1054 FILE *file = (FILE *) vfile;
1055 bfd_byte *data;
1056 asection *section;
1057 bfd_signed_vma adj;
1058
1059#ifdef POWERPC_LE_PE
1060 asection *rel_section = bfd_get_section_by_name (abfd, ".reldata");
1061#endif
1062
1063 bfd_size_type datasize = 0;
1064 bfd_size_type dataoff;
1065 bfd_size_type i;
1109 bfd_size_type amt;
1110 int onaline = 20;
1111
1112 pe_data_type *pe = pe_data (abfd);
1113 struct internal_extra_pe_aouthdr *extra = &pe->pe_opthdr;
1114
1115 bfd_vma addr;
1116
1066 int onaline = 20;
1067
1068 pe_data_type *pe = pe_data (abfd);
1069 struct internal_extra_pe_aouthdr *extra = &pe->pe_opthdr;
1070
1071 bfd_vma addr;
1072
1117 addr = extra->DataDirectory[1].VirtualAddress;
1073 addr = extra->DataDirectory[PE_IMPORT_TABLE].VirtualAddress;
1118
1074
1119 if (addr == 0 && extra->DataDirectory[1].Size == 0)
1075 if (addr == 0 && extra->DataDirectory[PE_IMPORT_TABLE].Size == 0)
1120 {
1121 /* Maybe the extra header isn't there. Look for the section. */
1122 section = bfd_get_section_by_name (abfd, ".idata");
1123 if (section == NULL)
1124 return TRUE;
1125
1126 addr = section->vma;
1076 {
1077 /* Maybe the extra header isn't there. Look for the section. */
1078 section = bfd_get_section_by_name (abfd, ".idata");
1079 if (section == NULL)
1080 return TRUE;
1081
1082 addr = section->vma;
1127 datasize = bfd_section_size (abfd, section);
1083 datasize = section->size;
1128 if (datasize == 0)
1129 return TRUE;
1130 }
1131 else
1132 {
1133 addr += extra->ImageBase;
1134 for (section = abfd->sections; section != NULL; section = section->next)
1135 {
1084 if (datasize == 0)
1085 return TRUE;
1086 }
1087 else
1088 {
1089 addr += extra->ImageBase;
1090 for (section = abfd->sections; section != NULL; section = section->next)
1091 {
1136 datasize = bfd_section_size (abfd, section);
1092 datasize = section->size;
1137 if (addr >= section->vma && addr < section->vma + datasize)
1138 break;
1139 }
1140
1141 if (section == NULL)
1142 {
1143 fprintf (file,
1144 _("\nThere is an import table, but the section containing it could not be found\n"));
1145 return TRUE;
1146 }
1147 }
1148
1149 fprintf (file, _("\nThere is an import table in %s at 0x%lx\n"),
1150 section->name, (unsigned long) addr);
1151
1152 dataoff = addr - section->vma;
1153 datasize -= dataoff;
1154
1155#ifdef POWERPC_LE_PE
1093 if (addr >= section->vma && addr < section->vma + datasize)
1094 break;
1095 }
1096
1097 if (section == NULL)
1098 {
1099 fprintf (file,
1100 _("\nThere is an import table, but the section containing it could not be found\n"));
1101 return TRUE;
1102 }
1103 }
1104
1105 fprintf (file, _("\nThere is an import table in %s at 0x%lx\n"),
1106 section->name, (unsigned long) addr);
1107
1108 dataoff = addr - section->vma;
1109 datasize -= dataoff;
1110
1111#ifdef POWERPC_LE_PE
1156 if (rel_section != 0 && bfd_section_size (abfd, rel_section) != 0)
1112 if (rel_section != 0 && rel_section->size != 0)
1157 {
1158 /* The toc address can be found by taking the starting address,
1159 which on the PPC locates a function descriptor. The
1160 descriptor consists of the function code starting address
1161 followed by the address of the toc. The starting address we
1162 get from the bfd, and the descriptor is supposed to be in the
1163 .reldata section. */
1164
1165 bfd_vma loadable_toc_address;
1166 bfd_vma toc_address;
1167 bfd_vma start_address;
1113 {
1114 /* The toc address can be found by taking the starting address,
1115 which on the PPC locates a function descriptor. The
1116 descriptor consists of the function code starting address
1117 followed by the address of the toc. The starting address we
1118 get from the bfd, and the descriptor is supposed to be in the
1119 .reldata section. */
1120
1121 bfd_vma loadable_toc_address;
1122 bfd_vma toc_address;
1123 bfd_vma start_address;
1168 bfd_byte *data = 0;
1169 int offset;
1124 bfd_byte *data;
1125 bfd_vma offset;
1170
1126
1171 amt = bfd_section_size (abfd, rel_section);
1172 data = (bfd_byte *) bfd_malloc (amt);
1173 if (data == NULL && amt != 0)
1174 return FALSE;
1127 if (!bfd_malloc_and_get_section (abfd, rel_section, &data))
1128 {
1129 if (data != NULL)
1130 free (data);
1131 return FALSE;
1132 }
1175
1133
1176 bfd_get_section_contents (abfd, rel_section, (PTR) data, (bfd_vma) 0,
1177 amt);
1178
1179 offset = abfd->start_address - rel_section->vma;
1180
1134 offset = abfd->start_address - rel_section->vma;
1135
1136 if (offset >= rel_section->size || offset + 8 > rel_section->size)
1137 {
1138 if (data != NULL)
1139 free (data);
1140 return FALSE;
1141 }
1142
1181 start_address = bfd_get_32 (abfd, data + offset);
1182 loadable_toc_address = bfd_get_32 (abfd, data + offset + 4);
1183 toc_address = loadable_toc_address - 32768;
1184
1185 fprintf (file,
1186 _("\nFunction descriptor located at the start address: %04lx\n"),
1187 (unsigned long int) (abfd->start_address));
1188 fprintf (file,
1189 _("\tcode-base %08lx toc (loadable/actual) %08lx/%08lx\n"),
1190 start_address, loadable_toc_address, toc_address);
1143 start_address = bfd_get_32 (abfd, data + offset);
1144 loadable_toc_address = bfd_get_32 (abfd, data + offset + 4);
1145 toc_address = loadable_toc_address - 32768;
1146
1147 fprintf (file,
1148 _("\nFunction descriptor located at the start address: %04lx\n"),
1149 (unsigned long int) (abfd->start_address));
1150 fprintf (file,
1151 _("\tcode-base %08lx toc (loadable/actual) %08lx/%08lx\n"),
1152 start_address, loadable_toc_address, toc_address);
1153 if (data != NULL)
1154 free (data);
1191 }
1192 else
1193 {
1194 fprintf (file,
1195 _("\nNo reldata section! Function descriptor not decoded.\n"));
1196 }
1197#endif
1198
1199 fprintf (file,
1200 _("\nThe Import Tables (interpreted %s section contents)\n"),
1201 section->name);
1202 fprintf (file,
1203 _("\
1204 vma: Hint Time Forward DLL First\n\
1205 Table Stamp Chain Name Thunk\n"));
1206
1155 }
1156 else
1157 {
1158 fprintf (file,
1159 _("\nNo reldata section! Function descriptor not decoded.\n"));
1160 }
1161#endif
1162
1163 fprintf (file,
1164 _("\nThe Import Tables (interpreted %s section contents)\n"),
1165 section->name);
1166 fprintf (file,
1167 _("\
1168 vma: Hint Time Forward DLL First\n\
1169 Table Stamp Chain Name Thunk\n"));
1170
1207 amt = dataoff + datasize;
1208 data = (bfd_byte *) bfd_malloc (amt);
1209 if (data == NULL)
1210 return FALSE;
1211
1212 /* Read the whole section. Some of the fields might be before dataoff. */
1171 /* Read the whole section. Some of the fields might be before dataoff. */
1213 if (! bfd_get_section_contents (abfd, section, (PTR) data, (bfd_vma) 0, amt))
1214 return FALSE;
1172 if (!bfd_malloc_and_get_section (abfd, section, &data))
1173 {
1174 if (data != NULL)
1175 free (data);
1176 return FALSE;
1177 }
1215
1216 adj = section->vma - extra->ImageBase;
1217
1218 /* Print all image import descriptors. */
1219 for (i = 0; i < datasize; i += onaline)
1220 {
1221 bfd_vma hint_addr;
1222 bfd_vma time_stamp;
1223 bfd_vma forward_chain;
1224 bfd_vma dll_name;
1225 bfd_vma first_thunk;
1226 int idx = 0;
1227 bfd_size_type j;
1228 char *dll;
1229
1178
1179 adj = section->vma - extra->ImageBase;
1180
1181 /* Print all image import descriptors. */
1182 for (i = 0; i < datasize; i += onaline)
1183 {
1184 bfd_vma hint_addr;
1185 bfd_vma time_stamp;
1186 bfd_vma forward_chain;
1187 bfd_vma dll_name;
1188 bfd_vma first_thunk;
1189 int idx = 0;
1190 bfd_size_type j;
1191 char *dll;
1192
1230 /* Print (i + extra->DataDirectory[1].VirtualAddress). */
1193 /* Print (i + extra->DataDirectory[PE_IMPORT_TABLE].VirtualAddress). */
1231 fprintf (file, " %08lx\t", (unsigned long) (i + adj + dataoff));
1194 fprintf (file, " %08lx\t", (unsigned long) (i + adj + dataoff));
1232#if 0
1233 if (i + 20 > datasize)
1234 /* Check stuff. */
1235 ;
1236#endif
1237 hint_addr = bfd_get_32 (abfd, data + i + dataoff);
1238 time_stamp = bfd_get_32 (abfd, data + i + 4 + dataoff);
1239 forward_chain = bfd_get_32 (abfd, data + i + 8 + dataoff);
1240 dll_name = bfd_get_32 (abfd, data + i + 12 + dataoff);
1241 first_thunk = bfd_get_32 (abfd, data + i + 16 + dataoff);
1242
1243 fprintf (file, "%08lx %08lx %08lx %08lx %08lx\n",
1244 (unsigned long) hint_addr,
1245 (unsigned long) time_stamp,
1246 (unsigned long) forward_chain,
1247 (unsigned long) dll_name,
1248 (unsigned long) first_thunk);
1249
1250 if (hint_addr == 0 && first_thunk == 0)
1251 break;
1252
1195 hint_addr = bfd_get_32 (abfd, data + i + dataoff);
1196 time_stamp = bfd_get_32 (abfd, data + i + 4 + dataoff);
1197 forward_chain = bfd_get_32 (abfd, data + i + 8 + dataoff);
1198 dll_name = bfd_get_32 (abfd, data + i + 12 + dataoff);
1199 first_thunk = bfd_get_32 (abfd, data + i + 16 + dataoff);
1200
1201 fprintf (file, "%08lx %08lx %08lx %08lx %08lx\n",
1202 (unsigned long) hint_addr,
1203 (unsigned long) time_stamp,
1204 (unsigned long) forward_chain,
1205 (unsigned long) dll_name,
1206 (unsigned long) first_thunk);
1207
1208 if (hint_addr == 0 && first_thunk == 0)
1209 break;
1210
1211 if (dll_name - adj >= section->size)
1212 break;
1213
1253 dll = (char *) data + dll_name - adj;
1254 fprintf (file, _("\n\tDLL Name: %s\n"), dll);
1255
1256 if (hint_addr != 0)
1257 {
1258 bfd_byte *ft_data;
1259 asection *ft_section;
1260 bfd_vma ft_addr;

--- 4 unchanged lines hidden (view full) ---

1265 fprintf (file, _("\tvma: Hint/Ord Member-Name Bound-To\n"));
1266
1267 idx = hint_addr - adj;
1268
1269 ft_addr = first_thunk + extra->ImageBase;
1270 ft_data = data;
1271 ft_idx = first_thunk - adj;
1272 ft_allocated = 0;
1214 dll = (char *) data + dll_name - adj;
1215 fprintf (file, _("\n\tDLL Name: %s\n"), dll);
1216
1217 if (hint_addr != 0)
1218 {
1219 bfd_byte *ft_data;
1220 asection *ft_section;
1221 bfd_vma ft_addr;

--- 4 unchanged lines hidden (view full) ---

1226 fprintf (file, _("\tvma: Hint/Ord Member-Name Bound-To\n"));
1227
1228 idx = hint_addr - adj;
1229
1230 ft_addr = first_thunk + extra->ImageBase;
1231 ft_data = data;
1232 ft_idx = first_thunk - adj;
1233 ft_allocated = 0;
1273
1274 if (first_thunk != hint_addr)
1234
1235 if (first_thunk != hint_addr)
1275 {
1276 /* Find the section which contains the first thunk. */
1277 for (ft_section = abfd->sections;
1278 ft_section != NULL;
1279 ft_section = ft_section->next)
1280 {
1236 {
1237 /* Find the section which contains the first thunk. */
1238 for (ft_section = abfd->sections;
1239 ft_section != NULL;
1240 ft_section = ft_section->next)
1241 {
1281 ft_datasize = bfd_section_size (abfd, ft_section);
1242 ft_datasize = ft_section->size;
1282 if (ft_addr >= ft_section->vma
1283 && ft_addr < ft_section->vma + ft_datasize)
1284 break;
1285 }
1286
1287 if (ft_section == NULL)
1288 {
1289 fprintf (file,

--- 6 unchanged lines hidden (view full) ---

1296 if (ft_section == section)
1297 {
1298 ft_data = data;
1299 ft_idx = first_thunk - adj;
1300 }
1301 else
1302 {
1303 ft_idx = first_thunk - (ft_section->vma - extra->ImageBase);
1243 if (ft_addr >= ft_section->vma
1244 && ft_addr < ft_section->vma + ft_datasize)
1245 break;
1246 }
1247
1248 if (ft_section == NULL)
1249 {
1250 fprintf (file,

--- 6 unchanged lines hidden (view full) ---

1257 if (ft_section == section)
1258 {
1259 ft_data = data;
1260 ft_idx = first_thunk - adj;
1261 }
1262 else
1263 {
1264 ft_idx = first_thunk - (ft_section->vma - extra->ImageBase);
1304 ft_data = (bfd_byte *) bfd_malloc (datasize);
1265 ft_data = bfd_malloc (datasize);
1305 if (ft_data == NULL)
1306 continue;
1307
1308 /* Read datasize bfd_bytes starting at offset ft_idx. */
1266 if (ft_data == NULL)
1267 continue;
1268
1269 /* Read datasize bfd_bytes starting at offset ft_idx. */
1309 if (! bfd_get_section_contents (abfd, ft_section,
1310 (PTR) ft_data,
1311 (bfd_vma) ft_idx,
1312 datasize))
1270 if (! bfd_get_section_contents
1271 (abfd, ft_section, ft_data, (bfd_vma) ft_idx, datasize))
1313 {
1314 free (ft_data);
1315 continue;
1316 }
1317
1318 ft_idx = 0;
1319 ft_allocated = 1;
1320 }
1321 }
1322
1323 /* Print HintName vector entries. */
1272 {
1273 free (ft_data);
1274 continue;
1275 }
1276
1277 ft_idx = 0;
1278 ft_allocated = 1;
1279 }
1280 }
1281
1282 /* Print HintName vector entries. */
1283#ifdef COFF_WITH_pex64
1284 for (j = 0; j < datasize; j += 8)
1285 {
1286 unsigned long member = bfd_get_32 (abfd, data + idx + j);
1287 unsigned long member_high = bfd_get_32 (abfd, data + idx + j + 4);
1288
1289 if (!member && !member_high)
1290 break;
1291
1292 if (member_high & 0x80000000)
1293 fprintf (file, "\t%lx%08lx\t %4lx%08lx <none>",
1294 member_high,member, member_high & 0x7fffffff, member);
1295 else
1296 {
1297 int ordinal;
1298 char *member_name;
1299
1300 ordinal = bfd_get_16 (abfd, data + member - adj);
1301 member_name = (char *) data + member - adj + 2;
1302 fprintf (file, "\t%04lx\t %4d %s",member, ordinal, member_name);
1303 }
1304
1305 /* If the time stamp is not zero, the import address
1306 table holds actual addresses. */
1307 if (time_stamp != 0
1308 && first_thunk != 0
1309 && first_thunk != hint_addr)
1310 fprintf (file, "\t%04lx",
1311 (long) bfd_get_32 (abfd, ft_data + ft_idx + j));
1312 fprintf (file, "\n");
1313 }
1314#else
1324 for (j = 0; j < datasize; j += 4)
1325 {
1326 unsigned long member = bfd_get_32 (abfd, data + idx + j);
1327
1328 /* Print single IMAGE_IMPORT_BY_NAME vector. */
1329 if (member == 0)
1330 break;
1331

--- 16 unchanged lines hidden (view full) ---

1348 if (time_stamp != 0
1349 && first_thunk != 0
1350 && first_thunk != hint_addr)
1351 fprintf (file, "\t%04lx",
1352 (long) bfd_get_32 (abfd, ft_data + ft_idx + j));
1353
1354 fprintf (file, "\n");
1355 }
1315 for (j = 0; j < datasize; j += 4)
1316 {
1317 unsigned long member = bfd_get_32 (abfd, data + idx + j);
1318
1319 /* Print single IMAGE_IMPORT_BY_NAME vector. */
1320 if (member == 0)
1321 break;
1322

--- 16 unchanged lines hidden (view full) ---

1339 if (time_stamp != 0
1340 && first_thunk != 0
1341 && first_thunk != hint_addr)
1342 fprintf (file, "\t%04lx",
1343 (long) bfd_get_32 (abfd, ft_data + ft_idx + j));
1344
1345 fprintf (file, "\n");
1346 }
1356
1347#endif
1357 if (ft_allocated)
1358 free (ft_data);
1359 }
1360
1361 fprintf (file, "\n");
1362 }
1363
1364 free (data);
1365
1366 return TRUE;
1367}
1368
1369static bfd_boolean
1348 if (ft_allocated)
1349 free (ft_data);
1350 }
1351
1352 fprintf (file, "\n");
1353 }
1354
1355 free (data);
1356
1357 return TRUE;
1358}
1359
1360static bfd_boolean
1370pe_print_edata (abfd, vfile)
1371 bfd *abfd;
1372 PTR vfile;
1361pe_print_edata (bfd * abfd, void * vfile)
1373{
1374 FILE *file = (FILE *) vfile;
1375 bfd_byte *data;
1376 asection *section;
1377 bfd_size_type datasize = 0;
1378 bfd_size_type dataoff;
1379 bfd_size_type i;
1380 bfd_signed_vma adj;
1381 struct EDT_type
1382 {
1362{
1363 FILE *file = (FILE *) vfile;
1364 bfd_byte *data;
1365 asection *section;
1366 bfd_size_type datasize = 0;
1367 bfd_size_type dataoff;
1368 bfd_size_type i;
1369 bfd_signed_vma adj;
1370 struct EDT_type
1371 {
1383 long export_flags; /* reserved - should be zero */
1372 long export_flags; /* Reserved - should be zero. */
1384 long time_stamp;
1385 short major_ver;
1386 short minor_ver;
1373 long time_stamp;
1374 short major_ver;
1375 short minor_ver;
1387 bfd_vma name; /* rva - relative to image base */
1388 long base; /* ordinal base */
1389 unsigned long num_functions;/* Number in the export address table */
1390 unsigned long num_names; /* Number in the name pointer table */
1391 bfd_vma eat_addr; /* rva to the export address table */
1392 bfd_vma npt_addr; /* rva to the Export Name Pointer Table */
1393 bfd_vma ot_addr; /* rva to the Ordinal Table */
1376 bfd_vma name; /* RVA - relative to image base. */
1377 long base; /* Ordinal base. */
1378 unsigned long num_functions;/* Number in the export address table. */
1379 unsigned long num_names; /* Number in the name pointer table. */
1380 bfd_vma eat_addr; /* RVA to the export address table. */
1381 bfd_vma npt_addr; /* RVA to the Export Name Pointer Table. */
1382 bfd_vma ot_addr; /* RVA to the Ordinal Table. */
1394 } edt;
1395
1396 pe_data_type *pe = pe_data (abfd);
1397 struct internal_extra_pe_aouthdr *extra = &pe->pe_opthdr;
1398
1399 bfd_vma addr;
1400
1383 } edt;
1384
1385 pe_data_type *pe = pe_data (abfd);
1386 struct internal_extra_pe_aouthdr *extra = &pe->pe_opthdr;
1387
1388 bfd_vma addr;
1389
1401 addr = extra->DataDirectory[0].VirtualAddress;
1390 addr = extra->DataDirectory[PE_EXPORT_TABLE].VirtualAddress;
1402
1391
1403 if (addr == 0 && extra->DataDirectory[0].Size == 0)
1392 if (addr == 0 && extra->DataDirectory[PE_EXPORT_TABLE].Size == 0)
1404 {
1405 /* Maybe the extra header isn't there. Look for the section. */
1406 section = bfd_get_section_by_name (abfd, ".edata");
1407 if (section == NULL)
1408 return TRUE;
1409
1410 addr = section->vma;
1393 {
1394 /* Maybe the extra header isn't there. Look for the section. */
1395 section = bfd_get_section_by_name (abfd, ".edata");
1396 if (section == NULL)
1397 return TRUE;
1398
1399 addr = section->vma;
1411 datasize = bfd_section_size (abfd, section);
1400 dataoff = 0;
1401 datasize = section->size;
1412 if (datasize == 0)
1413 return TRUE;
1414 }
1415 else
1416 {
1417 addr += extra->ImageBase;
1418
1419 for (section = abfd->sections; section != NULL; section = section->next)
1402 if (datasize == 0)
1403 return TRUE;
1404 }
1405 else
1406 {
1407 addr += extra->ImageBase;
1408
1409 for (section = abfd->sections; section != NULL; section = section->next)
1420 {
1421 datasize = bfd_section_size (abfd, section);
1410 if (addr >= section->vma && addr < section->vma + section->size)
1411 break;
1422
1412
1423 if (addr >= section->vma && addr < section->vma + datasize)
1424 break;
1425 }
1426
1427 if (section == NULL)
1428 {
1429 fprintf (file,
1430 _("\nThere is an export table, but the section containing it could not be found\n"));
1431 return TRUE;
1432 }
1413 if (section == NULL)
1414 {
1415 fprintf (file,
1416 _("\nThere is an export table, but the section containing it could not be found\n"));
1417 return TRUE;
1418 }
1419
1420 dataoff = addr - section->vma;
1421 datasize = extra->DataDirectory[PE_EXPORT_TABLE].Size;
1422 if (datasize > section->size - dataoff)
1423 {
1424 fprintf (file,
1425 _("\nThere is an export table in %s, but it does not fit into that section\n"),
1426 section->name);
1427 return TRUE;
1428 }
1433 }
1434
1435 fprintf (file, _("\nThere is an export table in %s at 0x%lx\n"),
1436 section->name, (unsigned long) addr);
1437
1429 }
1430
1431 fprintf (file, _("\nThere is an export table in %s at 0x%lx\n"),
1432 section->name, (unsigned long) addr);
1433
1438 dataoff = addr - section->vma;
1439 datasize -= dataoff;
1440
1441 data = (bfd_byte *) bfd_malloc (datasize);
1434 data = bfd_malloc (datasize);
1442 if (data == NULL)
1443 return FALSE;
1444
1435 if (data == NULL)
1436 return FALSE;
1437
1445 if (! bfd_get_section_contents (abfd, section, (PTR) data,
1438 if (! bfd_get_section_contents (abfd, section, data,
1446 (file_ptr) dataoff, datasize))
1447 return FALSE;
1448
1449 /* Go get Export Directory Table. */
1450 edt.export_flags = bfd_get_32 (abfd, data + 0);
1451 edt.time_stamp = bfd_get_32 (abfd, data + 4);
1452 edt.major_ver = bfd_get_16 (abfd, data + 8);
1453 edt.minor_ver = bfd_get_16 (abfd, data + 10);

--- 60 unchanged lines hidden (view full) ---

1514
1515 /* The next table to find is the Export Address Table. It's basically
1516 a list of pointers that either locate a function in this dll, or
1517 forward the call to another dll. Something like:
1518 typedef union
1519 {
1520 long export_rva;
1521 long forwarder_rva;
1439 (file_ptr) dataoff, datasize))
1440 return FALSE;
1441
1442 /* Go get Export Directory Table. */
1443 edt.export_flags = bfd_get_32 (abfd, data + 0);
1444 edt.time_stamp = bfd_get_32 (abfd, data + 4);
1445 edt.major_ver = bfd_get_16 (abfd, data + 8);
1446 edt.minor_ver = bfd_get_16 (abfd, data + 10);

--- 60 unchanged lines hidden (view full) ---

1507
1508 /* The next table to find is the Export Address Table. It's basically
1509 a list of pointers that either locate a function in this dll, or
1510 forward the call to another dll. Something like:
1511 typedef union
1512 {
1513 long export_rva;
1514 long forwarder_rva;
1522 } export_address_table_entry;
1523 */
1515 } export_address_table_entry; */
1524
1525 fprintf (file,
1526 _("\nExport Address Table -- Ordinal Base %ld\n"),
1527 edt.base);
1528
1529 for (i = 0; i < edt.num_functions; ++i)
1530 {
1531 bfd_vma eat_member = bfd_get_32 (abfd,

--- 53 unchanged lines hidden (view full) ---

1585}
1586
1587/* This really is architecture dependent. On IA-64, a .pdata entry
1588 consists of three dwords containing relative virtual addresses that
1589 specify the start and end address of the code range the entry
1590 covers and the address of the corresponding unwind info data. */
1591
1592static bfd_boolean
1516
1517 fprintf (file,
1518 _("\nExport Address Table -- Ordinal Base %ld\n"),
1519 edt.base);
1520
1521 for (i = 0; i < edt.num_functions; ++i)
1522 {
1523 bfd_vma eat_member = bfd_get_32 (abfd,

--- 53 unchanged lines hidden (view full) ---

1577}
1578
1579/* This really is architecture dependent. On IA-64, a .pdata entry
1580 consists of three dwords containing relative virtual addresses that
1581 specify the start and end address of the code range the entry
1582 covers and the address of the corresponding unwind info data. */
1583
1584static bfd_boolean
1593pe_print_pdata (abfd, vfile)
1594 bfd *abfd;
1595 PTR vfile;
1585pe_print_pdata (bfd * abfd, void * vfile)
1596{
1586{
1597#ifdef COFF_WITH_pep
1598# define PDATA_ROW_SIZE (3*8)
1587#if defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
1588# define PDATA_ROW_SIZE (3 * 8)
1599#else
1589#else
1600# define PDATA_ROW_SIZE (5*4)
1590# define PDATA_ROW_SIZE (5 * 4)
1601#endif
1602 FILE *file = (FILE *) vfile;
1603 bfd_byte *data = 0;
1604 asection *section = bfd_get_section_by_name (abfd, ".pdata");
1605 bfd_size_type datasize = 0;
1606 bfd_size_type i;
1607 bfd_size_type start, stop;
1608 int onaline = PDATA_ROW_SIZE;

--- 6 unchanged lines hidden (view full) ---

1615 stop = pei_section_data (abfd, section)->virt_size;
1616 if ((stop % onaline) != 0)
1617 fprintf (file,
1618 _("Warning, .pdata section size (%ld) is not a multiple of %d\n"),
1619 (long) stop, onaline);
1620
1621 fprintf (file,
1622 _("\nThe Function Table (interpreted .pdata section contents)\n"));
1591#endif
1592 FILE *file = (FILE *) vfile;
1593 bfd_byte *data = 0;
1594 asection *section = bfd_get_section_by_name (abfd, ".pdata");
1595 bfd_size_type datasize = 0;
1596 bfd_size_type i;
1597 bfd_size_type start, stop;
1598 int onaline = PDATA_ROW_SIZE;

--- 6 unchanged lines hidden (view full) ---

1605 stop = pei_section_data (abfd, section)->virt_size;
1606 if ((stop % onaline) != 0)
1607 fprintf (file,
1608 _("Warning, .pdata section size (%ld) is not a multiple of %d\n"),
1609 (long) stop, onaline);
1610
1611 fprintf (file,
1612 _("\nThe Function Table (interpreted .pdata section contents)\n"));
1623#ifdef COFF_WITH_pep
1613#if defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
1624 fprintf (file,
1625 _(" vma:\t\t\tBegin Address End Address Unwind Info\n"));
1626#else
1627 fprintf (file, _("\
1628 vma:\t\tBegin End EH EH PrologEnd Exception\n\
1629 \t\tAddress Address Handler Data Address Mask\n"));
1630#endif
1631
1614 fprintf (file,
1615 _(" vma:\t\t\tBegin Address End Address Unwind Info\n"));
1616#else
1617 fprintf (file, _("\
1618 vma:\t\tBegin End EH EH PrologEnd Exception\n\
1619 \t\tAddress Address Handler Data Address Mask\n"));
1620#endif
1621
1632 datasize = bfd_section_size (abfd, section);
1622 datasize = section->size;
1633 if (datasize == 0)
1634 return TRUE;
1635
1623 if (datasize == 0)
1624 return TRUE;
1625
1636 data = (bfd_byte *) bfd_malloc (datasize);
1637 if (data == NULL && datasize != 0)
1638 return FALSE;
1626 if (! bfd_malloc_and_get_section (abfd, section, &data))
1627 {
1628 if (data != NULL)
1629 free (data);
1630 return FALSE;
1631 }
1639
1632
1640 bfd_get_section_contents (abfd, section, (PTR) data, (bfd_vma) 0,
1641 datasize);
1642
1643 start = 0;
1644
1645 for (i = start; i < stop; i += onaline)
1646 {
1647 bfd_vma begin_addr;
1648 bfd_vma end_addr;
1649 bfd_vma eh_handler;
1650 bfd_vma eh_data;

--- 18 unchanged lines hidden (view full) ---

1669 eh_handler &= ~(bfd_vma) 0x3;
1670 prolog_end_addr &= ~(bfd_vma) 0x3;
1671
1672 fputc (' ', file);
1673 fprintf_vma (file, i + section->vma); fputc ('\t', file);
1674 fprintf_vma (file, begin_addr); fputc (' ', file);
1675 fprintf_vma (file, end_addr); fputc (' ', file);
1676 fprintf_vma (file, eh_handler);
1633 start = 0;
1634
1635 for (i = start; i < stop; i += onaline)
1636 {
1637 bfd_vma begin_addr;
1638 bfd_vma end_addr;
1639 bfd_vma eh_handler;
1640 bfd_vma eh_data;

--- 18 unchanged lines hidden (view full) ---

1659 eh_handler &= ~(bfd_vma) 0x3;
1660 prolog_end_addr &= ~(bfd_vma) 0x3;
1661
1662 fputc (' ', file);
1663 fprintf_vma (file, i + section->vma); fputc ('\t', file);
1664 fprintf_vma (file, begin_addr); fputc (' ', file);
1665 fprintf_vma (file, end_addr); fputc (' ', file);
1666 fprintf_vma (file, eh_handler);
1677#ifndef COFF_WITH_pep
1667#if !defined(COFF_WITH_pep) || defined(COFF_WITH_pex64)
1678 fputc (' ', file);
1679 fprintf_vma (file, eh_data); fputc (' ', file);
1680 fprintf_vma (file, prolog_end_addr);
1681 fprintf (file, " %x", em_data);
1682#endif
1683
1684#ifdef POWERPC_LE_PE
1685 if (eh_handler == 0 && eh_data != 0)
1686 {
1687 /* Special bits here, although the meaning may be a little
1668 fputc (' ', file);
1669 fprintf_vma (file, eh_data); fputc (' ', file);
1670 fprintf_vma (file, prolog_end_addr);
1671 fprintf (file, " %x", em_data);
1672#endif
1673
1674#ifdef POWERPC_LE_PE
1675 if (eh_handler == 0 && eh_data != 0)
1676 {
1677 /* Special bits here, although the meaning may be a little
1688 mysterious. The only one I know for sure is 0x03. */
1689 /* Code Significance */
1690 /* 0x00 None */
1691 /* 0x01 Register Save Millicode */
1692 /* 0x02 Register Restore Millicode */
1693 /* 0x03 Glue Code Sequence */
1678 mysterious. The only one I know for sure is 0x03
1679 Code Significance
1680 0x00 None
1681 0x01 Register Save Millicode
1682 0x02 Register Restore Millicode
1683 0x03 Glue Code Sequence. */
1694 switch (eh_data)
1695 {
1696 case 0x01:
1697 fprintf (file, _(" Register save millicode"));
1698 break;
1699 case 0x02:
1700 fprintf (file, _(" Register restore millicode"));
1701 break;

--- 10 unchanged lines hidden (view full) ---

1712
1713 free (data);
1714
1715 return TRUE;
1716}
1717
1718#define IMAGE_REL_BASED_HIGHADJ 4
1719static const char * const tbl[] =
1684 switch (eh_data)
1685 {
1686 case 0x01:
1687 fprintf (file, _(" Register save millicode"));
1688 break;
1689 case 0x02:
1690 fprintf (file, _(" Register restore millicode"));
1691 break;

--- 10 unchanged lines hidden (view full) ---

1702
1703 free (data);
1704
1705 return TRUE;
1706}
1707
1708#define IMAGE_REL_BASED_HIGHADJ 4
1709static const char * const tbl[] =
1720 {
1721 "ABSOLUTE",
1722 "HIGH",
1723 "LOW",
1724 "HIGHLOW",
1725 "HIGHADJ",
1726 "MIPS_JMPADDR",
1727 "SECTION",
1728 "REL32",
1729 "RESERVED1",
1730 "MIPS_JMPADDR16",
1731 "DIR64",
1732 "HIGH3ADJ"
1733 "UNKNOWN", /* MUST be last */
1734 };
1710{
1711 "ABSOLUTE",
1712 "HIGH",
1713 "LOW",
1714 "HIGHLOW",
1715 "HIGHADJ",
1716 "MIPS_JMPADDR",
1717 "SECTION",
1718 "REL32",
1719 "RESERVED1",
1720 "MIPS_JMPADDR16",
1721 "DIR64",
1722 "HIGH3ADJ",
1723 "UNKNOWN", /* MUST be last. */
1724};
1735
1736static bfd_boolean
1725
1726static bfd_boolean
1737pe_print_reloc (abfd, vfile)
1738 bfd *abfd;
1739 PTR vfile;
1727pe_print_reloc (bfd * abfd, void * vfile)
1740{
1741 FILE *file = (FILE *) vfile;
1742 bfd_byte *data = 0;
1743 asection *section = bfd_get_section_by_name (abfd, ".reloc");
1744 bfd_size_type datasize;
1745 bfd_size_type i;
1746 bfd_size_type start, stop;
1747
1748 if (section == NULL)
1749 return TRUE;
1750
1728{
1729 FILE *file = (FILE *) vfile;
1730 bfd_byte *data = 0;
1731 asection *section = bfd_get_section_by_name (abfd, ".reloc");
1732 bfd_size_type datasize;
1733 bfd_size_type i;
1734 bfd_size_type start, stop;
1735
1736 if (section == NULL)
1737 return TRUE;
1738
1751 if (bfd_section_size (abfd, section) == 0)
1739 if (section->size == 0)
1752 return TRUE;
1753
1754 fprintf (file,
1755 _("\n\nPE File Base Relocations (interpreted .reloc section contents)\n"));
1756
1740 return TRUE;
1741
1742 fprintf (file,
1743 _("\n\nPE File Base Relocations (interpreted .reloc section contents)\n"));
1744
1757 datasize = bfd_section_size (abfd, section);
1758 data = (bfd_byte *) bfd_malloc (datasize);
1759 if (data == NULL && datasize != 0)
1760 return FALSE;
1745 datasize = section->size;
1746 if (! bfd_malloc_and_get_section (abfd, section, &data))
1747 {
1748 if (data != NULL)
1749 free (data);
1750 return FALSE;
1751 }
1761
1752
1762 bfd_get_section_contents (abfd, section, (PTR) data, (bfd_vma) 0,
1763 datasize);
1764
1765 start = 0;
1766
1753 start = 0;
1754
1767 stop = bfd_section_size (abfd, section);
1755 stop = section->size;
1768
1769 for (i = start; i < stop;)
1770 {
1771 int j;
1772 bfd_vma virtual_address;
1773 long number, size;
1774
1775 /* The .reloc section is a sequence of blocks, with a header consisting

--- 41 unchanged lines hidden (view full) ---

1817 free (data);
1818
1819 return TRUE;
1820}
1821
1822/* Print out the program headers. */
1823
1824bfd_boolean
1756
1757 for (i = start; i < stop;)
1758 {
1759 int j;
1760 bfd_vma virtual_address;
1761 long number, size;
1762
1763 /* The .reloc section is a sequence of blocks, with a header consisting

--- 41 unchanged lines hidden (view full) ---

1805 free (data);
1806
1807 return TRUE;
1808}
1809
1810/* Print out the program headers. */
1811
1812bfd_boolean
1825_bfd_XX_print_private_bfd_data_common (abfd, vfile)
1826 bfd *abfd;
1827 PTR vfile;
1813_bfd_XX_print_private_bfd_data_common (bfd * abfd, void * vfile)
1828{
1829 FILE *file = (FILE *) vfile;
1830 int j;
1831 pe_data_type *pe = pe_data (abfd);
1832 struct internal_extra_pe_aouthdr *i = &pe->pe_opthdr;
1833 const char *subsystem_name = NULL;
1814{
1815 FILE *file = (FILE *) vfile;
1816 int j;
1817 pe_data_type *pe = pe_data (abfd);
1818 struct internal_extra_pe_aouthdr *i = &pe->pe_opthdr;
1819 const char *subsystem_name = NULL;
1820 const char *name;
1834
1835 /* The MS dumpbin program reportedly ands with 0xff0f before
1836 printing the characteristics field. Not sure why. No reason to
1837 emulate it here. */
1838 fprintf (file, _("\nCharacteristics 0x%x\n"), pe->real_flags);
1839#undef PF
1840#define PF(x, y) if (pe->real_flags & x) { fprintf (file, "\t%s\n", y); }
1821
1822 /* The MS dumpbin program reportedly ands with 0xff0f before
1823 printing the characteristics field. Not sure why. No reason to
1824 emulate it here. */
1825 fprintf (file, _("\nCharacteristics 0x%x\n"), pe->real_flags);
1826#undef PF
1827#define PF(x, y) if (pe->real_flags & x) { fprintf (file, "\t%s\n", y); }
1841 PF (F_RELFLG, "relocations stripped");
1842 PF (F_EXEC, "executable");
1843 PF (F_LNNO, "line numbers stripped");
1844 PF (F_LSYMS, "symbols stripped");
1845 PF (0x80, "little endian");
1846 PF (F_AR32WR, "32 bit words");
1847 PF (0x200, "debugging information removed");
1848 PF (0x1000, "system file");
1849 PF (F_DLL, "DLL");
1850 PF (0x8000, "big endian");
1828 PF (IMAGE_FILE_RELOCS_STRIPPED, "relocations stripped");
1829 PF (IMAGE_FILE_EXECUTABLE_IMAGE, "executable");
1830 PF (IMAGE_FILE_LINE_NUMS_STRIPPED, "line numbers stripped");
1831 PF (IMAGE_FILE_LOCAL_SYMS_STRIPPED, "symbols stripped");
1832 PF (IMAGE_FILE_LARGE_ADDRESS_AWARE, "large address aware");
1833 PF (IMAGE_FILE_BYTES_REVERSED_LO, "little endian");
1834 PF (IMAGE_FILE_32BIT_MACHINE, "32 bit words");
1835 PF (IMAGE_FILE_DEBUG_STRIPPED, "debugging information removed");
1836 PF (IMAGE_FILE_SYSTEM, "system file");
1837 PF (IMAGE_FILE_DLL, "DLL");
1838 PF (IMAGE_FILE_BYTES_REVERSED_HI, "big endian");
1851#undef PF
1852
1853 /* ctime implies '\n'. */
1854 {
1855 time_t t = pe->coff.timestamp;
1856 fprintf (file, "\nTime/Date\t\t%s", ctime (&t));
1857 }
1839#undef PF
1840
1841 /* ctime implies '\n'. */
1842 {
1843 time_t t = pe->coff.timestamp;
1844 fprintf (file, "\nTime/Date\t\t%s", ctime (&t));
1845 }
1846
1847#ifndef IMAGE_NT_OPTIONAL_HDR_MAGIC
1848# define IMAGE_NT_OPTIONAL_HDR_MAGIC 0x10b
1849#endif
1850#ifndef IMAGE_NT_OPTIONAL_HDR64_MAGIC
1851# define IMAGE_NT_OPTIONAL_HDR64_MAGIC 0x20b
1852#endif
1853#ifndef IMAGE_NT_OPTIONAL_HDRROM_MAGIC
1854# define IMAGE_NT_OPTIONAL_HDRROM_MAGIC 0x107
1855#endif
1856
1857 switch (i->Magic)
1858 {
1859 case IMAGE_NT_OPTIONAL_HDR_MAGIC:
1860 name = "PE32";
1861 break;
1862 case IMAGE_NT_OPTIONAL_HDR64_MAGIC:
1863 name = "PE32+";
1864 break;
1865 case IMAGE_NT_OPTIONAL_HDRROM_MAGIC:
1866 name = "ROM";
1867 break;
1868 default:
1869 name = NULL;
1870 break;
1871 }
1872 fprintf (file, "Magic\t\t\t%04x", i->Magic);
1873 if (name)
1874 fprintf (file, "\t(%s)",name);
1875 fprintf (file, "\nMajorLinkerVersion\t%d\n", i->MajorLinkerVersion);
1876 fprintf (file, "MinorLinkerVersion\t%d\n", i->MinorLinkerVersion);
1877 fprintf (file, "SizeOfCode\t\t%08lx\n", i->SizeOfCode);
1878 fprintf (file, "SizeOfInitializedData\t%08lx\n",
1879 i->SizeOfInitializedData);
1880 fprintf (file, "SizeOfUninitializedData\t%08lx\n",
1881 i->SizeOfUninitializedData);
1882 fprintf (file, "AddressOfEntryPoint\t");
1883 fprintf_vma (file, i->AddressOfEntryPoint);
1884 fprintf (file, "\nBaseOfCode\t\t");
1885 fprintf_vma (file, i->BaseOfCode);
1886#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
1887 /* PE32+ does not have BaseOfData member! */
1888 fprintf (file, "\nBaseOfData\t\t");
1889 fprintf_vma (file, i->BaseOfData);
1890#endif
1891
1858 fprintf (file, "\nImageBase\t\t");
1859 fprintf_vma (file, i->ImageBase);
1860 fprintf (file, "\nSectionAlignment\t");
1861 fprintf_vma (file, i->SectionAlignment);
1862 fprintf (file, "\nFileAlignment\t\t");
1863 fprintf_vma (file, i->FileAlignment);
1864 fprintf (file, "\nMajorOSystemVersion\t%d\n", i->MajorOperatingSystemVersion);
1865 fprintf (file, "MinorOSystemVersion\t%d\n", i->MinorOperatingSystemVersion);

--- 30 unchanged lines hidden (view full) ---

1896 subsystem_name = "EFI application";
1897 break;
1898 case IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER:
1899 subsystem_name = "EFI boot service driver";
1900 break;
1901 case IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER:
1902 subsystem_name = "EFI runtime driver";
1903 break;
1892 fprintf (file, "\nImageBase\t\t");
1893 fprintf_vma (file, i->ImageBase);
1894 fprintf (file, "\nSectionAlignment\t");
1895 fprintf_vma (file, i->SectionAlignment);
1896 fprintf (file, "\nFileAlignment\t\t");
1897 fprintf_vma (file, i->FileAlignment);
1898 fprintf (file, "\nMajorOSystemVersion\t%d\n", i->MajorOperatingSystemVersion);
1899 fprintf (file, "MinorOSystemVersion\t%d\n", i->MinorOperatingSystemVersion);

--- 30 unchanged lines hidden (view full) ---

1930 subsystem_name = "EFI application";
1931 break;
1932 case IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER:
1933 subsystem_name = "EFI boot service driver";
1934 break;
1935 case IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER:
1936 subsystem_name = "EFI runtime driver";
1937 break;
1938 // These are from revision 8.0 of the MS PE/COFF spec
1939 case IMAGE_SUBSYSTEM_EFI_ROM:
1940 subsystem_name = "EFI ROM";
1941 break;
1942 case IMAGE_SUBSYSTEM_XBOX:
1943 subsystem_name = "XBOX";
1944 break;
1945 // Added default case for clarity - subsystem_name is NULL anyway.
1946 default:
1947 subsystem_name = NULL;
1904 }
1905
1906 fprintf (file, "Subsystem\t\t%08x", i->Subsystem);
1907 if (subsystem_name)
1908 fprintf (file, "\t(%s)", subsystem_name);
1909 fprintf (file, "\nDllCharacteristics\t%08x\n", i->DllCharacteristics);
1910 fprintf (file, "SizeOfStackReserve\t");
1911 fprintf_vma (file, i->SizeOfStackReserve);

--- 22 unchanged lines hidden (view full) ---

1934
1935 return TRUE;
1936}
1937
1938/* Copy any private info we understand from the input bfd
1939 to the output bfd. */
1940
1941bfd_boolean
1948 }
1949
1950 fprintf (file, "Subsystem\t\t%08x", i->Subsystem);
1951 if (subsystem_name)
1952 fprintf (file, "\t(%s)", subsystem_name);
1953 fprintf (file, "\nDllCharacteristics\t%08x\n", i->DllCharacteristics);
1954 fprintf (file, "SizeOfStackReserve\t");
1955 fprintf_vma (file, i->SizeOfStackReserve);

--- 22 unchanged lines hidden (view full) ---

1978
1979 return TRUE;
1980}
1981
1982/* Copy any private info we understand from the input bfd
1983 to the output bfd. */
1984
1985bfd_boolean
1942_bfd_XX_bfd_copy_private_bfd_data_common (ibfd, obfd)
1943 bfd *ibfd, *obfd;
1986_bfd_XX_bfd_copy_private_bfd_data_common (bfd * ibfd, bfd * obfd)
1944{
1945 /* One day we may try to grok other private data. */
1946 if (ibfd->xvec->flavour != bfd_target_coff_flavour
1947 || obfd->xvec->flavour != bfd_target_coff_flavour)
1948 return TRUE;
1949
1950 pe_data (obfd)->pe_opthdr = pe_data (ibfd)->pe_opthdr;
1951 pe_data (obfd)->dll = pe_data (ibfd)->dll;
1952
1953 /* For strip: if we removed .reloc, we'll make a real mess of things
1954 if we don't remove this entry as well. */
1955 if (! pe_data (obfd)->has_reloc_section)
1956 {
1987{
1988 /* One day we may try to grok other private data. */
1989 if (ibfd->xvec->flavour != bfd_target_coff_flavour
1990 || obfd->xvec->flavour != bfd_target_coff_flavour)
1991 return TRUE;
1992
1993 pe_data (obfd)->pe_opthdr = pe_data (ibfd)->pe_opthdr;
1994 pe_data (obfd)->dll = pe_data (ibfd)->dll;
1995
1996 /* For strip: if we removed .reloc, we'll make a real mess of things
1997 if we don't remove this entry as well. */
1998 if (! pe_data (obfd)->has_reloc_section)
1999 {
1957 pe_data (obfd)->pe_opthdr.DataDirectory[5].VirtualAddress = 0;
1958 pe_data (obfd)->pe_opthdr.DataDirectory[5].Size = 0;
2000 pe_data (obfd)->pe_opthdr.DataDirectory[PE_BASE_RELOCATION_TABLE].VirtualAddress = 0;
2001 pe_data (obfd)->pe_opthdr.DataDirectory[PE_BASE_RELOCATION_TABLE].Size = 0;
1959 }
1960 return TRUE;
1961}
1962
1963/* Copy private section data. */
1964
1965bfd_boolean
2002 }
2003 return TRUE;
2004}
2005
2006/* Copy private section data. */
2007
2008bfd_boolean
1966_bfd_XX_bfd_copy_private_section_data (ibfd, isec, obfd, osec)
1967 bfd *ibfd;
1968 asection *isec;
1969 bfd *obfd;
1970 asection *osec;
2009_bfd_XX_bfd_copy_private_section_data (bfd *ibfd,
2010 asection *isec,
2011 bfd *obfd,
2012 asection *osec)
1971{
1972 if (bfd_get_flavour (ibfd) != bfd_target_coff_flavour
1973 || bfd_get_flavour (obfd) != bfd_target_coff_flavour)
1974 return TRUE;
1975
1976 if (coff_section_data (ibfd, isec) != NULL
1977 && pei_section_data (ibfd, isec) != NULL)
1978 {
1979 if (coff_section_data (obfd, osec) == NULL)
1980 {
1981 bfd_size_type amt = sizeof (struct coff_section_tdata);
2013{
2014 if (bfd_get_flavour (ibfd) != bfd_target_coff_flavour
2015 || bfd_get_flavour (obfd) != bfd_target_coff_flavour)
2016 return TRUE;
2017
2018 if (coff_section_data (ibfd, isec) != NULL
2019 && pei_section_data (ibfd, isec) != NULL)
2020 {
2021 if (coff_section_data (obfd, osec) == NULL)
2022 {
2023 bfd_size_type amt = sizeof (struct coff_section_tdata);
1982 osec->used_by_bfd = (PTR) bfd_zalloc (obfd, amt);
2024 osec->used_by_bfd = bfd_zalloc (obfd, amt);
1983 if (osec->used_by_bfd == NULL)
1984 return FALSE;
1985 }
1986
1987 if (pei_section_data (obfd, osec) == NULL)
1988 {
1989 bfd_size_type amt = sizeof (struct pei_section_tdata);
2025 if (osec->used_by_bfd == NULL)
2026 return FALSE;
2027 }
2028
2029 if (pei_section_data (obfd, osec) == NULL)
2030 {
2031 bfd_size_type amt = sizeof (struct pei_section_tdata);
1990 coff_section_data (obfd, osec)->tdata = (PTR) bfd_zalloc (obfd, amt);
2032 coff_section_data (obfd, osec)->tdata = bfd_zalloc (obfd, amt);
1991 if (coff_section_data (obfd, osec)->tdata == NULL)
1992 return FALSE;
1993 }
1994
1995 pei_section_data (obfd, osec)->virt_size =
1996 pei_section_data (ibfd, isec)->virt_size;
1997 pei_section_data (obfd, osec)->pe_flags =
1998 pei_section_data (ibfd, isec)->pe_flags;
1999 }
2000
2001 return TRUE;
2002}
2003
2004void
2033 if (coff_section_data (obfd, osec)->tdata == NULL)
2034 return FALSE;
2035 }
2036
2037 pei_section_data (obfd, osec)->virt_size =
2038 pei_section_data (ibfd, isec)->virt_size;
2039 pei_section_data (obfd, osec)->pe_flags =
2040 pei_section_data (ibfd, isec)->pe_flags;
2041 }
2042
2043 return TRUE;
2044}
2045
2046void
2005_bfd_XX_get_symbol_info (abfd, symbol, ret)
2006 bfd *abfd;
2007 asymbol *symbol;
2008 symbol_info *ret;
2047_bfd_XX_get_symbol_info (bfd * abfd, asymbol *symbol, symbol_info *ret)
2009{
2010 coff_get_symbol_info (abfd, symbol, ret);
2048{
2049 coff_get_symbol_info (abfd, symbol, ret);
2011#if 0 /* This code no longer appears to be necessary.
2012 ImageBase has already been added in by coff_swap_scnhdr_in. */
2013 if (pe_data (abfd) != NULL
2014 && ((symbol->flags & BSF_DEBUGGING) == 0
2015 || (symbol->flags & BSF_DEBUGGING_RELOC) != 0)
2016 && ! bfd_is_abs_section (symbol->section))
2017 ret->value += pe_data (abfd)->pe_opthdr.ImageBase;
2018#endif
2019}
2020
2021/* Handle the .idata section and other things that need symbol table
2022 access. */
2023
2024bfd_boolean
2050}
2051
2052/* Handle the .idata section and other things that need symbol table
2053 access. */
2054
2055bfd_boolean
2025_bfd_XXi_final_link_postscript (abfd, pfinfo)
2026 bfd *abfd;
2027 struct coff_final_link_info *pfinfo;
2056_bfd_XXi_final_link_postscript (bfd * abfd, struct coff_final_link_info *pfinfo)
2028{
2029 struct coff_link_hash_entry *h1;
2030 struct bfd_link_info *info = pfinfo->info;
2057{
2058 struct coff_link_hash_entry *h1;
2059 struct bfd_link_info *info = pfinfo->info;
2060 bfd_boolean result = TRUE;
2031
2032 /* There are a few fields that need to be filled in now while we
2033 have symbol table access.
2034
2035 The .idata subsections aren't directly available as sections, but
2036 they are in the symbol table, so get them from there. */
2037
2038 /* The import directory. This is the address of .idata$2, with size
2039 of .idata$2 + .idata$3. */
2040 h1 = coff_link_hash_lookup (coff_hash_table (info),
2041 ".idata$2", FALSE, FALSE, TRUE);
2042 if (h1 != NULL)
2043 {
2061
2062 /* There are a few fields that need to be filled in now while we
2063 have symbol table access.
2064
2065 The .idata subsections aren't directly available as sections, but
2066 they are in the symbol table, so get them from there. */
2067
2068 /* The import directory. This is the address of .idata$2, with size
2069 of .idata$2 + .idata$3. */
2070 h1 = coff_link_hash_lookup (coff_hash_table (info),
2071 ".idata$2", FALSE, FALSE, TRUE);
2072 if (h1 != NULL)
2073 {
2044 pe_data (abfd)->pe_opthdr.DataDirectory[1].VirtualAddress =
2045 (h1->root.u.def.value
2046 + h1->root.u.def.section->output_section->vma
2047 + h1->root.u.def.section->output_offset);
2074 /* PR ld/2729: We cannot rely upon all the output sections having been
2075 created properly, so check before referencing them. Issue a warning
2076 message for any sections tht could not be found. */
2077 if (h1->root.u.def.section != NULL
2078 && h1->root.u.def.section->output_section != NULL)
2079 pe_data (abfd)->pe_opthdr.DataDirectory[PE_IMPORT_TABLE].VirtualAddress =
2080 (h1->root.u.def.value
2081 + h1->root.u.def.section->output_section->vma
2082 + h1->root.u.def.section->output_offset);
2083 else
2084 {
2085 _bfd_error_handler
2086 (_("%B: unable to fill in DataDictionary[1] because .idata$2 is missing"),
2087 abfd);
2088 result = FALSE;
2089 }
2090
2048 h1 = coff_link_hash_lookup (coff_hash_table (info),
2049 ".idata$4", FALSE, FALSE, TRUE);
2091 h1 = coff_link_hash_lookup (coff_hash_table (info),
2092 ".idata$4", FALSE, FALSE, TRUE);
2050 pe_data (abfd)->pe_opthdr.DataDirectory[1].Size =
2051 ((h1->root.u.def.value
2052 + h1->root.u.def.section->output_section->vma
2053 + h1->root.u.def.section->output_offset)
2054 - pe_data (abfd)->pe_opthdr.DataDirectory[1].VirtualAddress);
2093 if (h1 != NULL
2094 && h1->root.u.def.section != NULL
2095 && h1->root.u.def.section->output_section != NULL)
2096 pe_data (abfd)->pe_opthdr.DataDirectory[PE_IMPORT_TABLE].Size =
2097 ((h1->root.u.def.value
2098 + h1->root.u.def.section->output_section->vma
2099 + h1->root.u.def.section->output_offset)
2100 - pe_data (abfd)->pe_opthdr.DataDirectory[PE_IMPORT_TABLE].VirtualAddress);
2101 else
2102 {
2103 _bfd_error_handler
2104 (_("%B: unable to fill in DataDictionary[1] because .idata$4 is missing"),
2105 abfd);
2106 result = FALSE;
2107 }
2055
2056 /* The import address table. This is the size/address of
2057 .idata$5. */
2058 h1 = coff_link_hash_lookup (coff_hash_table (info),
2059 ".idata$5", FALSE, FALSE, TRUE);
2108
2109 /* The import address table. This is the size/address of
2110 .idata$5. */
2111 h1 = coff_link_hash_lookup (coff_hash_table (info),
2112 ".idata$5", FALSE, FALSE, TRUE);
2060 pe_data (abfd)->pe_opthdr.DataDirectory[12].VirtualAddress =
2061 (h1->root.u.def.value
2062 + h1->root.u.def.section->output_section->vma
2063 + h1->root.u.def.section->output_offset);
2113 if (h1 != NULL
2114 && h1->root.u.def.section != NULL
2115 && h1->root.u.def.section->output_section != NULL)
2116 pe_data (abfd)->pe_opthdr.DataDirectory[PE_IMPORT_ADDRESS_TABLE].VirtualAddress =
2117 (h1->root.u.def.value
2118 + h1->root.u.def.section->output_section->vma
2119 + h1->root.u.def.section->output_offset);
2120 else
2121 {
2122 _bfd_error_handler
2123 (_("%B: unable to fill in DataDictionary[12] because .idata$5 is missing"),
2124 abfd);
2125 result = FALSE;
2126 }
2127
2064 h1 = coff_link_hash_lookup (coff_hash_table (info),
2065 ".idata$6", FALSE, FALSE, TRUE);
2128 h1 = coff_link_hash_lookup (coff_hash_table (info),
2129 ".idata$6", FALSE, FALSE, TRUE);
2066 pe_data (abfd)->pe_opthdr.DataDirectory[12].Size =
2067 ((h1->root.u.def.value
2068 + h1->root.u.def.section->output_section->vma
2069 + h1->root.u.def.section->output_offset)
2070 - pe_data (abfd)->pe_opthdr.DataDirectory[12].VirtualAddress);
2130 if (h1 != NULL
2131 && h1->root.u.def.section != NULL
2132 && h1->root.u.def.section->output_section != NULL)
2133 pe_data (abfd)->pe_opthdr.DataDirectory[PE_IMPORT_ADDRESS_TABLE].Size =
2134 ((h1->root.u.def.value
2135 + h1->root.u.def.section->output_section->vma
2136 + h1->root.u.def.section->output_offset)
2137 - pe_data (abfd)->pe_opthdr.DataDirectory[PE_IMPORT_ADDRESS_TABLE].VirtualAddress);
2138 else
2139 {
2140 _bfd_error_handler
2141 (_("%B: unable to fill in DataDictionary[PE_IMPORT_ADDRESS_TABLE (12)] because .idata$6 is missing"),
2142 abfd);
2143 result = FALSE;
2144 }
2071 }
2072
2073 h1 = coff_link_hash_lookup (coff_hash_table (info),
2074 "__tls_used", FALSE, FALSE, TRUE);
2075 if (h1 != NULL)
2076 {
2145 }
2146
2147 h1 = coff_link_hash_lookup (coff_hash_table (info),
2148 "__tls_used", FALSE, FALSE, TRUE);
2149 if (h1 != NULL)
2150 {
2077 pe_data (abfd)->pe_opthdr.DataDirectory[9].VirtualAddress =
2078 (h1->root.u.def.value
2079 + h1->root.u.def.section->output_section->vma
2080 + h1->root.u.def.section->output_offset
2081 - pe_data (abfd)->pe_opthdr.ImageBase);
2082 pe_data (abfd)->pe_opthdr.DataDirectory[9].Size = 0x18;
2151 if (h1->root.u.def.section != NULL
2152 && h1->root.u.def.section->output_section != NULL)
2153 pe_data (abfd)->pe_opthdr.DataDirectory[PE_TLS_TABLE].VirtualAddress =
2154 (h1->root.u.def.value
2155 + h1->root.u.def.section->output_section->vma
2156 + h1->root.u.def.section->output_offset
2157 - pe_data (abfd)->pe_opthdr.ImageBase);
2158 else
2159 {
2160 _bfd_error_handler
2161 (_("%B: unable to fill in DataDictionary[9] because __tls_used is missing"),
2162 abfd);
2163 result = FALSE;
2164 }
2165
2166 pe_data (abfd)->pe_opthdr.DataDirectory[PE_TLS_TABLE].Size = 0x18;
2083 }
2084
2085 /* If we couldn't find idata$2, we either have an excessively
2086 trivial program or are in DEEP trouble; we have to assume trivial
2087 program.... */
2167 }
2168
2169 /* If we couldn't find idata$2, we either have an excessively
2170 trivial program or are in DEEP trouble; we have to assume trivial
2171 program.... */
2088 return TRUE;
2172 return result;
2089}
2173}