summaryrefslogtreecommitdiff
path: root/bfd/vms-gsd.c
diff options
context:
space:
mode:
Diffstat (limited to 'bfd/vms-gsd.c')
-rw-r--r--bfd/vms-gsd.c138
1 files changed, 71 insertions, 67 deletions
diff --git a/bfd/vms-gsd.c b/bfd/vms-gsd.c
index 5365853ef07..2ee015fff06 100644
--- a/bfd/vms-gsd.c
+++ b/bfd/vms-gsd.c
@@ -145,11 +145,11 @@ static flagword vms_esecflag_by_name PARAMS ((struct sec_flags_struct *, char *,
/* Retrieve bfd section flags by name and size */
static flagword
-vms_secflag_by_name (abfd, section_flags, name, size)
+vms_secflag_by_name (abfd, section_flags, name, hassize)
bfd *abfd;
struct sec_flags_struct *section_flags;
char *name;
- int size;
+ int hassize;
{
int i = 0;
@@ -159,14 +159,14 @@ vms_secflag_by_name (abfd, section_flags, name, size)
strcasecmp (name, section_flags[i].name):
strcmp (name, section_flags[i].name)) == 0)
{
- if (size > 0)
+ if (hassize)
return section_flags[i].flags_hassize;
else
return section_flags[i].flags_always;
}
i++;
}
- if (size > 0)
+ if (hassize)
return section_flags[i].flags_hassize;
return section_flags[i].flags_always;
}
@@ -174,10 +174,10 @@ vms_secflag_by_name (abfd, section_flags, name, size)
/* Retrieve vms section flags by name and size */
static flagword
-vms_esecflag_by_name (section_flags, name, size)
+vms_esecflag_by_name (section_flags, name, hassize)
struct sec_flags_struct *section_flags;
char *name;
- int size;
+ int hassize;
{
int i = 0;
@@ -185,14 +185,14 @@ vms_esecflag_by_name (section_flags, name, size)
{
if (strcmp (name, section_flags[i].name) == 0)
{
- if (size > 0)
+ if (hassize)
return section_flags[i].vflags_hassize;
else
return section_flags[i].vflags_always;
}
i++;
}
- if (size > 0)
+ if (hassize)
return section_flags[i].vflags_hassize;
return section_flags[i].vflags_always;
}
@@ -290,16 +290,16 @@ _bfd_vms_slurp_gsd (abfd, objtype)
switch (objtype)
{
- case EOBJ_S_C_EGSD:
- PRIV(vms_rec) += 8; /* skip type, size, l_temp */
- PRIV(rec_size) -= 8;
- break;
- case OBJ_S_C_GSD:
- PRIV(vms_rec) += 1;
- PRIV(rec_size) -= 1;
- break;
- default:
- return -1;
+ case EOBJ_S_C_EGSD:
+ PRIV(vms_rec) += 8; /* skip type, size, l_temp */
+ PRIV(rec_size) -= 8;
+ break;
+ case OBJ_S_C_GSD:
+ PRIV(vms_rec) += 1;
+ PRIV(rec_size) -= 1;
+ break;
+ default:
+ return -1;
}
/* calculate base address for each section */
@@ -359,8 +359,9 @@ _bfd_vms_slurp_gsd (abfd, objtype)
return -1;
}
old_flags = bfd_getl16 (vms_rec + 2);
- section->_raw_size = bfd_getl32(vms_rec + 4); /* allocation */
- new_flags = vms_secflag_by_name (abfd, vax_section_flags, name, section->_raw_size);
+ section->_raw_size = bfd_getl32 (vms_rec + 4); /* allocation */
+ new_flags = vms_secflag_by_name (abfd, vax_section_flags, name,
+ section->_raw_size > 0);
if (old_flags & EGPS_S_V_REL)
new_flags |= SEC_RELOC;
if (old_flags & GPS_S_M_OVR)
@@ -414,7 +415,8 @@ _bfd_vms_slurp_gsd (abfd, objtype)
else if (section->_raw_size > old_section->_raw_size)
{
section->contents = ((unsigned char *)
- bfd_realloc (old_section->contents, section->_raw_size));
+ bfd_realloc (old_section->contents,
+ section->_raw_size));
if (section->contents == NULL)
{
bfd_set_error (bfd_error_no_memory);
@@ -425,13 +427,13 @@ _bfd_vms_slurp_gsd (abfd, objtype)
else
{
section->contents = ((unsigned char *)
- bfd_malloc (section->_raw_size));
+ bfd_malloc (section->_raw_size));
if (section->contents == NULL)
{
bfd_set_error (bfd_error_no_memory);
return -1;
}
- memset (section->contents, 0, (size_t)section->_raw_size);
+ memset (section->contents, 0, (size_t) section->_raw_size);
}
section->_cooked_size = section->_raw_size;
#if VMS_DEBUG
@@ -456,7 +458,7 @@ _bfd_vms_slurp_gsd (abfd, objtype)
case GSD_S_C_SYM:
case GSD_S_C_SYMW:
{
- int name_offset, value_offset;
+ int name_offset = 0, value_offset = 0;
/*
* symbol specification (definition or reference)
@@ -473,30 +475,30 @@ _bfd_vms_slurp_gsd (abfd, objtype)
switch (gsd_type)
{
- case GSD_S_C_EPM:
- name_offset = 11;
- value_offset = 5;
- new_flags |= BSF_FUNCTION;
- break;
- case GSD_S_C_EPMW:
- name_offset = 12;
- value_offset = 6;
- new_flags |= BSF_FUNCTION;
- break;
- case GSD_S_C_SYM:
- if (old_flags & GSY_S_M_DEF) /* symbol definition */
- name_offset = 9;
- else
- name_offset = 4;
- value_offset = 5;
- break;
- case GSD_S_C_SYMW:
- if (old_flags & GSY_S_M_DEF) /* symbol definition */
- name_offset = 10;
- else
- name_offset = 5;
- value_offset = 6;
- break;
+ case GSD_S_C_EPM:
+ name_offset = 11;
+ value_offset = 5;
+ new_flags |= BSF_FUNCTION;
+ break;
+ case GSD_S_C_EPMW:
+ name_offset = 12;
+ value_offset = 6;
+ new_flags |= BSF_FUNCTION;
+ break;
+ case GSD_S_C_SYM:
+ if (old_flags & GSY_S_M_DEF) /* symbol definition */
+ name_offset = 9;
+ else
+ name_offset = 4;
+ value_offset = 5;
+ break;
+ case GSD_S_C_SYMW:
+ if (old_flags & GSY_S_M_DEF) /* symbol definition */
+ name_offset = 10;
+ else
+ name_offset = 5;
+ value_offset = 6;
+ break;
}
/* save symbol in vms_symbol_table */
@@ -604,7 +606,8 @@ _bfd_vms_slurp_gsd (abfd, objtype)
return -1;
old_flags = bfd_getl16 (vms_rec + 6);
section->_raw_size = bfd_getl32 (vms_rec + 8); /* allocation */
- new_flags = vms_secflag_by_name (abfd, evax_section_flags, name, (int) section->_raw_size);
+ new_flags = vms_secflag_by_name (abfd, evax_section_flags, name,
+ section->_raw_size > 0);
if (old_flags & EGPS_S_V_REL)
new_flags |= SEC_RELOC;
if (!bfd_set_section_flags (abfd, section, new_flags))
@@ -821,10 +824,11 @@ _bfd_vms_write_gsd (abfd, objtype)
}
else
{
- new_flags = vms_esecflag_by_name (evax_section_flags, sname, section->_raw_size);
+ new_flags = vms_esecflag_by_name (evax_section_flags, sname,
+ section->_raw_size > 0);
}
_bfd_vms_output_short (abfd, new_flags);
- _bfd_vms_output_long (abfd, section->_raw_size);
+ _bfd_vms_output_long (abfd, (unsigned long) section->_raw_size);
_bfd_vms_output_counted (abfd, sname);
_bfd_vms_output_flush (abfd);
@@ -842,6 +846,7 @@ _bfd_vms_write_gsd (abfd, objtype)
for (symnum = 0; symnum < abfd->symcount; symnum++)
{
+ char *hash;
symbol = abfd->outsymbols[symnum];
if (*(symbol->name) == '_')
@@ -893,27 +898,26 @@ _bfd_vms_write_gsd (abfd, objtype)
}
_bfd_vms_output_short (abfd, new_flags);
- if (old_flags & (BSF_GLOBAL|BSF_WEAK)) /* symbol definition */
+ if (old_flags & (BSF_GLOBAL | BSF_WEAK)) /* symbol definition */
{
+ uquad code_address = 0;
+ unsigned long ca_psindx = 0;
+ unsigned long psindx;
+
if (old_flags & BSF_FUNCTION)
{
- _bfd_vms_output_quad (abfd, symbol->value);
- _bfd_vms_output_quad (abfd,
- ((asymbol *) (symbol->udata.p))->value);
- _bfd_vms_output_long (abfd,
- (((asymbol *) (symbol->udata.p))
- ->section->index));
- _bfd_vms_output_long (abfd, symbol->section->index);
- }
- else
- {
- _bfd_vms_output_quad (abfd, symbol->value); /* L_VALUE */
- _bfd_vms_output_quad (abfd, 0); /* L_CODE_ADDRESS */
- _bfd_vms_output_long (abfd, 0); /* L_CA_PSINDX */
- _bfd_vms_output_long (abfd, symbol->section->index);/* L_PSINDX */
+ code_address = ((asymbol *) (symbol->udata.p))->value;
+ ca_psindx = ((asymbol *) (symbol->udata.p))->section->index;
}
+ psindx = symbol->section->index;
+
+ _bfd_vms_output_quad (abfd, symbol->value);
+ _bfd_vms_output_quad (abfd, code_address);
+ _bfd_vms_output_long (abfd, ca_psindx);
+ _bfd_vms_output_long (abfd, psindx);
}
- _bfd_vms_output_counted (abfd, _bfd_vms_length_hash_symbol (abfd, symbol->name, EOBJ_S_C_SYMSIZ));
+ hash = _bfd_vms_length_hash_symbol (abfd, symbol->name, EOBJ_S_C_SYMSIZ);
+ _bfd_vms_output_counted (abfd, hash);
_bfd_vms_output_flush (abfd);