Swapped the order of the MeSsAgEs and CoPyRiGhT tags to make >=NW4.x NLM
loaders to show the Copyright string.
This commit is contained in:
Nick Clifton
parent
2c71db8993
commit
9e12c7db7f
|
|
@ -1,3 +1,10 @@
|
|||
2002-07-23 Gabor Keresztfalvi <keresztg@mail.com>
|
||||
|
||||
* nlmcode.h (nlm_swap_auxiliary_headers_out): Swapped the order of
|
||||
the MeSsAgEs and CoPyRiGhT tags to make >=NW4.x NLM loaders to
|
||||
show the Copyright string.
|
||||
Minor formatting tidy ups.
|
||||
|
||||
2002-07-23 Nick Clifton <nickc@redhat.com>
|
||||
|
||||
* po/fr.po: New French translation.
|
||||
|
|
|
|||
121
bfd/nlmcode.h
121
bfd/nlmcode.h
|
|
@ -5,21 +5,21 @@
|
|||
Written by Fred Fish @ Cygnus Support, using ELF support as the
|
||||
template.
|
||||
|
||||
This file is part of BFD, the Binary File Descriptor library.
|
||||
This file is part of BFD, the Binary File Descriptor library.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
||||
|
||||
#include "bfd.h"
|
||||
#include "sysdep.h"
|
||||
|
|
@ -57,7 +57,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
|||
#define nlm_swap_fixed_header_out(abfd,src,dst) \
|
||||
(nlm_swap_fixed_header_out_func(abfd)) (abfd,src,dst)
|
||||
|
||||
/* Forward declarations of static functions */
|
||||
/* Forward declarations of static functions. */
|
||||
|
||||
static boolean add_bfd_section
|
||||
PARAMS ((bfd *, char *, file_ptr, bfd_size_type, flagword));
|
||||
|
|
@ -114,7 +114,6 @@ nlm_object_p (abfd)
|
|||
}
|
||||
|
||||
/* Read in the fixed length portion of the NLM header in external format. */
|
||||
|
||||
amt = nlm_fixed_header_size (abfd);
|
||||
x_fxdhdr = (PTR) bfd_malloc (amt);
|
||||
if (x_fxdhdr == NULL)
|
||||
|
|
@ -130,7 +129,6 @@ nlm_object_p (abfd)
|
|||
|
||||
/* Allocate an instance of the nlm_obj_tdata structure and hook it up to
|
||||
the tdata pointer in the bfd. */
|
||||
|
||||
amt = sizeof (struct nlm_obj_tdata);
|
||||
new_tdata = (struct nlm_obj_tdata *) bfd_zalloc (abfd, amt);
|
||||
if (new_tdata == NULL)
|
||||
|
|
@ -145,7 +143,6 @@ nlm_object_p (abfd)
|
|||
|
||||
/* Check to see if we have an NLM file for this backend by matching
|
||||
the NLM signature. */
|
||||
|
||||
signature = nlm_signature (abfd);
|
||||
if (signature != NULL
|
||||
&& *signature != '\0'
|
||||
|
|
@ -155,14 +152,12 @@ nlm_object_p (abfd)
|
|||
|
||||
/* There's no supported way to discover the endianess of an NLM, so test for
|
||||
a sane version number after doing byte swapping appropriate for this
|
||||
XVEC. (Hack alert!) */
|
||||
|
||||
XVEC. (Hack alert!) */
|
||||
if (i_fxdhdrp->version > 0xFFFF)
|
||||
goto got_wrong_format_error;
|
||||
|
||||
/* There's no supported way to check for 32 bit versus 64 bit addresses,
|
||||
so ignore this distinction for now. (FIXME) */
|
||||
|
||||
/* Swap in the rest of the required header. */
|
||||
if (!nlm_swap_variable_header_in (abfd))
|
||||
{
|
||||
|
|
@ -177,7 +172,6 @@ nlm_object_p (abfd)
|
|||
additional sections described in the cygnus_ext header.
|
||||
From this point on we assume that we have an NLM, and do not
|
||||
treat errors as indicating the wrong format. */
|
||||
|
||||
if (!add_bfd_section (abfd, NLM_CODE_NAME,
|
||||
i_fxdhdrp->codeImageOffset,
|
||||
i_fxdhdrp->codeImageSize,
|
||||
|
|
@ -239,14 +233,14 @@ add_bfd_section (abfd, name, offset, size, flags)
|
|||
|
||||
newsect = bfd_make_section (abfd, name);
|
||||
if (newsect == NULL)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
|
||||
newsect->vma = 0; /* NLM's are relocatable. */
|
||||
newsect->_raw_size = size;
|
||||
newsect->filepos = offset;
|
||||
newsect->flags = flags;
|
||||
newsect->alignment_power = bfd_log2 ((bfd_vma) 0); /* FIXME */
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -327,7 +321,6 @@ nlm_swap_variable_header_out (abfd)
|
|||
bfd_size_type amt;
|
||||
|
||||
/* Write the description length and text members. */
|
||||
|
||||
amt = sizeof (nlm_variable_header (abfd)->descriptionLength);
|
||||
if (bfd_bwrite ((PTR) & nlm_variable_header (abfd)->descriptionLength, amt,
|
||||
abfd) != amt)
|
||||
|
|
@ -338,7 +331,6 @@ nlm_swap_variable_header_out (abfd)
|
|||
return false;
|
||||
|
||||
/* Convert and write the stackSize field. */
|
||||
|
||||
put_word (abfd, (bfd_vma) nlm_variable_header (abfd)->stackSize,
|
||||
(bfd_byte *) temp);
|
||||
amt = sizeof (temp);
|
||||
|
|
@ -346,7 +338,6 @@ nlm_swap_variable_header_out (abfd)
|
|||
return false;
|
||||
|
||||
/* Convert and write the reserved field. */
|
||||
|
||||
put_word (abfd, (bfd_vma) nlm_variable_header (abfd)->reserved,
|
||||
(bfd_byte *) temp);
|
||||
amt = sizeof (temp);
|
||||
|
|
@ -354,14 +345,12 @@ nlm_swap_variable_header_out (abfd)
|
|||
return false;
|
||||
|
||||
/* Write the oldThreadName field. This field is a fixed length string. */
|
||||
|
||||
amt = sizeof (nlm_variable_header (abfd)->oldThreadName);
|
||||
if (bfd_bwrite ((PTR) nlm_variable_header (abfd)->oldThreadName, amt,
|
||||
abfd) != amt)
|
||||
return false;
|
||||
|
||||
/* Write the screen name length and text members. */
|
||||
|
||||
amt = sizeof (nlm_variable_header (abfd)->screenNameLength);
|
||||
if (bfd_bwrite ((PTR) & nlm_variable_header (abfd)->screenNameLength, amt,
|
||||
abfd) != amt)
|
||||
|
|
@ -372,7 +361,6 @@ nlm_swap_variable_header_out (abfd)
|
|||
return false;
|
||||
|
||||
/* Write the thread name length and text members. */
|
||||
|
||||
amt = sizeof (nlm_variable_header (abfd)->threadNameLength);
|
||||
if (bfd_bwrite ((PTR) & nlm_variable_header (abfd)->threadNameLength, amt,
|
||||
abfd) != amt)
|
||||
|
|
@ -663,9 +651,7 @@ nlm_swap_auxiliary_headers_in (abfd)
|
|||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
@ -719,6 +705,31 @@ nlm_swap_auxiliary_headers_out (abfd)
|
|||
return false;
|
||||
}
|
||||
|
||||
/* Note - the CoPyRiGhT tag is emitted before the MeSsAgEs
|
||||
tag in order to make the NW4.x and NW5.x loaders happy. */
|
||||
|
||||
/* Write out the copyright header if there is one. */
|
||||
if (find_nonzero ((PTR) nlm_copyright_header (abfd),
|
||||
sizeof (Nlm_Internal_Copyright_Header)))
|
||||
{
|
||||
Nlm_External_Copyright_Header thdr;
|
||||
|
||||
memcpy (thdr.stamp, "CoPyRiGhT=", 10);
|
||||
amt = sizeof (thdr.stamp);
|
||||
if (bfd_bwrite ((PTR) thdr.stamp, amt, abfd) != amt)
|
||||
return false;
|
||||
thdr.copyrightMessageLength[0] =
|
||||
nlm_copyright_header (abfd)->copyrightMessageLength;
|
||||
amt = 1;
|
||||
if (bfd_bwrite ((PTR) thdr.copyrightMessageLength, amt, abfd) != amt)
|
||||
return false;
|
||||
/* The copyright message is a variable length string. */
|
||||
amt = nlm_copyright_header (abfd)->copyrightMessageLength + 1;
|
||||
if (bfd_bwrite ((PTR) nlm_copyright_header (abfd)->copyrightMessage,
|
||||
amt, abfd) != amt)
|
||||
return false;
|
||||
}
|
||||
|
||||
/* Write out the extended header if there is one. */
|
||||
if (find_nonzero ((PTR) nlm_extended_header (abfd),
|
||||
sizeof (Nlm_Internal_Extended_Header)))
|
||||
|
|
@ -818,28 +829,6 @@ nlm_swap_auxiliary_headers_out (abfd)
|
|||
return false;
|
||||
}
|
||||
|
||||
/* Write out the copyright header if there is one. */
|
||||
if (find_nonzero ((PTR) nlm_copyright_header (abfd),
|
||||
sizeof (Nlm_Internal_Copyright_Header)))
|
||||
{
|
||||
Nlm_External_Copyright_Header thdr;
|
||||
|
||||
memcpy (thdr.stamp, "CoPyRiGhT=", 10);
|
||||
amt = sizeof (thdr.stamp);
|
||||
if (bfd_bwrite ((PTR) thdr.stamp, amt, abfd) != amt)
|
||||
return false;
|
||||
thdr.copyrightMessageLength[0] =
|
||||
nlm_copyright_header (abfd)->copyrightMessageLength;
|
||||
amt = 1;
|
||||
if (bfd_bwrite ((PTR) thdr.copyrightMessageLength, amt, abfd) != amt)
|
||||
return false;
|
||||
/* The copyright message is a variable length string. */
|
||||
amt = nlm_copyright_header (abfd)->copyrightMessageLength + 1;
|
||||
if (bfd_bwrite ((PTR) nlm_copyright_header (abfd)->copyrightMessage,
|
||||
amt, abfd) != amt)
|
||||
return false;
|
||||
}
|
||||
|
||||
/* Write out the custom header if there is one. */
|
||||
if (find_nonzero ((PTR) nlm_custom_header (abfd),
|
||||
sizeof (Nlm_Internal_Custom_Header)))
|
||||
|
|
@ -913,7 +902,7 @@ long
|
|||
nlm_get_symtab_upper_bound (abfd)
|
||||
bfd *abfd;
|
||||
{
|
||||
Nlm_Internal_Fixed_Header *i_fxdhdrp; /* Nlm file header, internal form */
|
||||
Nlm_Internal_Fixed_Header *i_fxdhdrp; /* Nlm file header, internal form. */
|
||||
long symcount;
|
||||
long symtab_size = 0;
|
||||
|
||||
|
|
@ -1018,20 +1007,19 @@ nlm_print_symbol (abfd, afile, symbol, how)
|
|||
The bfd symbols are copied to SYMPTRS.
|
||||
|
||||
When we return, the bfd symcount is either zero or contains the correct
|
||||
number of symbols.
|
||||
*/
|
||||
number of symbols. */
|
||||
|
||||
static boolean
|
||||
nlm_slurp_symbol_table (abfd)
|
||||
bfd *abfd;
|
||||
{
|
||||
Nlm_Internal_Fixed_Header *i_fxdhdrp; /* Nlm file header, internal form */
|
||||
bfd_size_type totsymcount; /* Number of NLM symbols */
|
||||
bfd_size_type symcount; /* Counter of NLM symbols */
|
||||
nlm_symbol_type *sym; /* Pointer to current bfd symbol */
|
||||
unsigned char symlength; /* Symbol length read into here */
|
||||
unsigned char symtype; /* Type of debugging symbol */
|
||||
bfd_byte temp[NLM_TARGET_LONG_SIZE]; /* Symbol offsets read into here */
|
||||
Nlm_Internal_Fixed_Header *i_fxdhdrp; /* Nlm file header, internal form. */
|
||||
bfd_size_type totsymcount; /* Number of NLM symbols. */
|
||||
bfd_size_type symcount; /* Counter of NLM symbols. */
|
||||
nlm_symbol_type *sym; /* Pointer to current bfd symbol. */
|
||||
unsigned char symlength; /* Symbol length read into here. */
|
||||
unsigned char symtype; /* Type of debugging symbol. */
|
||||
bfd_byte temp[NLM_TARGET_LONG_SIZE]; /* Symbol offsets read into here. */
|
||||
boolean (*read_import_func) PARAMS ((bfd *, nlm_symbol_type *));
|
||||
boolean (*set_public_section_func) PARAMS ((bfd *, nlm_symbol_type *));
|
||||
bfd_size_type amt;
|
||||
|
|
@ -1053,9 +1041,7 @@ nlm_slurp_symbol_table (abfd)
|
|||
+ i_fxdhdrp->numberOfDebugRecords
|
||||
+ i_fxdhdrp->numberOfExternalReferences);
|
||||
if (totsymcount == 0)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
|
||||
if (bfd_seek (abfd, i_fxdhdrp->publicsOffset, SEEK_SET) != 0)
|
||||
return false;
|
||||
|
|
@ -1171,7 +1157,6 @@ nlm_slurp_symbol_table (abfd)
|
|||
|
||||
/* Read in the import records. We can only do this if we know how
|
||||
to read relocs for this target. */
|
||||
|
||||
read_import_func = nlm_read_import_func (abfd);
|
||||
if (read_import_func != NULL)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue