aboutsummaryrefslogtreecommitdiff
path: root/binutils/srconv.c
diff options
context:
space:
mode:
Diffstat (limited to 'binutils/srconv.c')
-rw-r--r--binutils/srconv.c363
1 files changed, 195 insertions, 168 deletions
diff --git a/binutils/srconv.c b/binutils/srconv.c
index b55d2d9..5361420 100644
--- a/binutils/srconv.c
+++ b/binutils/srconv.c
@@ -1,5 +1,5 @@
/* srconv.c -- Sysroff conversion program
- Copyright 1994, 1995, 1996, 1998, 1999, 2000, 2001
+ Copyright 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
Free Software Foundation, Inc.
This file is part of GNU Binutils.
@@ -96,7 +96,6 @@ static void wr_module PARAMS ((struct coff_ofile *));
static int align PARAMS ((int));
static void prescan PARAMS ((struct coff_ofile *));
static void show_usage PARAMS ((FILE *, int));
-static void show_help PARAMS ((void));
extern int main PARAMS ((int, char **));
static FILE *file;
@@ -123,9 +122,8 @@ get_member_id (x)
int x;
{
if (ids2[x])
- {
- return ids2[x];
- }
+ return ids2[x];
+
ids2[x] = base2++;
return ids2[x];
}
@@ -135,9 +133,8 @@ get_ordinary_id (x)
int x;
{
if (ids1[x])
- {
- return ids1[x];
- }
+ return ids1[x];
+
ids1[x] = base1++;
return ids1[x];
}
@@ -154,11 +151,8 @@ section_translate (n)
return n;
}
-
-
#define DATE "940201073000"; /* Just a time on my birthday */
-
static
char *
strip_suffix (name)
@@ -166,6 +160,7 @@ strip_suffix (name)
{
int i;
char *res;
+
for (i = 0; name[i] != 0 && name[i] != '.'; i++)
;
res = (char *) xmalloc (i + 1);
@@ -174,7 +169,6 @@ strip_suffix (name)
return res;
}
-
/* IT LEN stuff CS */
static void
checksum (file, ptr, size, code)
@@ -187,6 +181,7 @@ checksum (file, ptr, size, code)
int last;
int sum = 0;
int bytes = size / 8;
+
last = !(code & 0xff00);
if (size & 0x7)
abort ();
@@ -194,17 +189,14 @@ checksum (file, ptr, size, code)
ptr[1] = bytes + 1;
for (j = 0; j < bytes; j++)
- {
- sum += ptr[j];
- }
- /* Glue on a checksum too */
+ sum += ptr[j];
+
+ /* Glue on a checksum too. */
ptr[bytes] = ~sum;
fwrite (ptr, bytes + 1, 1, file);
}
-
-
static void
writeINT (n, ptr, idx, size, file)
int n;
@@ -222,11 +214,12 @@ writeINT (n, ptr, idx, size, file)
if (byte > 240)
{
- /* Lets write out that record and do another one */
+ /* Lets write out that record and do another one. */
checksum (file, ptr, *idx, code | 0x1000);
*idx = 16;
byte = *idx / 8;
}
+
switch (size)
{
case 0:
@@ -250,7 +243,6 @@ writeINT (n, ptr, idx, size, file)
*idx += size * 8;
}
-
static void
writeBITS (val, ptr, idx, size)
int val;
@@ -261,12 +253,13 @@ writeBITS (val, ptr, idx, size)
int byte = *idx / 8;
int bit = *idx % 8;
int old;
+
*idx += size;
old = ptr[byte];
- /* Turn off all about to change bits */
+ /* Turn off all about to change bits. */
old &= ~((~0 >> (8 - bit - size)) & ((1 << size) - 1));
- /* Turn on the bits we want */
+ /* Turn on the bits we want. */
old |= (val & ((1 << size) - 1)) << (8 - bit - size);
ptr[byte] = old;
}
@@ -280,14 +273,12 @@ writeBARRAY (data, ptr, idx, size, file)
FILE *file;
{
int i;
+
writeINT (data.len, ptr, idx, 1, file);
for (i = 0; i < data.len; i++)
- {
- writeINT (data.data[i], ptr, idx, 1, file);
- }
+ writeINT (data.data[i], ptr, idx, 1, file);
}
-
static void
writeCHARS (string, ptr, idx, size, file)
char *string;
@@ -300,7 +291,7 @@ writeCHARS (string, ptr, idx, size, file)
if (i > 240)
{
- /* Lets write out that record and do another one */
+ /* Lets write out that record and do another one. */
checksum (file, ptr, *idx, code | 0x1000);
*idx = 16;
i = *idx / 8;
@@ -308,12 +299,12 @@ writeCHARS (string, ptr, idx, size, file)
if (size == 0)
{
- /* Variable length string */
+ /* Variable length string. */
size = strlen (string);
ptr[i++] = size;
}
- /* BUG WAITING TO HAPPEN */
+ /* BUG WAITING TO HAPPEN. */
memcpy (ptr + i, string, size);
i += size;
*idx = i * 8;
@@ -322,7 +313,6 @@ writeCHARS (string, ptr, idx, size, file)
#define SYSROFF_SWAP_OUT
#include "sysroff.c"
-
static char *rname_sh[] =
{
"R0", "R1", "R2", "R3", "R4", "R5", "R6", "R7", "R8", "R9", "R10", "R11", "R12", "R13", "R14", "R15"
@@ -336,13 +326,14 @@ static char *rname_h8300[] =
static void
wr_tr ()
{
- /* The TR block is not normal - it doesn't have any contents. */
+ /* The TR block is not normal - it doesn't have any contents. */
- static char b[] = {
- 0xff, /* IT */
- 0x03, /* RL */
- 0xfd, /* CS */
- };
+ static char b[] =
+ {
+ 0xff, /* IT */
+ 0x03, /* RL */
+ 0xfd, /* CS */
+ };
fwrite (b, 1, sizeof (b), file);
}
@@ -354,7 +345,6 @@ wr_un (ptr, sfile, first, nsecs)
int nsecs ATTRIBUTE_UNUSED;
{
struct IT_un un;
-
struct coff_symbol *s;
un.spare1 = 0;
@@ -365,17 +355,16 @@ wr_un (ptr, sfile, first, nsecs)
un.format = FORMAT_OM;
un.spare1 = 0;
-
#if 1
- un.nsections = ptr->nsections - 1; /* Don't count the abs section */
+ un.nsections = ptr->nsections - 1; /* Don't count the abs section. */
#else
- /*NEW - only count sections with size */
+ /*NEW - only count sections with size. */
un.nsections = nsecs;
#endif
un.nextdefs = 0;
un.nextrefs = 0;
- /* Count all the undefined and defined variables with global scope */
+ /* Count all the undefined and defined variables with global scope. */
if (first)
{
@@ -397,7 +386,6 @@ wr_un (ptr, sfile, first, nsecs)
sysroff_swap_un_out (file, &un);
}
-
static void
wr_hd (p)
struct coff_ofile *p;
@@ -406,18 +394,16 @@ wr_hd (p)
hd.spare1 = 0;
if (bfd_get_file_flags (abfd) & EXEC_P)
- {
- hd.mt = MTYPE_ABS_LM;
- }
+ hd.mt = MTYPE_ABS_LM;
else
- {
- hd.mt = MTYPE_OMS_OR_LMS;
- }
+ hd.mt = MTYPE_OMS_OR_LMS;
+
hd.cd = DATE;
hd.nu = p->nsources; /* Always one unit */
hd.code = 0; /* Always ASCII */
hd.ver = "0200"; /* Version 2.00 */
+
switch (bfd_get_arch (abfd))
{
case bfd_arch_h8300:
@@ -516,7 +502,8 @@ wr_ob (p, section)
while (i < section->bfd_section->_raw_size)
{
struct IT_ob ob;
- int todo = 200; /* Copy in 200 byte lumps */
+ int todo = 200; /* Copy in 200 byte lumps. */
+
ob.spare = 0;
if (i + todo > section->bfd_section->_raw_size)
todo = section->bfd_section->_raw_size - i;
@@ -536,32 +523,33 @@ wr_ob (p, section)
ob.saf = 0;
}
- ob.cpf = 0; /* Never compress */
+ ob.cpf = 0; /* Never compress. */
ob.data.len = todo;
bfd_get_section_contents (abfd, section->bfd_section, stuff, i, todo);
ob.data.data = stuff;
sysroff_swap_ob_out (file, &ob /*, i + todo < section->size */ );
i += todo;
}
- /* Now fill the rest with blanks */
+
+ /* Now fill the rest with blanks. */
while (i < (bfd_size_type) section->size)
{
struct IT_ob ob;
- int todo = 200; /* Copy in 200 byte lumps */
+ int todo = 200; /* Copy in 200 byte lumps. */
+
ob.spare = 0;
if (i + todo > (bfd_size_type) section->size)
todo = section->size - i;
ob.saf = 0;
- ob.cpf = 0; /* Never compress */
+ ob.cpf = 0; /* Never compress. */
ob.data.len = todo;
memset (stuff, 0, todo);
ob.data.data = stuff;
sysroff_swap_ob_out (file, &ob);
i += todo;
}
- /* Now fill the rest with blanks */
-
+ /* Now fill the rest with blanks. */
}
static void
@@ -571,11 +559,13 @@ wr_rl (ptr, sec)
{
int nr = sec->nrelocs;
int i;
+
for (i = 0; i < nr; i++)
{
struct coff_reloc *r = sec->relocs + i;
struct coff_symbol *ref;
struct IT_rl rl;
+
rl.apol = 0;
rl.boundary = 0;
rl.segment = 1;
@@ -583,18 +573,19 @@ wr_rl (ptr, sec)
rl.check = 0;
rl.addr = r->offset;
rl.bitloc = 0;
- rl.flen = 32; /* SH Specific */
- /* What sort of reloc ? Look in the section to find out */
+ rl.flen = 32; /* SH Specific. */
+
+ /* What sort of reloc ? Look in the section to find out. */
ref = r->symbol;
if (ref->visible->type == coff_vis_ext_ref)
{
- rl.bcount = 4; /* Always 4 for us */
+ rl.bcount = 4; /* Always 4 for us. */
rl.op = OP_EXT_REF;
rl.symn = ref->er_number;
}
else if (ref->visible->type == coff_vis_common)
{
- rl.bcount = 11; /* Always 11 for us */
+ rl.bcount = 11; /* Always 11 for us. */
rl.op = OP_SEC_REF;
rl.secn = ref->where->section->number;
rl.copcode_is_3 = 3;
@@ -602,10 +593,9 @@ wr_rl (ptr, sec)
rl.addend = ref->where->offset - ref->where->section->address;
rl.aopcode_is_0x20 = 0x20;
}
-
else
{
- rl.bcount = 11; /* Always 11 for us */
+ rl.bcount = 11; /* Always 11 for us. */
rl.op = OP_SEC_REF;
rl.secn = ref->where->section->number;
rl.copcode_is_3 = 3;
@@ -613,12 +603,12 @@ wr_rl (ptr, sec)
rl.addend = -ref->where->section->address;
rl.aopcode_is_0x20 = 0x20;
}
+
rl.end = 0xff;
- if (rl.op == OP_SEC_REF
+
+ if ( rl.op == OP_SEC_REF
|| rl.op == OP_EXT_REF)
- {
- sysroff_swap_rl_out (file, &rl);
- }
+ sysroff_swap_rl_out (file, &rl);
}
}
@@ -627,6 +617,7 @@ wr_object_body (p)
struct coff_ofile *p;
{
int i;
+
for (i = 1; i < p->nsections; i++)
{
wr_sh (p, p->sections + i);
@@ -644,21 +635,23 @@ wr_dps_start (sfile, section, scope, type, nest)
int nest;
{
struct IT_dps dps;
+
dps.end = 0;
dps.opt = 0;
dps.type = type;
+
if (scope->sec)
{
dps.san = scope->sec->number;
dps.address = scope->offset - find_base (sfile, scope->sec);
dps.block_size = scope->size;
+
if (debug)
{
printf ("DPS %s %d %x\n",
sfile->name,
nest,
dps.address);
-
}
}
else
@@ -680,6 +673,7 @@ wr_dps_end (section, scope, type)
int type;
{
struct IT_dps dps;
+
dps.end = 1;
dps.type = type;
sysroff_swap_dps_out (file, &dps);
@@ -714,11 +708,13 @@ walk_tree_type_1 (sfile, symbol, type, nest)
dbt.sign = BTYPE_UNSPEC;
dbt.fptype = FPTYPE_NOTSPEC;
break;
+
case T_CHAR:
dbt.btype = BTYPE_CHAR;
dbt.sign = BTYPE_UNSPEC;
dbt.fptype = FPTYPE_NOTSPEC;
break;
+
case T_SHORT:
case T_INT:
case T_LONG:
@@ -726,23 +722,28 @@ walk_tree_type_1 (sfile, symbol, type, nest)
dbt.sign = SIGN_SIGNED;
dbt.fptype = FPTYPE_NOTSPEC;
break;
+
case T_FLOAT:
dbt.btype = BTYPE_FLOAT;
dbt.fptype = FPTYPE_SINGLE;
break;
+
case T_DOUBLE:
dbt.btype = BTYPE_FLOAT;
dbt.fptype = FPTYPE_DOUBLE;
break;
+
case T_LNGDBL:
dbt.btype = BTYPE_FLOAT;
dbt.fptype = FPTYPE_EXTENDED;
break;
+
case T_UCHAR:
dbt.btype = BTYPE_CHAR;
dbt.sign = SIGN_UNSIGNED;
dbt.fptype = FPTYPE_NOTSPEC;
break;
+
case T_USHORT:
case T_UINT:
case T_ULONG:
@@ -751,14 +752,17 @@ walk_tree_type_1 (sfile, symbol, type, nest)
dbt.fptype = FPTYPE_NOTSPEC;
break;
}
+
dbt.bitsize = type->size;
dbt.neg = 0x1001;
sysroff_swap_dbt_out (file, &dbt);
break;
}
+
case coff_pointer_type:
{
struct IT_dpt dpt;
+
walk_tree_type_1 (sfile, symbol, type->u.pointer.points_to, nest + 1);
dpt.neg = 0x1001;
sysroff_swap_dpt_out (file, &dpt);
@@ -769,6 +773,7 @@ walk_tree_type_1 (sfile, symbol, type, nest)
{
struct IT_dfp dfp;
struct coff_symbol *param;
+
dfp.end = 0;
dfp.spare = 0;
dfp.nparams = type->u.function.parameters->nvars;
@@ -781,9 +786,8 @@ walk_tree_type_1 (sfile, symbol, type, nest)
for (param = type->u.function.parameters->vars_head;
param;
param = param->next)
- {
- walk_tree_symbol (sfile, 0, param, nest);
- }
+ walk_tree_symbol (sfile, 0, param, nest);
+
dfp.end = 1;
sysroff_swap_dfp_out (file, &dfp);
break;
@@ -794,6 +798,7 @@ walk_tree_type_1 (sfile, symbol, type, nest)
struct IT_dbt dbt;
struct IT_dds dds;
struct coff_symbol *member;
+
dds.spare = 0;
dbt.btype = BTYPE_STRUCT;
dbt.bitsize = type->size;
@@ -805,43 +810,43 @@ walk_tree_type_1 (sfile, symbol, type, nest)
dds.end = 0;
dds.neg = 0x1001;
sysroff_swap_dds_out (file, &dds);
+
for (member = type->u.astructdef.elements->vars_head;
member;
member = member->next)
- {
- walk_tree_symbol (sfile, 0, member, nest + 1);
- }
+ walk_tree_symbol (sfile, 0, member, nest + 1);
dds.end = 1;
sysroff_swap_dds_out (file, &dds);
}
break;
+
case coff_structref_type:
{
struct IT_dbt dbt;
+
dbt.btype = BTYPE_TAG;
dbt.bitsize = type->size;
dbt.sign = SIGN_UNSPEC;
dbt.fptype = FPTYPE_NOTSPEC;
+
if (type->u.astructref.ref)
- {
- dbt.sid = get_member_id (type->u.astructref.ref->number);
- }
+ dbt.sid = get_member_id (type->u.astructref.ref->number);
else
- {
- dbt.sid = 0;
- }
+ dbt.sid = 0;
dbt.neg = 0x1001;
sysroff_swap_dbt_out (file, &dbt);
}
break;
+
case coff_array_type:
{
struct IT_dar dar;
int j;
- int dims = 1; /* Only output one dimension at a time */
+ int dims = 1; /* Only output one dimension at a time. */
+
dar.dims = dims;
dar.variable = nints (dims);
dar.subtype = nints (dims);
@@ -854,6 +859,7 @@ walk_tree_type_1 (sfile, symbol, type, nest)
dar.minspare = nints (dims);
dar.neg = 0x1001;
dar.length = type->size / type->u.array.dim;
+
for (j = 0; j < dims; j++)
{
dar.variable[j] = VARIABLE_FIXED;
@@ -868,11 +874,13 @@ walk_tree_type_1 (sfile, symbol, type, nest)
sysroff_swap_dar_out (file, &dar);
}
break;
+
case coff_enumdef_type:
{
struct IT_dbt dbt;
struct IT_den den;
struct coff_symbol *member;
+
dbt.btype = BTYPE_ENUM;
dbt.bitsize = type->size;
dbt.sign = SIGN_UNSPEC;
@@ -885,22 +893,21 @@ walk_tree_type_1 (sfile, symbol, type, nest)
den.neg = 0x1001;
den.spare = 0;
sysroff_swap_den_out (file, &den);
+
for (member = type->u.aenumdef.elements->vars_head;
member;
member = member->next)
- {
- walk_tree_symbol (sfile, 0, member, nest + 1);
- }
+ walk_tree_symbol (sfile, 0, member, nest + 1);
den.end = 1;
sysroff_swap_den_out (file, &den);
}
break;
- break;
case coff_enumref_type:
{
struct IT_dbt dbt;
+
dbt.btype = BTYPE_TAG;
dbt.bitsize = type->size;
dbt.sign = SIGN_UNSPEC;
@@ -910,6 +917,7 @@ walk_tree_type_1 (sfile, symbol, type, nest)
sysroff_swap_dbt_out (file, &dbt);
}
break;
+
default:
abort ();
}
@@ -955,17 +963,15 @@ walk_tree_type_1 (sfile, symbol, type, nest)
static void
walk_tree_type (sfile, symbol, type, nest)
-
- struct
- coff_sfile *sfile;
+ struct coff_sfile *sfile;
struct coff_symbol *symbol;
struct coff_type *type;
int nest;
{
if (symbol->type->type == coff_function_type)
{
-
struct IT_dty dty;
+
dty.end = 0;
dty.neg = 0x1001;
@@ -991,11 +997,11 @@ walk_tree_type (sfile, symbol, type, nest)
BLOCK_TYPE_BLOCK);
wr_dps_end (symbol->where->section,
symbol->type->u.function.code, BLOCK_TYPE_FUNCTION);
-
}
else
{
struct IT_dty dty;
+
dty.end = 0;
dty.neg = 0x1001;
sysroff_swap_dty_out (file, &dty);
@@ -1003,11 +1009,8 @@ walk_tree_type (sfile, symbol, type, nest)
dty.end = 1;
sysroff_swap_dty_out (file, &dty);
}
-
}
-
-
static void
walk_tree_symbol (sfile, section, symbol, nest)
struct coff_sfile *sfile;
@@ -1017,7 +1020,7 @@ walk_tree_symbol (sfile, section, symbol, nest)
{
struct IT_dsy dsy;
- memset(&dsy, 0, sizeof(dsy));
+ memset (&dsy, 0, sizeof(dsy));
dsy.nesting = nest;
switch (symbol->type->type)
@@ -1026,6 +1029,7 @@ walk_tree_symbol (sfile, section, symbol, nest)
dsy.type = STYPE_FUNC;
dsy.assign = 1;
break;
+
case coff_structref_type:
case coff_pointer_type:
case coff_array_type:
@@ -1034,18 +1038,22 @@ walk_tree_symbol (sfile, section, symbol, nest)
dsy.type = STYPE_VAR;
dsy.assign = 1;
break;
+
case coff_enumdef_type:
dsy.type = STYPE_TAG;
dsy.assign = 0;
dsy.magic = 2;
break;
+
case coff_structdef_type:
dsy.type = STYPE_TAG;
dsy.assign = 0;
dsy.magic = symbol->type->u.astructdef.isstruct ? 0 : 1;
break;
+
case coff_secdef_type:
return;
+
default:
abort ();
}
@@ -1055,6 +1063,7 @@ walk_tree_symbol (sfile, section, symbol, nest)
dsy.assign = 0;
dsy.type = STYPE_MEMBER;
}
+
if (symbol->where->where == coff_where_member_of_enum)
{
dsy.type = STYPE_ENUM;
@@ -1074,7 +1083,6 @@ walk_tree_symbol (sfile, section, symbol, nest)
dsy.snumber = get_ordinary_id (symbol->number);
}
-
dsy.sname = symbol->name[0] == '_' ? symbol->name + 1 : symbol->name;
switch (symbol->visible->type)
@@ -1083,30 +1091,37 @@ walk_tree_symbol (sfile, section, symbol, nest)
case coff_vis_ext_def:
dsy.ainfo = AINFO_STATIC_EXT_DEF;
break;
+
case coff_vis_ext_ref:
dsy.ainfo = AINFO_STATIC_EXT_REF;
break;
+
case coff_vis_int_def:
dsy.ainfo = AINFO_STATIC_INT;
break;
+
case coff_vis_auto:
case coff_vis_autoparam:
dsy.ainfo = AINFO_AUTO;
break;
+
case coff_vis_register:
case coff_vis_regparam:
dsy.ainfo = AINFO_REG;
break;
break;
+
case coff_vis_tag:
case coff_vis_member_of_struct:
case coff_vis_member_of_enum:
break;
+
default:
abort ();
}
dsy.dlength = symbol->type->size;
+
switch (symbol->where->where)
{
case coff_where_memory:
@@ -1116,16 +1131,17 @@ walk_tree_symbol (sfile, section, symbol, nest)
dsy.section = 0;
#endif
break;
+
case coff_where_member_of_struct:
case coff_where_member_of_enum:
case coff_where_stack:
case coff_where_register:
case coff_where_unknown:
case coff_where_strtag:
-
case coff_where_entag:
case coff_where_typedef:
break;
+
default:
abort ();
}
@@ -1135,12 +1151,12 @@ walk_tree_symbol (sfile, section, symbol, nest)
case coff_where_memory:
dsy.address = symbol->where->offset - find_base (sfile, symbol->where->section);
break;
+
case coff_where_stack:
dsy.address = symbol->where->offset;
break;
- case coff_where_member_of_struct:
-
+ case coff_where_member_of_struct:
if (symbol->where->bitsize)
{
int bits = (symbol->where->offset * 8 + symbol->where->bitoffset);
@@ -1157,18 +1173,20 @@ walk_tree_symbol (sfile, section, symbol, nest)
dsy.field_off = symbol->where->offset;
}
break;
+
case coff_where_member_of_enum:
/* dsy.bitunit = 0;
dsy.field_len = symbol->type->size;
dsy.field_off = symbol->where->offset; */
break;
+
case coff_where_register:
case coff_where_unknown:
case coff_where_strtag:
-
case coff_where_entag:
case coff_where_typedef:
break;
+
default:
abort ();
}
@@ -1179,10 +1197,9 @@ walk_tree_symbol (sfile, section, symbol, nest)
switch (symbol->visible->type)
{
case coff_vis_common:
- /* We do this 'cause common C symbols are treated as extdefs */
+ /* We do this 'cause common C symbols are treated as extdefs. */
case coff_vis_ext_def:
case coff_vis_ext_ref:
-
dsy.ename = symbol->name;
break;
@@ -1192,29 +1209,26 @@ walk_tree_symbol (sfile, section, symbol, nest)
break;
case coff_vis_int_def:
-
case coff_vis_auto:
case coff_vis_register:
case coff_vis_tag:
case coff_vis_member_of_struct:
case coff_vis_member_of_enum:
break;
+
default:
abort ();
}
dsy.sfn = 0;
dsy.sln = 2;
-
dsy.neg = 0x1001;
-
sysroff_swap_dsy_out (file, &dsy);
walk_tree_type (sfile, symbol, symbol->type, nest);
}
-
static void
walk_tree_scope (section, sfile, scope, nest, type)
struct coff_section *section;
@@ -1235,25 +1249,21 @@ walk_tree_scope (section, sfile, scope, nest, type)
wr_globals (tree, sfile, nest + 1);
for (vars = scope->vars_head; vars; vars = vars->next)
- {
- walk_tree_symbol (sfile, section, vars, nest);
- }
+ walk_tree_symbol (sfile, section, vars, nest);
for (child = scope->list_head; child; child = child->next)
- {
- walk_tree_scope (section, sfile, child, nest + 1, BLOCK_TYPE_BLOCK);
- }
+ walk_tree_scope (section, sfile, child, nest + 1, BLOCK_TYPE_BLOCK);
wr_dps_end (section, scope, type);
}
}
+
static void
walk_tree_sfile (section, sfile)
struct coff_section *section;
struct coff_sfile *sfile;
{
walk_tree_scope (section, sfile, sfile->scope, 0, BLOCK_TYPE_COMPUNIT);
-
}
static void
@@ -1261,9 +1271,7 @@ wr_program_structure (p, sfile)
struct coff_ofile *p;
struct coff_sfile *sfile;
{
-
walk_tree_sfile (p->sections + 4, sfile);
-
}
static void
@@ -1283,6 +1291,7 @@ wr_du (p, sfile, n)
int j;
unsigned int *lowest = (unsigned *) nints (p->nsections);
unsigned int *highest = (unsigned *) nints (p->nsections);
+
du.format = bfd_get_file_flags (abfd) & EXEC_P ? 0 : 1;
du.optimized = 0;
du.stackfrmt = 0;
@@ -1300,7 +1309,7 @@ wr_du (p, sfile, n)
}
/* Look through all the symbols and try and work out the extents in this
- source file */
+ source file. */
#if 0
for (symbol = sfile->scope->vars_head;
symbol;
@@ -1320,16 +1329,15 @@ wr_du (p, sfile, n)
}
}
-
for (i = 0; i < du.sections; i++)
{
if (highest[i] == 0)
- {
- lowest[i] = highest[i] = incit;
- }
+ lowest[i] = highest[i] = incit;
+
du.san[used] = i;
du.length[used] = highest[i] - lowest[i];
du.address[used] = bfd_get_file_flags (abfd) & EXEC_P ? lowest[i] : 0;
+
if (debug)
{
printf (" section %6s 0x%08x..0x%08x\n",
@@ -1339,14 +1347,16 @@ wr_du (p, sfile, n)
}
used++;
}
-
#endif
+
lim = du.sections;
for (j = 0; j < lim; j++)
{
int src = j;
int dst = j;
+
du.san[dst] = dst;
+
if (sfile->section[src].init)
{
du.length[dst]
@@ -1359,6 +1369,7 @@ wr_du (p, sfile, n)
du.length[dst] = 0;
du.address[dst] = 0;
}
+
if (debug)
{
if (sfile->section[src].parent)
@@ -1369,6 +1380,7 @@ wr_du (p, sfile, n)
du.address[dst] + du.length[dst] - 1);
}
}
+
du.sections = dst + 1;
}
@@ -1383,7 +1395,6 @@ wr_dus (p, sfile)
struct coff_ofile *p ATTRIBUTE_UNUSED;
struct coff_sfile *sfile;
{
-
struct IT_dus dus;
dus.efn = 0x1001;
@@ -1392,7 +1403,7 @@ wr_dus (p, sfile)
dus.fname = (char **) xcalloc (sizeof (char *), dus.ns);
dus.spare = nints (dus.ns);
dus.ndir = 0;
- /* Find the filenames */
+ /* Find the filenames. */
#if 0
i = 0;
@@ -1415,7 +1426,7 @@ wr_dus (p, sfile)
}
/* Find the offset of the .text section for this sfile in the
- .text section for the output file */
+ .text section for the output file. */
static int
find_base (sfile, section)
@@ -1564,7 +1575,8 @@ wr_dln (p, sfile, n)
#endif
}
-/* Write the global symbols out to the debug info */
+/* Write the global symbols out to the debug info. */
+
static void
wr_globals (p, sfile, n)
struct coff_ofile *p;
@@ -1572,6 +1584,7 @@ wr_globals (p, sfile, n)
int n ATTRIBUTE_UNUSED;
{
struct coff_symbol *sy;
+
for (sy = p->symbol_list_head;
sy;
sy = sy->next_in_ofile_list)
@@ -1580,10 +1593,9 @@ wr_globals (p, sfile, n)
|| sy->visible->type == coff_vis_ext_ref)
{
/* Only write out symbols if they belong to
- the current source file */
+ the current source file. */
if (sy->sfile == sfile)
walk_tree_symbol (sfile, 0, sy, 0);
-
}
}
}
@@ -1594,15 +1606,14 @@ wr_debug (p)
{
struct coff_sfile *sfile;
int n = 0;
+
for (sfile = p->source_head;
sfile;
sfile = sfile->next)
-
{
if (debug)
- {
- printf ("%s\n", sfile->name);
- }
+ printf ("%s\n", sfile->name);
+
wr_du (p, sfile, n);
wr_dus (p, sfile);
wr_program_structure (p, sfile);
@@ -1615,8 +1626,9 @@ static void
wr_cs ()
{
/* It seems that the CS struct is not normal - the size is wrong
- heres one I prepared earlier.. */
- static char b[] = {
+ heres one I prepared earlier. */
+ static char b[] =
+ {
0x80, /* IT */
0x21, /* RL */
0x00, /* number of chars in variable length part */
@@ -1656,7 +1668,7 @@ wr_cs ()
/* Write out the SC records for a unit. Create an SC
for all the sections which appear in the output file, even
- if there isn't an equivalent one on the input */
+ if there isn't an equivalent one on the input. */
static int
wr_sc (ptr, sfile)
@@ -1664,23 +1676,19 @@ wr_sc (ptr, sfile)
struct coff_sfile *sfile;
{
int i;
-int scount = 0;
- /* First work out the total number of sections */
-
+ int scount = 0;
+ /* First work out the total number of sections. */
int total_sec = ptr->nsections;
-
struct myinfo
{
struct coff_section *sec;
struct coff_symbol *symbol;
};
struct coff_symbol *symbol;
-
struct myinfo *info
= (struct myinfo *) calloc (total_sec, sizeof (struct myinfo));
-
for (i = 0; i < total_sec; i++)
{
info[i].sec = ptr->sections + i;
@@ -1706,19 +1714,20 @@ int scount = 0;
}
/* Now output all the section info, and fake up some stuff for sections
- we don't have */
-
+ we don't have. */
for (i = 1; i < total_sec; i++)
{
struct IT_sc sc;
char *name;
+
symbol = info[i].symbol;
sc.spare = 0;
sc.spare1 = 0;
+
if (!symbol)
{
- /* Don't have a symbol set aside for this section, which means that nothing
- in this file does anything for the section. */
+ /* Don't have a symbol set aside for this section, which means
+ that nothing in this file does anything for the section. */
sc.format = !(bfd_get_file_flags (abfd) & EXEC_P);
sc.addr = 0;
sc.length = 0;
@@ -1741,7 +1750,6 @@ int scount = 0;
}
sc.align = 4;
-
sc.concat = CONCAT_SIMPLE;
sc.read = 3;
sc.write = 3;
@@ -1750,8 +1758,9 @@ int scount = 0;
sc.mode = 3;
sc.spare = 0;
sc.segadd = 0;
- sc.spare1 = 0; /* If not zero, then it doesn't work */
+ sc.spare1 = 0; /* If not zero, then it doesn't work. */
sc.name = section_translate (name);
+
if (strlen (sc.name) == 1)
{
switch (sc.name[0])
@@ -1760,6 +1769,7 @@ int scount = 0;
case 'B':
sc.contents = CONTENTS_DATA;
break;
+
default:
sc.contents = CONTENTS_CODE;
}
@@ -1770,19 +1780,20 @@ int scount = 0;
}
#if 0
/* NEW */
- if (sc.length) {
+ if (sc.length)
+ {
#endif
- sysroff_swap_sc_out (file, &sc);
- scount++;
+ sysroff_swap_sc_out (file, &sc);
+ scount++;
#if 0
- }
+ }
#endif
}
-return scount;
+ return scount;
}
+/* Write out the ER records for a unit. */
-/* Write out the ER records for a unit. */
static void
wr_er (ptr, sfile, first)
struct coff_ofile *ptr;
@@ -1791,6 +1802,7 @@ wr_er (ptr, sfile, first)
{
int idx = 0;
struct coff_symbol *sym;
+
if (first)
{
for (sym = ptr->symbol_list_head; sym; sym = sym->next_in_ofile_list)
@@ -1798,6 +1810,7 @@ wr_er (ptr, sfile, first)
if (sym->visible->type == coff_vis_ext_ref)
{
struct IT_er er;
+
er.spare = 0;
er.type = ER_NOTSPEC;
er.name = sym->name;
@@ -1808,7 +1821,8 @@ wr_er (ptr, sfile, first)
}
}
-/* Write out the ED records for a unit. */
+/* Write out the ED records for a unit. */
+
static void
wr_ed (ptr, sfile, first)
struct coff_ofile *ptr;
@@ -1816,6 +1830,7 @@ wr_ed (ptr, sfile, first)
int first;
{
struct coff_symbol *s;
+
if (first)
{
for (s = ptr->symbol_list_head; s; s = s->next_in_ofile_list)
@@ -1827,6 +1842,7 @@ wr_ed (ptr, sfile, first)
ed.section = s->where->section->number;
ed.spare = 0;
+
if (s->where->section->data)
{
ed.type = ED_TYPE_DATA;
@@ -1840,6 +1856,7 @@ wr_ed (ptr, sfile, first)
ed.type = ED_TYPE_NOTSPEC;
ed.type = ED_TYPE_DATA;
}
+
ed.address = s->where->offset - s->where->section->address;
ed.name = s->name;
sysroff_swap_ed_out (file, &ed);
@@ -1854,6 +1871,7 @@ wr_unit_info (ptr)
{
struct coff_sfile *sfile;
int first = 1;
+
for (sfile = ptr->source_head;
sfile;
sfile = sfile->next)
@@ -1861,6 +1879,7 @@ wr_unit_info (ptr)
long p1;
long p2;
int nsecs;
+
p1 = ftell (file);
wr_un (ptr, sfile, first, 0);
nsecs = wr_sc (ptr, sfile);
@@ -1894,7 +1913,7 @@ align (x)
}
/* Find all the common variables and turn them into
- ordinary defs - dunno why, but thats what hitachi does with 'em */
+ ordinary defs - dunno why, but thats what hitachi does with 'em. */
static void
prescan (tree)
@@ -1902,8 +1921,10 @@ prescan (tree)
{
struct coff_symbol *s;
struct coff_section *common_section;
- /* Find the common section - always section 3 */
+
+ /* Find the common section - always section 3. */
common_section = tree->sections + 3;
+
for (s = tree->symbol_list_head;
s;
s = s->next_in_ofile_list)
@@ -1928,20 +1949,20 @@ show_usage (file, status)
FILE *file;
int status;
{
- fprintf (file, _("Usage: %s [-dhVq] in-file [out-file]\n"), program_name);
+ fprintf (file, _("Usage: %s [option(s)] in-file [out-file]\n"), program_name);
+ fprintf (file, _("Convert a COFF object file into a SYSROFF object file\n"));
+ fprintf (file, _(" The options are:\n\
+ -q --quick (Obsolete - ignoerd)\n\
+ -n --noprescan Do not perform a scan to convert commons into defs\n\
+ -d --debug Display information about what is being done\n\
+ -h --help Display this information\n\
+ -v --version Print the program's version number\n"));
+
+ if (status == 0)
+ fprintf (file, _("Report bugs to %s\n"), REPORT_BUGS_TO);
exit (status);
}
-static void
-show_help ()
-{
- printf (_("%s: Convert a COFF object file into a SYSROFF object file\n"),
- program_name);
- show_usage (stdout, 0);
-}
-
-
-
int
main (ac, av)
int ac;
@@ -1973,7 +1994,7 @@ main (ac, av)
program_name = av[0];
xmalloc_set_program_name (program_name);
- while ((opt = getopt_long (ac, av, "dhVqn", long_options,
+ while ((opt = getopt_long (ac, av, "dHhVvqn", long_options,
(int *) NULL))
!= EOF)
{
@@ -1988,9 +2009,11 @@ main (ac, av)
case 'd':
debug = 1;
break;
+ case 'H':
case 'h':
- show_help ();
+ show_usage (stdout, 0);
/*NOTREACHED */
+ case 'v':
case 'V':
print_version ("srconv");
exit (0);
@@ -2035,8 +2058,10 @@ main (ac, av)
it doesn't end in .o, then stick a .obj on anyway */
int len = strlen (input_file);
+
output_file = xmalloc (len + 5);
strcpy (output_file, input_file);
+
if (len > 3
&& output_file[len - 2] == '.'
&& output_file[len - 1] == 'o')
@@ -2059,6 +2084,7 @@ main (ac, av)
if (!bfd_check_format_matches (abfd, bfd_object, &matching))
{
bfd_nonfatal (input_file);
+
if (bfd_get_error () == bfd_error_file_ambiguously_recognized)
{
list_matching_formats (matching);
@@ -2070,15 +2096,16 @@ main (ac, av)
file = fopen (output_file, FOPEN_WB);
if (!file)
- {
- fatal (_("unable to open output file %s"), output_file);
- }
+ fatal (_("unable to open output file %s"), output_file);
if (debug)
printf ("ids %d %d\n", base1, base2);
+
tree = coff_grok (abfd);
+
if (!noprescan)
prescan (tree);
+
wr_module (tree);
return 0;
}
generated by cgit v1.1 at 2024-11-25 01:54:52 +0000