projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for the Z80 processor family
[deliverable/binutils-gdb.git]
/
bfd
/
coff-stgo32.c
diff --git
a/bfd/coff-stgo32.c
b/bfd/coff-stgo32.c
index bd9d00a344102a075ce2d91331abd2720eb2cceb..3c5fdbb6e804a9f12c0fa5d9747204071b29f832 100644
(file)
--- a/
bfd/coff-stgo32.c
+++ b/
bfd/coff-stgo32.c
@@
-1,5
+1,5
@@
/* BFD back-end for Intel 386 COFF files (DJGPP variant with a stub).
/* BFD back-end for Intel 386 COFF files (DJGPP variant with a stub).
- Copyright 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright 1997, 1998, 1999, 2000, 2001
, 2002
Free Software Foundation, Inc.
Written by Robert Hoehne.
This file is part of BFD, the Binary File Descriptor library.
Written by Robert Hoehne.
This file is part of BFD, the Binary File Descriptor library.
@@
-16,7
+16,7
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Foundation, Inc., 5
1 Franklin Street - Fifth Floor, Boston, MA 02110-1301
, USA. */
/* This file handles now also stubbed coff images. The stub is a small
DOS executable program before the coff image to load it in memory
/* This file handles now also stubbed coff images. The stub is a small
DOS executable program before the coff image to load it in memory
@@
-32,8
+32,7
@@
image and NOT in the file.
To be compatible with any existing executables I have fixed this
image and NOT in the file.
To be compatible with any existing executables I have fixed this
- here and NOT in the DJGPP startup code.
- */
+ here and NOT in the DJGPP startup code. */
#define TARGET_SYM go32stubbedcoff_vec
#define TARGET_NAME "coff-go32-exe"
#define TARGET_SYM go32stubbedcoff_vec
#define TARGET_NAME "coff-go32-exe"
@@
-55,40
+54,32
@@
#include "bfd.h"
#include "bfd.h"
-/* At first the prototypes */
+/* At first the prototypes
.
*/
static void
static void
-adjust_filehdr_in_post PARAMS ((bfd *
abfd, PTR src, PTR dst
));
+adjust_filehdr_in_post PARAMS ((bfd *
, PTR, PTR
));
static void
static void
-adjust_filehdr_out_pre PARAMS ((bfd *
abfd, PTR in, PTR out
));
+adjust_filehdr_out_pre PARAMS ((bfd *
, PTR, PTR
));
static void
static void
-adjust_filehdr_out_post PARAMS ((bfd * abfd, PTR in, PTR out));
-
+adjust_filehdr_out_post PARAMS ((bfd *, PTR, PTR));
static void
static void
-adjust_scnhdr_in_post PARAMS ((bfd *
abfd, PTR ext, PTR in
));
+adjust_scnhdr_in_post PARAMS ((bfd *
, PTR, PTR
));
static void
static void
-adjust_scnhdr_out_pre PARAMS ((bfd *
abfd, PTR in, PTR out
));
+adjust_scnhdr_out_pre PARAMS ((bfd *
, PTR, PTR
));
static void
static void
-adjust_scnhdr_out_post PARAMS ((bfd * abfd, PTR in, PTR out));
-
+adjust_scnhdr_out_post PARAMS ((bfd *, PTR, PTR));
static void
static void
-adjust_aux_in_post PARAMS ((bfd * abfd, PTR ext1, int type, int class, int indx,
- int numaux, PTR in1));
+adjust_aux_in_post PARAMS ((bfd *, PTR, int, int, int, int, PTR));
static void
static void
-adjust_aux_out_pre PARAMS ((bfd * abfd, PTR inp, int type, int class, int indx,
- int numaux, PTR extp));
+adjust_aux_out_pre PARAMS ((bfd *, PTR, int, int, int, int, PTR));
static void
static void
-adjust_aux_out_post PARAMS ((bfd * abfd, PTR inp, int type, int class, int indx,
- int numaux, PTR extp));
-
+adjust_aux_out_post PARAMS ((bfd *, PTR, int, int, int, int, PTR));
static void
static void
-create_go32_stub PARAMS ((bfd *
abfd
));
+create_go32_stub PARAMS ((bfd *));
-/*
- All that ..._PRE and ...POST functions are called from the corresponding
+/* All that ..._PRE and ...POST functions are called from the corresponding
coff_swap... functions. The ...PRE functions are called at the beginning
coff_swap... functions. The ...PRE functions are called at the beginning
- of the function and the ...POST functions at the end of the swap routines.
- */
+ of the function and the ...POST functions at the end of the swap routines. */
#define COFF_ADJUST_FILEHDR_IN_POST adjust_filehdr_in_post
#define COFF_ADJUST_FILEHDR_OUT_PRE adjust_filehdr_out_pre
#define COFF_ADJUST_FILEHDR_IN_POST adjust_filehdr_in_post
#define COFF_ADJUST_FILEHDR_OUT_PRE adjust_filehdr_out_pre
@@
-102,24
+93,24
@@
create_go32_stub PARAMS ((bfd * abfd));
#define COFF_ADJUST_AUX_OUT_PRE adjust_aux_out_pre
#define COFF_ADJUST_AUX_OUT_POST adjust_aux_out_post
#define COFF_ADJUST_AUX_OUT_PRE adjust_aux_out_pre
#define COFF_ADJUST_AUX_OUT_POST adjust_aux_out_post
-static boolean
- go32_stubbed_coff_bfd_copy_private_bfd_data PARAMS ((bfd *
ibfd, bfd * obfd
));
+static b
fd_b
oolean
+ go32_stubbed_coff_bfd_copy_private_bfd_data PARAMS ((bfd *
, bfd *
));
#define coff_bfd_copy_private_bfd_data go32_stubbed_coff_bfd_copy_private_bfd_data
#include "coff-i386.c"
#define coff_bfd_copy_private_bfd_data go32_stubbed_coff_bfd_copy_private_bfd_data
#include "coff-i386.c"
-/* I hold in the usrdata the stub */
+/* I hold in the usrdata the stub
.
*/
#define bfd_coff_go32stub bfd_usrdata
/* This macro is used, because I cannot assume the endianess of the
#define bfd_coff_go32stub bfd_usrdata
/* This macro is used, because I cannot assume the endianess of the
- host system */
-#define _H(index) (
bfd_h_get_16(abfd, (bfd_byte *)
(header+index*2)))
+ host system
.
*/
+#define _H(index) (
H_GET_16 (abfd,
(header+index*2)))
/* These bytes are a 2048-byte DOS executable, which loads the COFF
/* These bytes are a 2048-byte DOS executable, which loads the COFF
- image into memory and then runs it. It is called 'stub' */
+ image into memory and then runs it. It is called 'stub'
.
*/
-static unsigned char stub_bytes[STUBSIZE] =
+static
const
unsigned char stub_bytes[STUBSIZE] =
{
#include "go32stub.h"
};
{
#include "go32stub.h"
};
@@
-129,10
+120,10
@@
static unsigned char stub_bytes[STUBSIZE] =
technique is in any function the same. For the ...in function,
all the pointers are adjusted by adding STUBSIZE and for the
...out function, it is subtracted first and after calling the
technique is in any function the same. For the ...in function,
all the pointers are adjusted by adding STUBSIZE and for the
...out function, it is subtracted first and after calling the
- standard swap function it is reset to the old value */
+ standard swap function it is reset to the old value
.
*/
/* This macro is used for adjusting the filepointers, which
/* This macro is used for adjusting the filepointers, which
- is done only, if the pointer is nonzero */
+ is done only, if the pointer is nonzero
.
*/
#define ADJUST_VAL(val,diff) \
if (val != 0) val += diff
#define ADJUST_VAL(val,diff) \
if (val != 0) val += diff
@@
-148,13
+139,13
@@
adjust_filehdr_in_post (abfd, src, dst)
ADJUST_VAL (filehdr_dst->f_symptr, STUBSIZE);
ADJUST_VAL (filehdr_dst->f_symptr, STUBSIZE);
- /* Save now the stub to be used later */
- bfd_coff_go32stub (abfd) = (PTR) bfd_alloc (abfd, STUBSIZE);
+ /* Save now the stub to be used later
.
*/
+ bfd_coff_go32stub (abfd) = (PTR) bfd_alloc (abfd,
(bfd_size_type)
STUBSIZE);
/* Since this function returns no status, I do not set here
any bfd_error_...
That means, before the use of bfd_coff_go32stub (), this value
/* Since this function returns no status, I do not set here
any bfd_error_...
That means, before the use of bfd_coff_go32stub (), this value
- should be checked if it is != NULL */
+ should be checked if it is != NULL
.
*/
if (bfd_coff_go32stub (abfd) == NULL)
return;
memcpy (bfd_coff_go32stub (abfd), filehdr_src->stub, STUBSIZE);
if (bfd_coff_go32stub (abfd) == NULL)
return;
memcpy (bfd_coff_go32stub (abfd), filehdr_src->stub, STUBSIZE);
@@
-169,14
+160,14
@@
adjust_filehdr_out_pre (abfd, in, out)
struct internal_filehdr *filehdr_in = (struct internal_filehdr *) in;
FILHDR *filehdr_out = (FILHDR *) out;
struct internal_filehdr *filehdr_in = (struct internal_filehdr *) in;
FILHDR *filehdr_out = (FILHDR *) out;
- /* Generate the stub */
+ /* Generate the stub
.
*/
create_go32_stub (abfd);
create_go32_stub (abfd);
- /* Copy the stub to the file header */
+ /* Copy the stub to the file header
.
*/
if (bfd_coff_go32stub (abfd) != NULL)
memcpy (filehdr_out->stub, bfd_coff_go32stub (abfd), STUBSIZE);
else
if (bfd_coff_go32stub (abfd) != NULL)
memcpy (filehdr_out->stub, bfd_coff_go32stub (abfd), STUBSIZE);
else
- /*
use the default
*/
+ /*
Use the default.
*/
memcpy (filehdr_out->stub, stub_bytes, STUBSIZE);
ADJUST_VAL (filehdr_in->f_symptr, -STUBSIZE);
memcpy (filehdr_out->stub, stub_bytes, STUBSIZE);
ADJUST_VAL (filehdr_in->f_symptr, -STUBSIZE);
@@
-189,7
+180,7
@@
adjust_filehdr_out_post (abfd, in, out)
PTR out ATTRIBUTE_UNUSED;
{
struct internal_filehdr *filehdr_in = (struct internal_filehdr *) in;
PTR out ATTRIBUTE_UNUSED;
{
struct internal_filehdr *filehdr_in = (struct internal_filehdr *) in;
- /*
undo the above change
*/
+ /*
Undo the above change.
*/
ADJUST_VAL (filehdr_in->f_symptr, STUBSIZE);
}
ADJUST_VAL (filehdr_in->f_symptr, STUBSIZE);
}
@@
-286,8
+277,7
@@
adjust_aux_out_post (abfd, inp, type, class, indx, numaux, extp)
}
}
}
}
-/*
- That's the function, which creates the stub. There are
+/* That's the function, which creates the stub. There are
different cases from where the stub is taken.
At first the environment variable $(GO32STUB) is checked and then
$(STUB) if it was not set.
different cases from where the stub is taken.
At first the environment variable $(GO32STUB) is checked and then
$(STUB) if it was not set.
@@
-297,14
+287,13
@@
adjust_aux_out_post (abfd, inp, type, class, indx, numaux, extp)
file.
If there was any error, the standard stub (compiled in this file)
file.
If there was any error, the standard stub (compiled in this file)
- is taken.
- */
+ is taken. */
static void
create_go32_stub (abfd)
bfd *abfd;
{
static void
create_go32_stub (abfd)
bfd *abfd;
{
- /* Do it only once */
+ /* Do it only once
.
*/
if (bfd_coff_go32stub (abfd) == NULL)
{
char *stub;
if (bfd_coff_go32stub (abfd) == NULL)
{
char *stub;
@@
-312,11
+301,12
@@
create_go32_stub (abfd)
int f;
unsigned char header[10];
char magic[8];
int f;
unsigned char header[10];
char magic[8];
- unsigned long coff_start, exe_start;
+ unsigned long coff_start;
+ long exe_start;
- /* Check at first the environment variable $(GO32STUB) */
+ /* Check at first the environment variable $(GO32STUB)
.
*/
stub = getenv ("GO32STUB");
stub = getenv ("GO32STUB");
- /* Now check the environment variable $(STUB) */
+ /* Now check the environment variable $(STUB)
.
*/
if (stub == NULL)
stub = getenv ("STUB");
if (stub == NULL)
if (stub == NULL)
stub = getenv ("STUB");
if (stub == NULL)
@@
-335,26
+325,26
@@
create_go32_stub (abfd)
close (f);
goto stub_end;
}
close (f);
goto stub_end;
}
- if (_H (0) != 0x5a4d) /*
it is not an exe file
*/
+ if (_H (0) != 0x5a4d) /*
It is not an exe file.
*/
{
close (f);
goto stub_end;
}
/* Compute the size of the stub (it is every thing up
{
close (f);
goto stub_end;
}
/* Compute the size of the stub (it is every thing up
- to the beginning of the coff image) */
+ to the beginning of the coff image)
.
*/
coff_start = (long) _H (2) * 512L;
if (_H (1))
coff_start += (long) _H (1) - 512L;
/* Currently there is only a fixed stub size of 2048 bytes
coff_start = (long) _H (2) * 512L;
if (_H (1))
coff_start += (long) _H (1) - 512L;
/* Currently there is only a fixed stub size of 2048 bytes
- supported */
+ supported
.
*/
if (coff_start != 2048)
{
close (f);
goto stub_end;
}
exe_start = _H (4) * 16;
if (coff_start != 2048)
{
close (f);
goto stub_end;
}
exe_start = _H (4) * 16;
- if ((
unsigned
long) lseek (f, exe_start, SEEK_SET) != exe_start)
+ if ((long) lseek (f, exe_start, SEEK_SET) != exe_start)
{
close (f);
goto stub_end;
{
close (f);
goto stub_end;
@@
-369,8
+359,9
@@
create_go32_stub (abfd)
close (f);
goto stub_end;
}
close (f);
goto stub_end;
}
- /* Now we found a correct stub (hopefully) */
- bfd_coff_go32stub (abfd) = (PTR) bfd_alloc (abfd, coff_start);
+ /* Now we found a correct stub (hopefully). */
+ bfd_coff_go32stub (abfd)
+ = (PTR) bfd_alloc (abfd, (bfd_size_type) coff_start);
if (bfd_coff_go32stub (abfd) == NULL)
{
close (f);
if (bfd_coff_go32stub (abfd) == NULL)
{
close (f);
@@
-387,39
+378,36
@@
create_go32_stub (abfd)
}
stub_end:
/* There was something wrong above, so use now the standard builtin
}
stub_end:
/* There was something wrong above, so use now the standard builtin
- stub */
+ stub
.
*/
if (bfd_coff_go32stub (abfd) == NULL)
{
if (bfd_coff_go32stub (abfd) == NULL)
{
- bfd_coff_go32stub (abfd) = (PTR) bfd_alloc (abfd, STUBSIZE);
+ bfd_coff_go32stub (abfd)
+ = (PTR) bfd_alloc (abfd, (bfd_size_type) STUBSIZE);
if (bfd_coff_go32stub (abfd) == NULL)
if (bfd_coff_go32stub (abfd) == NULL)
- {
- return;
- }
-
+ return;
memcpy (bfd_coff_go32stub (abfd), stub_bytes, STUBSIZE);
}
}
/* If ibfd was a stubbed coff image, copy the stub from that bfd
memcpy (bfd_coff_go32stub (abfd), stub_bytes, STUBSIZE);
}
}
/* If ibfd was a stubbed coff image, copy the stub from that bfd
- to the new obfd.
- */
+ to the new obfd. */
-static boolean
+static b
fd_b
oolean
go32_stubbed_coff_bfd_copy_private_bfd_data (ibfd, obfd)
bfd *ibfd;
bfd *obfd;
{
go32_stubbed_coff_bfd_copy_private_bfd_data (ibfd, obfd)
bfd *ibfd;
bfd *obfd;
{
- /*
check if both are the same targets
*/
+ /*
Check if both are the same targets.
*/
if (ibfd->xvec != obfd->xvec)
if (ibfd->xvec != obfd->xvec)
- return
true
;
+ return
TRUE
;
- /*
check if both have a valid stub
*/
+ /*
Check if both have a valid stub.
*/
if (bfd_coff_go32stub (ibfd) == NULL
|| bfd_coff_go32stub (obfd) == NULL)
if (bfd_coff_go32stub (ibfd) == NULL
|| bfd_coff_go32stub (obfd) == NULL)
- return
true
;
+ return
TRUE
;
- /* Now copy the stub */
+ /* Now copy the stub
.
*/
memcpy (bfd_coff_go32stub (obfd), bfd_coff_go32stub (ibfd), STUBSIZE);
memcpy (bfd_coff_go32stub (obfd), bfd_coff_go32stub (ibfd), STUBSIZE);
- return
true
;
+ return
TRUE
;
}
}
This page took
0.027306 seconds
and
4
git commands to generate.