/* vms.c -- BFD back-end for EVAX (openVMS/Alpha) files.
- Copyright (C) 1996-2017 Free Software Foundation, Inc.
+ Copyright (C) 1996-2020 Free Software Foundation, Inc.
Initial version written by Klaus Kaempf (kkaempf@rmi.de)
Major rewrite by Adacore.
/* Debugger symbol definitions. */
-#define DBG_S_L_DMT_MODBEG 0
-#define DBG_S_L_DST_SIZE 4
-#define DBG_S_W_DMT_PSECT_COUNT 8
+#define DBG_S_L_DMT_MODBEG 0
+#define DBG_S_L_DST_SIZE 4
+#define DBG_S_W_DMT_PSECT_COUNT 8
#define DBG_S_C_DMT_HEADER_SIZE 12
-#define DBG_S_L_DMT_PSECT_START 0
+#define DBG_S_L_DMT_PSECT_START 0
#define DBG_S_L_DMT_PSECT_LENGTH 4
-#define DBG_S_C_DMT_PSECT_SIZE 8
+#define DBG_S_C_DMT_PSECT_SIZE 8
/* VMS module header. */
bfd_vma transfer_address[4];
/* Array of GSD sections to get the correspond BFD one. */
- unsigned int section_max; /* Size of the sections array. */
+ unsigned int section_max; /* Size of the sections array. */
unsigned int section_count; /* Number of GSD sections. */
asection **sections;
static int vms_get_remaining_object_record (bfd *, unsigned int);
static bfd_boolean _bfd_vms_slurp_object_records (bfd * abfd);
-static void alpha_vms_add_fixup_lp (struct bfd_link_info *, bfd *, bfd *);
-static void alpha_vms_add_fixup_ca (struct bfd_link_info *, bfd *, bfd *);
-static void alpha_vms_add_fixup_qr (struct bfd_link_info *, bfd *, bfd *,
- bfd_vma);
-static void alpha_vms_add_fixup_lr (struct bfd_link_info *, unsigned int,
- bfd_vma);
-static void alpha_vms_add_lw_reloc (struct bfd_link_info *);
-static void alpha_vms_add_qw_reloc (struct bfd_link_info *);
+static bfd_boolean alpha_vms_add_fixup_lp (struct bfd_link_info *,
+ bfd *, bfd *);
+static bfd_boolean alpha_vms_add_fixup_ca (struct bfd_link_info *,
+ bfd *, bfd *);
+static bfd_boolean alpha_vms_add_fixup_qr (struct bfd_link_info *,
+ bfd *, bfd *, bfd_vma);
+static bfd_boolean alpha_vms_add_fixup_lr (struct bfd_link_info *,
+ unsigned int, bfd_vma);
+static bfd_boolean alpha_vms_add_lw_reloc (struct bfd_link_info *);
+static bfd_boolean alpha_vms_add_qw_reloc (struct bfd_link_info *);
struct vector_type
{
#define VEC_EL(VEC, TYPE, N) (((TYPE *)((VEC).els))[N])
-#define VEC_INIT(VEC) \
- do { \
- (VEC).max_el = 0; \
- (VEC).nbr_el = 0; \
- (VEC).els = NULL; \
+#define VEC_INIT(VEC) \
+ do { \
+ (VEC).max_el = 0; \
+ (VEC).nbr_el = 0; \
+ (VEC).els = NULL; \
} while (0)
/* Be sure there is room for a new element. */
-static void vector_grow1 (struct vector_type *vec, size_t elsz);
+static void *vector_grow1 (struct vector_type *vec, size_t elsz);
/* Allocate room for a new element and return its address. */
-#define VEC_APPEND(VEC, TYPE) \
- (vector_grow1 (&VEC, sizeof (TYPE)), &VEC_EL(VEC, TYPE, (VEC).nbr_el++))
-
-/* Append an element. */
-
-#define VEC_APPEND_EL(VEC, TYPE, EL) \
- (*(VEC_APPEND (VEC, TYPE)) = EL)
+#define VEC_APPEND(VEC, TYPE) \
+ ((TYPE *) vector_grow1 (&VEC, sizeof (TYPE)))
struct alpha_vms_vma_ref
{
static bfd_boolean
_bfd_vms_slurp_eihd (bfd *abfd, unsigned int *eisd_offset,
- unsigned int *eihs_offset)
+ unsigned int *eihs_offset)
{
unsigned int imgtype, size;
bfd_vma symvva;
vms_debug2 ((8, "_bfd_vms_slurp_eihd\n"));
+ /* PR 21813: Check for an undersized record. */
+ if (PRIV (recrd.buf_size) < sizeof (* eihd))
+ {
+ _bfd_error_handler (_("corrupt EIHD record - size is too small"));
+ bfd_set_error (bfd_error_bad_value);
+ return FALSE;
+ }
+
size = bfd_getl32 (eihd->size);
imgtype = bfd_getl32 (eihd->imgtype);
*eihs_offset = bfd_getl32 (eihd->symdbgoff);
vms_debug2 ((4, "EIHD size %d imgtype %d symvva 0x%lx eisd %d eihs %d\n",
- size, imgtype, (unsigned long)symvva,
- *eisd_offset, *eihs_offset));
+ size, imgtype, (unsigned long)symvva,
+ *eisd_offset, *eihs_offset));
+ (void) size;
return TRUE;
}
struct vms_eisd *eisd;
unsigned int rec_size;
unsigned int size;
- unsigned long long vaddr;
+ bfd_uint64_t vaddr;
unsigned int flags;
unsigned int vbn;
char *name = NULL;
flagword bfd_flags;
/* PR 17512: file: 3d9e9fe9. */
- if (offset >= PRIV (recrd.rec_size))
+ if (offset > PRIV (recrd.rec_size)
+ || (PRIV (recrd.rec_size) - offset
+ < offsetof (struct vms_eisd, eisdsize) + 4))
return FALSE;
- eisd = (struct vms_eisd *)(PRIV (recrd.rec) + offset);
+ eisd = (struct vms_eisd *) (PRIV (recrd.rec) + offset);
rec_size = bfd_getl32 (eisd->eisdsize);
if (rec_size == 0)
- break;
+ break;
/* Skip to next block if pad. */
if (rec_size == 0xffffffff)
- {
- offset = (offset + VMS_BLOCK_SIZE) & ~(VMS_BLOCK_SIZE - 1);
- continue;
- }
- else
- offset += rec_size;
+ {
+ offset = (offset + VMS_BLOCK_SIZE) & ~(VMS_BLOCK_SIZE - 1);
+ continue;
+ }
+
+ /* Make sure that there is enough data present in the record. */
+ if (rec_size < offsetof (struct vms_eisd, type) + 1)
+ return FALSE;
+ /* Make sure that the record is not too big either. */
+ if (rec_size > PRIV (recrd.rec_size) - offset)
+ return FALSE;
+
+ offset += rec_size;
size = bfd_getl32 (eisd->secsize);
vaddr = bfd_getl64 (eisd->virt_addr);
vbn = bfd_getl32 (eisd->vbn);
vms_debug2 ((4, "EISD at 0x%x size 0x%x addr 0x%lx flags 0x%x blk %d\n",
- offset, size, (unsigned long)vaddr, flags, vbn));
+ offset, size, (unsigned long)vaddr, flags, vbn));
/* VMS combines psects from .obj files into isects in the .exe. This
process doesn't preserve enough information to reliably determine
especially true of DWARF debug sections. */
bfd_flags = SEC_ALLOC;
if (vbn != 0)
- bfd_flags |= SEC_HAS_CONTENTS | SEC_LOAD;
+ bfd_flags |= SEC_HAS_CONTENTS | SEC_LOAD;
if (flags & EISD__M_EXE)
bfd_flags |= SEC_CODE;
if (flags & EISD__M_GBL)
{
- name = _bfd_vms_save_counted_string (eisd->gblnam);
+ if (rec_size <= offsetof (struct vms_eisd, gblnam))
+ return FALSE;
+ else if (rec_size < sizeof (struct vms_eisd))
+ name = _bfd_vms_save_counted_string (abfd, eisd->gblnam,
+ rec_size - offsetof (struct vms_eisd, gblnam));
+ else
+ name = _bfd_vms_save_counted_string (abfd, eisd->gblnam,
+ EISD__K_GBLNAMLEN);
+ if (name == NULL || name[0] == 0)
+ return FALSE;
bfd_flags |= SEC_COFF_SHARED_LIBRARY;
bfd_flags &= ~(SEC_ALLOC | SEC_LOAD);
}
else if (flags & EISD__M_FIXUPVEC)
- name = "$FIXUPVEC$";
+ name = "$FIXUPVEC$";
else if (eisd->type == EISD__K_USRSTACK)
- name = "$STACK$";
+ name = "$STACK$";
else
{
- const char *pfx;
-
- name = (char*) bfd_alloc (abfd, 32);
- if (flags & EISD__M_DZRO)
- pfx = "BSS";
- else if (flags & EISD__M_EXE)
- pfx = "CODE";
- else if (!(flags & EISD__M_WRT))
- pfx = "RO";
- else
- pfx = "LOCAL";
- BFD_ASSERT (section_count < 999);
+ const char *pfx;
+
+ name = (char *) bfd_alloc (abfd, 32);
+ if (name == NULL)
+ return FALSE;
+ if (flags & EISD__M_DZRO)
+ pfx = "BSS";
+ else if (flags & EISD__M_EXE)
+ pfx = "CODE";
+ else if (!(flags & EISD__M_WRT))
+ pfx = "RO";
+ else
+ pfx = "LOCAL";
+ BFD_ASSERT (section_count < 999);
sprintf (name, "$%s_%03d$", pfx, section_count++);
}
section->size = size;
section->vma = vaddr;
- if (!bfd_set_section_flags (abfd, section, bfd_flags))
+ if (!bfd_set_section_flags (section, bfd_flags))
return FALSE;
}
_bfd_vms_slurp_eihs (bfd *abfd, unsigned int offset)
{
unsigned char *p = PRIV (recrd.rec) + offset;
- unsigned int gstvbn = bfd_getl32 (p + EIHS__L_GSTVBN);
- unsigned int gstsize ATTRIBUTE_UNUSED = bfd_getl32 (p + EIHS__L_GSTSIZE);
- unsigned int dstvbn = bfd_getl32 (p + EIHS__L_DSTVBN);
- unsigned int dstsize = bfd_getl32 (p + EIHS__L_DSTSIZE);
- unsigned int dmtvbn = bfd_getl32 (p + EIHS__L_DMTVBN);
- unsigned int dmtbytes = bfd_getl32 (p + EIHS__L_DMTBYTES);
+ unsigned int gstvbn;
+ unsigned int gstsize ATTRIBUTE_UNUSED;
+ unsigned int dstvbn;
+ unsigned int dstsize;
+ unsigned int dmtvbn;
+ unsigned int dmtbytes;
asection *section;
+ /* PR 21611: Check that offset is valid. */
+ if (offset > PRIV (recrd.rec_size) - (EIHS__L_DMTBYTES + 4))
+ {
+ _bfd_error_handler (_("unable to read EIHS record at offset %#x"),
+ offset);
+ bfd_set_error (bfd_error_file_truncated);
+ return FALSE;
+ }
+
+ gstvbn = bfd_getl32 (p + EIHS__L_GSTVBN);
+ gstsize = bfd_getl32 (p + EIHS__L_GSTSIZE);
+ dstvbn = bfd_getl32 (p + EIHS__L_DSTVBN);
+ dstsize = bfd_getl32 (p + EIHS__L_DSTSIZE);
+ dmtvbn = bfd_getl32 (p + EIHS__L_DMTVBN);
+ dmtbytes = bfd_getl32 (p + EIHS__L_DMTBYTES);
+
#if VMS_DEBUG
vms_debug (8, "_bfd_vms_slurp_ihs\n");
vms_debug (4, "EIHS record gstvbn %d gstsize %d dstvbn %d dstsize %d dmtvbn %d dmtbytes %d\n",
section->size = dstsize;
section->filepos = VMS_BLOCK_SIZE * (dstvbn - 1);
- if (!bfd_set_section_flags (abfd, section, bfd_flags))
+ if (!bfd_set_section_flags (section, bfd_flags))
return FALSE;
PRIV (dst_section) = section;
section->size = dmtbytes;
section->filepos = VMS_BLOCK_SIZE * (dmtvbn - 1);
- if (!bfd_set_section_flags (abfd, section, bfd_flags))
+ if (!bfd_set_section_flags (section, bfd_flags))
return FALSE;
}
if (PRIV (recrd.file_format) == FF_FOREIGN && (bfd_tell (abfd) & 1))
{
if (bfd_bread (PRIV (recrd.buf), 1, abfd) != 1)
- {
- bfd_set_error (bfd_error_file_truncated);
- return -1;
- }
+ {
+ bfd_set_error (bfd_error_file_truncated);
+ return -1;
+ }
}
/* Read the record header */
type = bfd_getl16 (PRIV (recrd.rec));
vms_debug2 ((8, "_bfd_vms_get_obj_record: rec %p, size %d, type %d\n",
- PRIV (recrd.rec), PRIV (recrd.rec_size), type));
+ PRIV (recrd.rec), PRIV (recrd.rec_size), type));
return type;
}
if (to_read > PRIV (recrd.buf_size))
{
PRIV (recrd.buf)
- = (unsigned char *) bfd_realloc (PRIV (recrd.buf), to_read);
+ = (unsigned char *) bfd_realloc (PRIV (recrd.buf), to_read);
if (PRIV (recrd.buf) == NULL)
- return 0;
+ return 0;
PRIV (recrd.buf_size) = to_read;
}
/* PR 17512: file: 025-1974-0.004. */
maybe_adjust_record_pointer_for_object (abfd);
vms_debug2 ((8, "vms_get_remaining_obj_record: size %d\n",
- PRIV (recrd.rec_size)));
+ PRIV (recrd.rec_size)));
return PRIV (recrd.rec_size);
}
PRIV (hdr_data).hdr_l_recsiz = bfd_getl32 (vms_rec + 16);
if ((vms_rec + 20 + vms_rec[20] + 1) >= end)
goto fail;
- PRIV (hdr_data).hdr_t_name = _bfd_vms_save_counted_string (vms_rec + 20);
+ PRIV (hdr_data).hdr_t_name
+ = _bfd_vms_save_counted_string (abfd, vms_rec + 20, vms_rec[20]);
ptr = vms_rec + 20 + vms_rec[20] + 1;
if ((ptr + *ptr + 1) >= end)
goto fail;
- PRIV (hdr_data).hdr_t_version =_bfd_vms_save_counted_string (ptr);
+ PRIV (hdr_data).hdr_t_version
+ = _bfd_vms_save_counted_string (abfd, ptr, *ptr);
ptr += *ptr + 1;
if (ptr + 17 >= end)
goto fail;
- PRIV (hdr_data).hdr_t_date = _bfd_vms_save_sized_string (ptr, 17);
+ PRIV (hdr_data).hdr_t_date
+ = _bfd_vms_save_sized_string (abfd, ptr, 17);
break;
case EMH__C_LNM:
if (vms_rec + PRIV (recrd.rec_size - 6) > end)
goto fail;
- PRIV (hdr_data).hdr_c_lnm =
- _bfd_vms_save_sized_string (vms_rec, PRIV (recrd.rec_size - 6));
+ PRIV (hdr_data).hdr_c_lnm
+ = _bfd_vms_save_sized_string (abfd, vms_rec, PRIV (recrd.rec_size - 6));
break;
case EMH__C_SRC:
if (vms_rec + PRIV (recrd.rec_size - 6) > end)
goto fail;
- PRIV (hdr_data).hdr_c_src =
- _bfd_vms_save_sized_string (vms_rec, PRIV (recrd.rec_size - 6));
+ PRIV (hdr_data).hdr_c_src
+ = _bfd_vms_save_sized_string (abfd, vms_rec, PRIV (recrd.rec_size - 6));
break;
case EMH__C_TTL:
if (vms_rec + PRIV (recrd.rec_size - 6) > end)
goto fail;
- PRIV (hdr_data).hdr_c_ttl =
- _bfd_vms_save_sized_string (vms_rec, PRIV (recrd.rec_size - 6));
+ PRIV (hdr_data).hdr_c_ttl
+ = _bfd_vms_save_sized_string (abfd, vms_rec, PRIV (recrd.rec_size - 6));
break;
case EMH__C_CPR:
while (section_flags[i].name != NULL)
{
if (strcmp (name, section_flags[i].name) == 0)
- {
+ {
if (hassize)
return section_flags[i].flags_hassize;
else
static flagword
vms_esecflag_by_name (const struct sec_flags_struct *section_flags,
const char *name,
- int hassize)
+ int hassize)
{
int i = 0;
if (PRIV (gsd_sym_count) >= PRIV (max_sym_count))
{
if (PRIV (max_sym_count) == 0)
- {
- PRIV (max_sym_count) = 128;
- PRIV (syms) = bfd_malloc
- (PRIV (max_sym_count) * sizeof (struct vms_symbol_entry *));
- }
+ {
+ PRIV (max_sym_count) = 128;
+ PRIV (syms) = bfd_malloc
+ (PRIV (max_sym_count) * sizeof (struct vms_symbol_entry *));
+ }
else
- {
- PRIV (max_sym_count) *= 2;
- PRIV (syms) = bfd_realloc
- (PRIV (syms),
- (PRIV (max_sym_count) * sizeof (struct vms_symbol_entry *)));
- }
+ {
+ PRIV (max_sym_count) *= 2;
+ PRIV (syms) = bfd_realloc
+ (PRIV (syms),
+ (PRIV (max_sym_count) * sizeof (struct vms_symbol_entry *)));
+ }
if (PRIV (syms) == NULL)
- return FALSE;
+ return FALSE;
}
PRIV (syms)[PRIV (gsd_sym_count)++] = sym;
Return NULL in case of error. */
static struct vms_symbol_entry *
-add_symbol (bfd *abfd, const unsigned char *ascic)
+add_symbol (bfd *abfd, const unsigned char *ascic, unsigned int max)
{
struct vms_symbol_entry *entry;
- int len;
+ unsigned int len;
len = *ascic++;
+ max -= 1;
+ if (len > max)
+ {
+ _bfd_error_handler (_("record is too small for symbol name length"));
+ bfd_set_error (bfd_error_bad_value);
+ return NULL;
+ }
+
entry = (struct vms_symbol_entry *)bfd_zalloc (abfd, sizeof (*entry) + len);
if (entry == NULL)
return NULL;
static bfd_boolean
_bfd_vms_slurp_egsd (bfd *abfd)
{
- int gsd_type, gsd_size;
+ int gsd_type;
+ unsigned int gsd_size;
unsigned char *vms_rec;
- unsigned long base_addr;
+ bfd_vma base_addr;
+ long psindx;
vms_debug2 ((2, "EGSD\n"));
+ if (PRIV (recrd.rec_size) < 8)
+ {
+ _bfd_error_handler (_("corrupt EGSD record: its size (%#x) is too small"),
+ PRIV (recrd.rec_size));
+ bfd_set_error (bfd_error_bad_value);
+ return FALSE;
+ }
+
PRIV (recrd.rec) += 8; /* Skip type, size, align pad. */
PRIV (recrd.rec_size) -= 8;
/* Calculate base address for each section. */
- base_addr = 0L;
+ base_addr = 0;
- while (PRIV (recrd.rec_size) > 0)
+ while (PRIV (recrd.rec_size) > 4)
{
vms_rec = PRIV (recrd.rec);
vms_debug2 ((3, "egsd_type %d\n", gsd_type));
+ /* PR 21615: Check for size overflow. */
+ if (PRIV (recrd.rec_size) < gsd_size)
+ {
+ _bfd_error_handler (_("corrupt EGSD record type %d: size (%#x) "
+ "is larger than remaining space (%#x)"),
+ gsd_type, gsd_size, PRIV (recrd.rec_size));
+ bfd_set_error (bfd_error_bad_value);
+ return FALSE;
+ }
+
+ if (gsd_size < 4)
+ {
+ too_small:
+ _bfd_error_handler (_("corrupt EGSD record type %d: size (%#x) "
+ "is too small"),
+ gsd_type, gsd_size);
+ bfd_set_error (bfd_error_bad_value);
+ return FALSE;
+ }
+
switch (gsd_type)
{
case EGSD__C_PSC:
- /* Program section definition. */
+ /* Program section definition. */
{
- struct vms_egps *egps = (struct vms_egps *)vms_rec;
- flagword new_flags, vms_flags;
- asection *section;
+ struct vms_egps *egps = (struct vms_egps *) vms_rec;
+ flagword new_flags, vms_flags;
+ asection *section;
+ if (offsetof (struct vms_egps, flags) + 2 > gsd_size)
+ goto too_small;
vms_flags = bfd_getl16 (egps->flags);
- if ((vms_flags & EGPS__V_REL) == 0)
- {
- /* Use the global absolute section for all
- absolute sections. */
- section = bfd_abs_section_ptr;
- }
- else
- {
- char *name;
- unsigned long align_addr;
-
- name = _bfd_vms_save_counted_string (&egps->namlng);
-
- section = bfd_make_section (abfd, name);
- if (!section)
- return FALSE;
-
- section->filepos = 0;
- section->size = bfd_getl32 (egps->alloc);
- section->alignment_power = egps->align;
-
- vms_section_data (section)->flags = vms_flags;
- vms_section_data (section)->no_flags = 0;
-
- new_flags = vms_secflag_by_name (evax_section_flags, name,
- section->size > 0);
- if (section->size > 0)
- new_flags |= SEC_LOAD;
- if (!(vms_flags & EGPS__V_NOMOD) && section->size > 0)
- {
- /* Set RELOC and HAS_CONTENTS if the section is not
- demand-zero and not empty. */
- new_flags |= SEC_HAS_CONTENTS;
- if (vms_flags & EGPS__V_REL)
- new_flags |= SEC_RELOC;
- }
- if (vms_flags & EGPS__V_EXE)
- {
- /* Set CODE if section is executable. */
- new_flags |= SEC_CODE;
- new_flags &= ~SEC_DATA;
- }
- if (!bfd_set_section_flags (abfd, section, new_flags))
- return FALSE;
-
- /* Give a non-overlapping vma to non absolute sections. */
- align_addr = (1 << section->alignment_power);
- if ((base_addr % align_addr) != 0)
- base_addr += (align_addr - (base_addr % align_addr));
- section->vma = (bfd_vma)base_addr;
- base_addr += section->size;
- }
-
- /* Append it to the section array. */
- if (PRIV (section_count) >= PRIV (section_max))
- {
- if (PRIV (section_max) == 0)
- PRIV (section_max) = 16;
- else
- PRIV (section_max) *= 2;
- PRIV (sections) = bfd_realloc_or_free
- (PRIV (sections), PRIV (section_max) * sizeof (asection *));
- if (PRIV (sections) == NULL)
- return FALSE;
- }
-
- PRIV (sections)[PRIV (section_count)] = section;
- PRIV (section_count)++;
+ if ((vms_flags & EGPS__V_REL) == 0)
+ {
+ /* Use the global absolute section for all
+ absolute sections. */
+ section = bfd_abs_section_ptr;
+ }
+ else
+ {
+ char *name;
+ bfd_vma align_addr;
+ size_t left;
+
+ if (offsetof (struct vms_egps, namlng) >= gsd_size)
+ goto too_small;
+ left = gsd_size - offsetof (struct vms_egps, namlng);
+ name = _bfd_vms_save_counted_string (abfd, &egps->namlng, left);
+ if (name == NULL || name[0] == 0)
+ return FALSE;
+
+ section = bfd_make_section (abfd, name);
+ if (!section)
+ return FALSE;
+
+ section->filepos = 0;
+ section->size = bfd_getl32 (egps->alloc);
+ section->alignment_power = egps->align & 31;
+
+ vms_section_data (section)->flags = vms_flags;
+ vms_section_data (section)->no_flags = 0;
+
+ new_flags = vms_secflag_by_name (evax_section_flags,
+ section->name,
+ section->size > 0);
+ if (section->size > 0)
+ new_flags |= SEC_LOAD;
+ if (!(vms_flags & EGPS__V_NOMOD) && section->size > 0)
+ {
+ /* Set RELOC and HAS_CONTENTS if the section is not
+ demand-zero and not empty. */
+ new_flags |= SEC_HAS_CONTENTS;
+ if (vms_flags & EGPS__V_REL)
+ new_flags |= SEC_RELOC;
+ }
+ if (vms_flags & EGPS__V_EXE)
+ {
+ /* Set CODE if section is executable. */
+ new_flags |= SEC_CODE;
+ new_flags &= ~SEC_DATA;
+ }
+ if (!bfd_set_section_flags (section, new_flags))
+ return FALSE;
+
+ /* Give a non-overlapping vma to non absolute sections. */
+ align_addr = (bfd_vma) 1 << section->alignment_power;
+ base_addr = (base_addr + align_addr - 1) & -align_addr;
+ section->vma = base_addr;
+ base_addr += section->size;
+ }
+
+ /* Append it to the section array. */
+ if (PRIV (section_count) >= PRIV (section_max))
+ {
+ if (PRIV (section_max) == 0)
+ PRIV (section_max) = 16;
+ else
+ PRIV (section_max) *= 2;
+ PRIV (sections) = bfd_realloc_or_free
+ (PRIV (sections), PRIV (section_max) * sizeof (asection *));
+ if (PRIV (sections) == NULL)
+ return FALSE;
+ }
+
+ PRIV (sections)[PRIV (section_count)] = section;
+ PRIV (section_count)++;
}
break;
case EGSD__C_SYM:
{
- int nameoff;
- struct vms_symbol_entry *entry;
- struct vms_egsy *egsy = (struct vms_egsy *) vms_rec;
- flagword old_flags;
+ unsigned int nameoff;
+ struct vms_symbol_entry *entry;
+ struct vms_egsy *egsy = (struct vms_egsy *) vms_rec;
+ flagword old_flags;
+ if (offsetof (struct vms_egsy, flags) + 2 > gsd_size)
+ goto too_small;
old_flags = bfd_getl16 (egsy->flags);
if (old_flags & EGSY__V_DEF)
- nameoff = ESDF__B_NAMLNG;
- else
- nameoff = ESRF__B_NAMLNG;
-
- entry = add_symbol (abfd, vms_rec + nameoff);
- if (entry == NULL)
- return FALSE;
-
- /* Allow only duplicate reference. */
- if ((entry->flags & EGSY__V_DEF) && (old_flags & EGSY__V_DEF))
- abort ();
-
- if (entry->typ == 0)
- {
- entry->typ = gsd_type;
- entry->data_type = egsy->datyp;
- entry->flags = old_flags;
- }
+ nameoff = ESDF__B_NAMLNG;
+ else
+ nameoff = ESRF__B_NAMLNG;
+
+ if (nameoff >= gsd_size)
+ goto too_small;
+ entry = add_symbol (abfd, vms_rec + nameoff, gsd_size - nameoff);
+ if (entry == NULL)
+ return FALSE;
+
+ /* Allow only duplicate reference. */
+ if ((entry->flags & EGSY__V_DEF) && (old_flags & EGSY__V_DEF))
+ abort ();
+
+ if (entry->typ == 0)
+ {
+ entry->typ = gsd_type;
+ entry->data_type = egsy->datyp;
+ entry->flags = old_flags;
+ }
if (old_flags & EGSY__V_DEF)
- {
- struct vms_esdf *esdf = (struct vms_esdf *)vms_rec;
+ {
+ struct vms_esdf *esdf = (struct vms_esdf *) vms_rec;
entry->value = bfd_getl64 (esdf->value);
- entry->section = PRIV (sections)[bfd_getl32 (esdf->psindx)];
+ if (PRIV (sections) == NULL)
+ return FALSE;
- if (old_flags & EGSY__V_NORM)
- {
- PRIV (norm_sym_count)++;
+ psindx = bfd_getl32 (esdf->psindx);
+ /* PR 21813: Check for an out of range index. */
+ if (psindx < 0 || psindx >= (int) PRIV (section_count))
+ {
+ bad_psindx:
+ _bfd_error_handler (_("corrupt EGSD record: its psindx "
+ "field is too big (%#lx)"),
+ psindx);
+ bfd_set_error (bfd_error_bad_value);
+ return FALSE;
+ }
+ entry->section = PRIV (sections)[psindx];
- entry->code_value = bfd_getl64 (esdf->code_address);
- entry->code_section =
- PRIV (sections)[bfd_getl32 (esdf->ca_psindx)];
- }
- }
+ if (old_flags & EGSY__V_NORM)
+ {
+ PRIV (norm_sym_count)++;
+
+ entry->code_value = bfd_getl64 (esdf->code_address);
+ psindx = bfd_getl32 (esdf->ca_psindx);
+ /* PR 21813: Check for an out of range index. */
+ if (psindx < 0 || psindx >= (int) PRIV (section_count))
+ goto bad_psindx;
+ entry->code_section = PRIV (sections)[psindx];
+ }
+ }
}
break;
case EGSD__C_SYMG:
{
- struct vms_symbol_entry *entry;
- struct vms_egst *egst = (struct vms_egst *)vms_rec;
- flagword old_flags;
+ struct vms_symbol_entry *entry;
+ struct vms_egst *egst = (struct vms_egst *)vms_rec;
+ flagword old_flags;
+ unsigned int nameoff = offsetof (struct vms_egst, namlng);
old_flags = bfd_getl16 (egst->header.flags);
- entry = add_symbol (abfd, &egst->namlng);
-
- if (entry == NULL)
- return FALSE;
-
- entry->typ = gsd_type;
- entry->data_type = egst->header.datyp;
- entry->flags = old_flags;
-
- entry->symbol_vector = bfd_getl32 (egst->value);
-
- if (old_flags & EGSY__V_REL)
- entry->section = PRIV (sections)[bfd_getl32 (egst->psindx)];
- else
- entry->section = bfd_abs_section_ptr;
-
- entry->value = bfd_getl64 (egst->lp_2);
-
- if (old_flags & EGSY__V_NORM)
- {
- PRIV (norm_sym_count)++;
-
- entry->code_value = bfd_getl64 (egst->lp_1);
- entry->code_section = bfd_abs_section_ptr;
- }
- }
+ if (nameoff >= gsd_size)
+ goto too_small;
+ entry = add_symbol (abfd, &egst->namlng, gsd_size - nameoff);
+ if (entry == NULL)
+ return FALSE;
+
+ entry->typ = gsd_type;
+ entry->data_type = egst->header.datyp;
+ entry->flags = old_flags;
+
+ entry->symbol_vector = bfd_getl32 (egst->value);
+
+ if (old_flags & EGSY__V_REL)
+ {
+ if (PRIV (sections) == NULL)
+ return FALSE;
+ psindx = bfd_getl32 (egst->psindx);
+ /* PR 21813: Check for an out of range index. */
+ if (psindx < 0 || psindx >= (int) PRIV (section_count))
+ goto bad_psindx;
+ entry->section = PRIV (sections)[psindx];
+ }
+ else
+ entry->section = bfd_abs_section_ptr;
+
+ entry->value = bfd_getl64 (egst->lp_2);
+
+ if (old_flags & EGSY__V_NORM)
+ {
+ PRIV (norm_sym_count)++;
+
+ entry->code_value = bfd_getl64 (egst->lp_1);
+ entry->code_section = bfd_abs_section_ptr;
+ }
+ }
break;
- case EGSD__C_SPSC:
- case EGSD__C_IDC:
- /* Currently ignored. */
- break;
+ case EGSD__C_SPSC:
+ case EGSD__C_IDC:
+ /* Currently ignored. */
+ break;
case EGSD__C_SYMM:
case EGSD__C_SYMV:
default:
- _bfd_error_handler (_("Unknown EGSD subtype %d"), gsd_type);
+ _bfd_error_handler (_("unknown EGSD subtype %d"), gsd_type);
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
PRIV (recrd.rec) += gsd_size;
}
+ /* FIXME: Should we complain if PRIV (recrd.rec_size) is not zero ? */
+
if (PRIV (gsd_sym_count) > 0)
abfd->flags |= HAS_SYMS;
/* Push value and section index. */
-static void
+static bfd_boolean
_bfd_vms_push (bfd *abfd, bfd_vma val, unsigned int reloc)
{
vms_debug2 ((4, "<push %08lx (0x%08x) at %d>\n",
- (unsigned long)val, reloc, PRIV (stackptr)));
+ (unsigned long)val, reloc, PRIV (stackptr)));
PRIV (stack[PRIV (stackptr)]).value = val;
PRIV (stack[PRIV (stackptr)]).reloc = reloc;
if (PRIV (stackptr) >= STACKSIZE)
{
bfd_set_error (bfd_error_bad_value);
- _bfd_error_handler (_("Stack overflow (%d) in _bfd_vms_push"), PRIV (stackptr));
- exit (1);
+ _bfd_error_handler (_("stack overflow (%d) in _bfd_vms_push"), PRIV (stackptr));
+ return FALSE;
}
+ return TRUE;
}
/* Pop value and section index. */
-static void
+static bfd_boolean
_bfd_vms_pop (bfd *abfd, bfd_vma *val, unsigned int *rel)
{
if (PRIV (stackptr) == 0)
{
bfd_set_error (bfd_error_bad_value);
- _bfd_error_handler (_("Stack underflow in _bfd_vms_pop"));
- exit (1);
+ _bfd_error_handler (_("stack underflow in _bfd_vms_pop"));
+ return FALSE;
}
PRIV (stackptr)--;
*val = PRIV (stack[PRIV (stackptr)]).value;
*rel = PRIV (stack[PRIV (stackptr)]).reloc;
vms_debug2 ((4, "<pop %08lx (0x%08x)>\n", (unsigned long)*val, *rel));
+ return TRUE;
}
/* Routines to fill sections contents during tir/etir read. */
vms_debug2 ((4, "image_set_ptr (0x%08x, sect=%d)\n", (unsigned)vma, sect));
+ if (PRIV (sections) == NULL)
+ return;
+ if (sect < 0 || sect >= (int) PRIV (section_count))
+ return;
+
sec = PRIV (sections)[sect];
if (info)
/* Reading contents to an output bfd. */
if (sec->output_section == NULL)
- {
- /* Section discarded. */
- vms_debug2 ((5, " section %s discarded\n", sec->name));
-
- /* This is not used. */
- PRIV (image_section) = NULL;
- PRIV (image_offset) = 0;
- return;
- }
+ {
+ /* Section discarded. */
+ vms_debug2 ((5, " section %s discarded\n", sec->name));
+
+ /* This is not used. */
+ PRIV (image_section) = NULL;
+ PRIV (image_offset) = 0;
+ return;
+ }
PRIV (image_offset) = sec->output_offset + vma;
PRIV (image_section) = sec->output_section;
}
{
#if VMS_DEBUG
_bfd_vms_debug (8, "image_write from (%p, %d) to (%ld)\n", ptr, size,
- (long)PRIV (image_offset));
- _bfd_hexdump (9, ptr, size, 0);
+ (long)PRIV (image_offset));
#endif
if (PRIV (image_section)->contents != NULL)
{
asection *sec = PRIV (image_section);
- file_ptr off = PRIV (image_offset);
+ size_t off = PRIV (image_offset);
/* Check bounds. */
- if (off > (file_ptr)sec->size
- || size > (file_ptr)sec->size
- || off + size > (file_ptr)sec->size)
- {
- bfd_set_error (bfd_error_bad_value);
- return FALSE;
- }
+ if (off > sec->size
+ || size > sec->size - off)
+ {
+ bfd_set_error (bfd_error_bad_value);
+ return FALSE;
+ }
memcpy (sec->contents + off, ptr, size);
}
+#if VMS_DEBUG
+ _bfd_hexdump (9, ptr, size, 0);
+#endif
PRIV (image_offset) += size;
return TRUE;
_bfd_vms_get_value (bfd *abfd,
const unsigned char *ascic,
const unsigned char *max_ascic,
- struct bfd_link_info *info,
- bfd_vma *vma,
- struct alpha_vms_link_hash_entry **hp)
+ struct bfd_link_info *info,
+ bfd_vma *vma,
+ struct alpha_vms_link_hash_entry **hp)
{
char name[257];
unsigned int len;
len = *ascic;
if (ascic + len >= max_ascic)
{
- _bfd_error_handler (_("Corrupt vms value"));
+ _bfd_error_handler (_("corrupt vms value"));
*vma = 0;
*hp = NULL;
return;
if (h != NULL
&& (h->root.type == bfd_link_hash_defined
- || h->root.type == bfd_link_hash_defweak))
+ || h->root.type == bfd_link_hash_defweak))
*vma = h->root.u.def.value
+ h->root.u.def.section->output_offset
+ h->root.u.def.section->output_section->vma;
if (h->sym->typ == EGSD__C_SYMG)
{
if (h->sym->flags & EGSY__V_REL)
- return RELC_SHR_BASE + PRIV2 (h->sym->owner, shr_index);
+ return RELC_SHR_BASE + PRIV2 (h->sym->owner, shr_index);
else
- {
- /* Can this happen (non-relocatable symg) ? I'd like to see
- an example. */
- abort ();
- }
+ {
+ /* Can this happen (non-relocatable symg) ? I'd like to see
+ an example. */
+ abort ();
+ }
}
if (h->sym->typ == EGSD__C_SYM)
{
if (h->sym->flags & EGSY__V_REL)
- return RELC_REL;
+ return RELC_REL;
else
- return RELC_NONE;
+ return RELC_NONE;
}
abort ();
}
static bfd_vma
alpha_vms_fix_sec_rel (bfd *abfd, struct bfd_link_info *info,
- unsigned int rel, bfd_vma vma)
+ unsigned int rel, bfd_vma vma)
{
- asection *sec = PRIV (sections)[rel & RELC_MASK];
+ asection *sec;
+
+ if (PRIV (sections) == NULL)
+ return 0;
+
+ sec = PRIV (sections)[rel & RELC_MASK];
if (info)
{
if (sec->output_section == NULL)
- abort ();
+ abort ();
return vma + sec->output_section->vma + sec->output_offset;
}
else
unsigned char *ptr;
unsigned int length;
unsigned char *maxptr;
- bfd_vma op1;
- bfd_vma op2;
- unsigned int rel1;
- unsigned int rel2;
+ bfd_vma op1 = 0;
+ bfd_vma op2 = 0;
+ unsigned int rel1 = RELC_NONE;
+ unsigned int rel2 = RELC_NONE;
struct alpha_vms_link_hash_entry *h;
PRIV (recrd.rec) += ETIR__C_HEADER_SIZE;
while (ptr < maxptr)
{
- int cmd = bfd_getl16 (ptr);
- int cmd_length = bfd_getl16 (ptr + 2);
+ int cmd, cmd_length;
- ptr += 4;
+ if (ptr + 4 > maxptr)
+ goto corrupt_etir;
+
+ cmd = bfd_getl16 (ptr);
+ cmd_length = bfd_getl16 (ptr + 2);
/* PR 21589 and 21579: Check for a corrupt ETIR record. */
- if (cmd_length < 4 || (ptr + cmd_length > maxptr + 4))
+ if (cmd_length < 4 || ptr + cmd_length > maxptr)
{
corrupt_etir:
- _bfd_error_handler (_("Corrupt ETIR record encountered"));
+ _bfd_error_handler (_("corrupt ETIR record encountered"));
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
+ ptr += 4;
#if VMS_DEBUG
_bfd_vms_debug (4, "etir: %s(%d)\n",
- _bfd_vms_etir_name (cmd), cmd);
+ _bfd_vms_etir_name (cmd), cmd);
_bfd_hexdump (8, ptr, cmd_length - 4, 0);
#endif
switch (cmd)
- {
- /* Stack global
- arg: cs symbol name
-
- stack 32 bit value of symbol (high bits set to 0). */
- case ETIR__C_STA_GBL:
- _bfd_vms_get_value (abfd, ptr, maxptr, info, &op1, &h);
- _bfd_vms_push (abfd, op1, alpha_vms_sym_to_ctxt (h));
- break;
-
- /* Stack longword
- arg: lw value
-
- stack 32 bit value, sign extend to 64 bit. */
- case ETIR__C_STA_LW:
- if (ptr + 4 >= maxptr)
+ {
+ /* Stack global
+ arg: cs symbol name
+
+ stack 32 bit value of symbol (high bits set to 0). */
+ case ETIR__C_STA_GBL:
+ _bfd_vms_get_value (abfd, ptr, maxptr, info, &op1, &h);
+ if (!_bfd_vms_push (abfd, op1, alpha_vms_sym_to_ctxt (h)))
+ return FALSE;
+ break;
+
+ /* Stack longword
+ arg: lw value
+
+ stack 32 bit value, sign extend to 64 bit. */
+ case ETIR__C_STA_LW:
+ if (ptr + 4 > maxptr)
goto corrupt_etir;
- _bfd_vms_push (abfd, bfd_getl32 (ptr), RELC_NONE);
- break;
+ if (!_bfd_vms_push (abfd, bfd_getl32 (ptr), RELC_NONE))
+ return FALSE;
+ break;
- /* Stack quadword
- arg: qw value
+ /* Stack quadword
+ arg: qw value
- stack 64 bit value of symbol. */
- case ETIR__C_STA_QW:
- if (ptr + 8 >= maxptr)
+ stack 64 bit value of symbol. */
+ case ETIR__C_STA_QW:
+ if (ptr + 8 > maxptr)
goto corrupt_etir;
- _bfd_vms_push (abfd, bfd_getl64 (ptr), RELC_NONE);
- break;
+ if (!_bfd_vms_push (abfd, bfd_getl64 (ptr), RELC_NONE))
+ return FALSE;
+ break;
- /* Stack psect base plus quadword offset
- arg: lw section index
- qw signed quadword offset (low 32 bits)
+ /* Stack psect base plus quadword offset
+ arg: lw section index
+ qw signed quadword offset (low 32 bits)
- Stack qw argument and section index
- (see ETIR__C_STO_OFF, ETIR__C_CTL_SETRB). */
- case ETIR__C_STA_PQ:
- {
- int psect;
+ Stack qw argument and section index
+ (see ETIR__C_STO_OFF, ETIR__C_CTL_SETRB). */
+ case ETIR__C_STA_PQ:
+ {
+ int psect;
- if (ptr + 12 >= maxptr)
+ if (ptr + 12 > maxptr)
goto corrupt_etir;
- psect = bfd_getl32 (ptr);
- if ((unsigned int) psect >= PRIV (section_count))
- {
+ psect = bfd_getl32 (ptr);
+ if ((unsigned int) psect >= PRIV (section_count))
+ {
_bfd_error_handler (_("bad section index in %s"),
_bfd_vms_etir_name (cmd));
- bfd_set_error (bfd_error_bad_value);
- return FALSE;
- }
- op1 = bfd_getl64 (ptr + 4);
- _bfd_vms_push (abfd, op1, psect | RELC_SEC_BASE);
- }
- break;
-
- case ETIR__C_STA_LI:
- case ETIR__C_STA_MOD:
- case ETIR__C_STA_CKARG:
+ bfd_set_error (bfd_error_bad_value);
+ return FALSE;
+ }
+ op1 = bfd_getl64 (ptr + 4);
+ if (!_bfd_vms_push (abfd, op1, psect | RELC_SEC_BASE))
+ return FALSE;
+ }
+ break;
+
+ case ETIR__C_STA_LI:
+ case ETIR__C_STA_MOD:
+ case ETIR__C_STA_CKARG:
_bfd_error_handler (_("unsupported STA cmd %s"),
_bfd_vms_etir_name (cmd));
- return FALSE;
- break;
-
- /* Store byte: pop stack, write byte
- arg: -. */
- case ETIR__C_STO_B:
- _bfd_vms_pop (abfd, &op1, &rel1);
- if (rel1 != RELC_NONE)
- goto bad_context;
- image_write_b (abfd, (unsigned int) op1 & 0xff);
- break;
-
- /* Store word: pop stack, write word
- arg: -. */
- case ETIR__C_STO_W:
- _bfd_vms_pop (abfd, &op1, &rel1);
- if (rel1 != RELC_NONE)
- goto bad_context;
- image_write_w (abfd, (unsigned int) op1 & 0xffff);
- break;
-
- /* Store longword: pop stack, write longword
- arg: -. */
- case ETIR__C_STO_LW:
- _bfd_vms_pop (abfd, &op1, &rel1);
- if (rel1 & RELC_SEC_BASE)
- {
- op1 = alpha_vms_fix_sec_rel (abfd, info, rel1, op1);
- rel1 = RELC_REL;
- }
- else if (rel1 & RELC_SHR_BASE)
- {
- alpha_vms_add_fixup_lr (info, rel1 & RELC_MASK, op1);
- rel1 = RELC_NONE;
- }
- if (rel1 != RELC_NONE)
- {
- if (rel1 != RELC_REL)
- abort ();
- alpha_vms_add_lw_reloc (info);
- }
- image_write_l (abfd, op1);
- break;
-
- /* Store quadword: pop stack, write quadword
- arg: -. */
- case ETIR__C_STO_QW:
- _bfd_vms_pop (abfd, &op1, &rel1);
- if (rel1 & RELC_SEC_BASE)
- {
- op1 = alpha_vms_fix_sec_rel (abfd, info, rel1, op1);
- rel1 = RELC_REL;
- }
- else if (rel1 & RELC_SHR_BASE)
- abort ();
- if (rel1 != RELC_NONE)
- {
- if (rel1 != RELC_REL)
- abort ();
- alpha_vms_add_qw_reloc (info);
- }
- image_write_q (abfd, op1);
- break;
-
- /* Store immediate repeated: pop stack for repeat count
- arg: lw byte count
- da data. */
- case ETIR__C_STO_IMMR:
- {
- int size;
-
- if (ptr + 4 >= maxptr)
+ return FALSE;
+ break;
+
+ /* Store byte: pop stack, write byte
+ arg: -. */
+ case ETIR__C_STO_B:
+ if (!_bfd_vms_pop (abfd, &op1, &rel1))
+ return FALSE;
+ if (rel1 != RELC_NONE)
+ goto bad_context;
+ image_write_b (abfd, (unsigned int) op1 & 0xff);
+ break;
+
+ /* Store word: pop stack, write word
+ arg: -. */
+ case ETIR__C_STO_W:
+ if (!_bfd_vms_pop (abfd, &op1, &rel1))
+ return FALSE;
+ if (rel1 != RELC_NONE)
+ goto bad_context;
+ image_write_w (abfd, (unsigned int) op1 & 0xffff);
+ break;
+
+ /* Store longword: pop stack, write longword
+ arg: -. */
+ case ETIR__C_STO_LW:
+ if (!_bfd_vms_pop (abfd, &op1, &rel1))
+ return FALSE;
+ if (rel1 & RELC_SEC_BASE)
+ {
+ op1 = alpha_vms_fix_sec_rel (abfd, info, rel1, op1);
+ rel1 = RELC_REL;
+ }
+ else if (rel1 & RELC_SHR_BASE)
+ {
+ if (!alpha_vms_add_fixup_lr (info, rel1 & RELC_MASK, op1))
+ return FALSE;
+ rel1 = RELC_NONE;
+ }
+ if (rel1 != RELC_NONE)
+ {
+ if (rel1 != RELC_REL)
+ abort ();
+ if (!alpha_vms_add_lw_reloc (info))
+ return FALSE;
+ }
+ image_write_l (abfd, op1);
+ break;
+
+ /* Store quadword: pop stack, write quadword
+ arg: -. */
+ case ETIR__C_STO_QW:
+ if (!_bfd_vms_pop (abfd, &op1, &rel1))
+ return FALSE;
+ if (rel1 & RELC_SEC_BASE)
+ {
+ op1 = alpha_vms_fix_sec_rel (abfd, info, rel1, op1);
+ rel1 = RELC_REL;
+ }
+ else if (rel1 & RELC_SHR_BASE)
+ abort ();
+ if (rel1 != RELC_NONE)
+ {
+ if (rel1 != RELC_REL)
+ abort ();
+ if (!alpha_vms_add_qw_reloc (info))
+ return FALSE;
+ }
+ image_write_q (abfd, op1);
+ break;
+
+ /* Store immediate repeated: pop stack for repeat count
+ arg: lw byte count
+ da data. */
+ case ETIR__C_STO_IMMR:
+ {
+ int size;
+
+ if (ptr + 4 > maxptr)
goto corrupt_etir;
- size = bfd_getl32 (ptr);
- _bfd_vms_pop (abfd, &op1, &rel1);
- if (rel1 != RELC_NONE)
- goto bad_context;
- while (op1-- > 0)
- image_write (abfd, ptr + 4, size);
- }
- break;
-
- /* Store global: write symbol value
- arg: cs global symbol name. */
- case ETIR__C_STO_GBL:
- _bfd_vms_get_value (abfd, ptr, maxptr, info, &op1, &h);
- if (h && h->sym)
- {
- if (h->sym->typ == EGSD__C_SYMG)
- {
- alpha_vms_add_fixup_qr
- (info, abfd, h->sym->owner, h->sym->symbol_vector);
- op1 = 0;
- }
- else
- {
- op1 = alpha_vms_get_sym_value (h->sym->section,
- h->sym->value);
- alpha_vms_add_qw_reloc (info);
- }
- }
- image_write_q (abfd, op1);
- break;
-
- /* Store code address: write address of entry point
- arg: cs global symbol name (procedure). */
- case ETIR__C_STO_CA:
- _bfd_vms_get_value (abfd, ptr, maxptr, info, &op1, &h);
- if (h && h->sym)
- {
- if (h->sym->flags & EGSY__V_NORM)
- {
- /* That's really a procedure. */
- if (h->sym->typ == EGSD__C_SYMG)
- {
- alpha_vms_add_fixup_ca (info, abfd, h->sym->owner);
- op1 = h->sym->symbol_vector;
- }
- else
- {
- op1 = alpha_vms_get_sym_value (h->sym->code_section,
- h->sym->code_value);
- alpha_vms_add_qw_reloc (info);
- }
- }
- else
- {
- /* Symbol is not a procedure. */
- abort ();
- }
- }
- image_write_q (abfd, op1);
- break;
-
- /* Store offset to psect: pop stack, add low 32 bits to base of psect
- arg: none. */
- case ETIR__C_STO_OFF:
- _bfd_vms_pop (abfd, &op1, &rel1);
-
- if (!(rel1 & RELC_SEC_BASE))
- abort ();
-
- op1 = alpha_vms_fix_sec_rel (abfd, info, rel1, op1);
- rel1 = RELC_REL;
- image_write_q (abfd, op1);
- break;
-
- /* Store immediate
- arg: lw count of bytes
- da data. */
- case ETIR__C_STO_IMM:
- {
- unsigned int size;
-
- if (ptr + 4 >= maxptr)
+ size = bfd_getl32 (ptr);
+ if (!_bfd_vms_pop (abfd, &op1, &rel1))
+ return FALSE;
+ if (rel1 != RELC_NONE)
+ goto bad_context;
+ while (op1-- > 0)
+ image_write (abfd, ptr + 4, size);
+ }
+ break;
+
+ /* Store global: write symbol value
+ arg: cs global symbol name. */
+ case ETIR__C_STO_GBL:
+ _bfd_vms_get_value (abfd, ptr, maxptr, info, &op1, &h);
+ if (h && h->sym)
+ {
+ if (h->sym->typ == EGSD__C_SYMG)
+ {
+ if (!alpha_vms_add_fixup_qr (info, abfd, h->sym->owner,
+ h->sym->symbol_vector))
+ return FALSE;
+ op1 = 0;
+ }
+ else
+ {
+ op1 = alpha_vms_get_sym_value (h->sym->section,
+ h->sym->value);
+ if (!alpha_vms_add_qw_reloc (info))
+ return FALSE;
+ }
+ }
+ image_write_q (abfd, op1);
+ break;
+
+ /* Store code address: write address of entry point
+ arg: cs global symbol name (procedure). */
+ case ETIR__C_STO_CA:
+ _bfd_vms_get_value (abfd, ptr, maxptr, info, &op1, &h);
+ if (h && h->sym)
+ {
+ if (h->sym->flags & EGSY__V_NORM)
+ {
+ /* That's really a procedure. */
+ if (h->sym->typ == EGSD__C_SYMG)
+ {
+ if (!alpha_vms_add_fixup_ca (info, abfd, h->sym->owner))
+ return FALSE;
+ op1 = h->sym->symbol_vector;
+ }
+ else
+ {
+ op1 = alpha_vms_get_sym_value (h->sym->code_section,
+ h->sym->code_value);
+ if (!alpha_vms_add_qw_reloc (info))
+ return FALSE;
+ }
+ }
+ else
+ {
+ /* Symbol is not a procedure. */
+ abort ();
+ }
+ }
+ image_write_q (abfd, op1);
+ break;
+
+ /* Store offset to psect: pop stack, add low 32 bits to base of psect
+ arg: none. */
+ case ETIR__C_STO_OFF:
+ if (!_bfd_vms_pop (abfd, &op1, &rel1))
+ return FALSE;
+
+ if (!(rel1 & RELC_SEC_BASE))
+ abort ();
+
+ op1 = alpha_vms_fix_sec_rel (abfd, info, rel1, op1);
+ rel1 = RELC_REL;
+ image_write_q (abfd, op1);
+ break;
+
+ /* Store immediate
+ arg: lw count of bytes
+ da data. */
+ case ETIR__C_STO_IMM:
+ {
+ unsigned int size;
+
+ if (ptr + 4 > maxptr)
goto corrupt_etir;
- size = bfd_getl32 (ptr);
- image_write (abfd, ptr + 4, size);
- }
- break;
-
- /* This code is 'reserved to digital' according to the openVMS
- linker manual, however it is generated by the DEC C compiler
- and defined in the include file.
- FIXME, since the following is just a guess
- store global longword: store 32bit value of symbol
- arg: cs symbol name. */
- case ETIR__C_STO_GBL_LW:
- _bfd_vms_get_value (abfd, ptr, maxptr, info, &op1, &h);
+ size = bfd_getl32 (ptr);
+ image_write (abfd, ptr + 4, size);
+ }
+ break;
+
+ /* This code is 'reserved to digital' according to the openVMS
+ linker manual, however it is generated by the DEC C compiler
+ and defined in the include file.
+ FIXME, since the following is just a guess
+ store global longword: store 32bit value of symbol
+ arg: cs symbol name. */
+ case ETIR__C_STO_GBL_LW:
+ _bfd_vms_get_value (abfd, ptr, maxptr, info, &op1, &h);
#if 0
- abort ();
+ abort ();
#endif
- image_write_l (abfd, op1);
- break;
+ image_write_l (abfd, op1);
+ break;
- case ETIR__C_STO_RB:
- case ETIR__C_STO_AB:
- case ETIR__C_STO_LP_PSB:
+ case ETIR__C_STO_RB:
+ case ETIR__C_STO_AB:
+ case ETIR__C_STO_LP_PSB:
_bfd_error_handler (_("%s: not supported"),
_bfd_vms_etir_name (cmd));
- return FALSE;
- break;
- case ETIR__C_STO_HINT_GBL:
- case ETIR__C_STO_HINT_PS:
+ return FALSE;
+ break;
+ case ETIR__C_STO_HINT_GBL:
+ case ETIR__C_STO_HINT_PS:
_bfd_error_handler (_("%s: not implemented"),
_bfd_vms_etir_name (cmd));
- return FALSE;
- break;
+ return FALSE;
+ break;
- /* 200 Store-conditional Linkage Pair
- arg: none. */
- case ETIR__C_STC_LP:
+ /* 200 Store-conditional Linkage Pair
+ arg: none. */
+ case ETIR__C_STC_LP:
- /* 202 Store-conditional Address at global address
- lw linkage index
- cs global name. */
+ /* 202 Store-conditional Address at global address
+ lw linkage index
+ cs global name. */
- case ETIR__C_STC_GBL:
+ case ETIR__C_STC_GBL:
- /* 203 Store-conditional Code Address at global address
- lw linkage index
- cs procedure name. */
- case ETIR__C_STC_GCA:
+ /* 203 Store-conditional Code Address at global address
+ lw linkage index
+ cs procedure name. */
+ case ETIR__C_STC_GCA:
- /* 204 Store-conditional Address at psect + offset
- lw linkage index
- lw psect index
- qw offset. */
- case ETIR__C_STC_PS:
+ /* 204 Store-conditional Address at psect + offset
+ lw linkage index
+ lw psect index
+ qw offset. */
+ case ETIR__C_STC_PS:
_bfd_error_handler (_("%s: not supported"),
_bfd_vms_etir_name (cmd));
- return FALSE;
- break;
-
- /* 201 Store-conditional Linkage Pair with Procedure Signature
- lw linkage index
- cs procedure name
- by signature length
- da signature. */
-
- case ETIR__C_STC_LP_PSB:
- _bfd_vms_get_value (abfd, ptr + 4, maxptr, info, &op1, &h);
- if (h && h->sym)
- {
- if (h->sym->typ == EGSD__C_SYMG)
- {
- alpha_vms_add_fixup_lp (info, abfd, h->sym->owner);
- op1 = h->sym->symbol_vector;
- op2 = 0;
- }
- else
- {
- op1 = alpha_vms_get_sym_value (h->sym->code_section,
- h->sym->code_value);
- op2 = alpha_vms_get_sym_value (h->sym->section,
- h->sym->value);
- }
- }
- else
- {
- /* Undefined symbol. */
- op1 = 0;
- op2 = 0;
- }
- image_write_q (abfd, op1);
- image_write_q (abfd, op2);
- break;
-
- /* 205 Store-conditional NOP at address of global
- arg: none. */
- case ETIR__C_STC_NOP_GBL:
- /* ALPHA_R_NOP */
-
- /* 207 Store-conditional BSR at global address
- arg: none. */
-
- case ETIR__C_STC_BSR_GBL:
- /* ALPHA_R_BSR */
-
- /* 209 Store-conditional LDA at global address
- arg: none. */
-
- case ETIR__C_STC_LDA_GBL:
- /* ALPHA_R_LDA */
-
- /* 211 Store-conditional BSR or Hint at global address
- arg: none. */
-
- case ETIR__C_STC_BOH_GBL:
- /* Currentl ignored. */
- break;
-
- /* 213 Store-conditional NOP,BSR or HINT at global address
- arg: none. */
-
- case ETIR__C_STC_NBH_GBL:
-
- /* 206 Store-conditional NOP at pect + offset
- arg: none. */
-
- case ETIR__C_STC_NOP_PS:
-
- /* 208 Store-conditional BSR at pect + offset
- arg: none. */
-
- case ETIR__C_STC_BSR_PS:
-
- /* 210 Store-conditional LDA at psect + offset
- arg: none. */
-
- case ETIR__C_STC_LDA_PS:
-
- /* 212 Store-conditional BSR or Hint at pect + offset
- arg: none. */
-
- case ETIR__C_STC_BOH_PS:
-
- /* 214 Store-conditional NOP, BSR or HINT at psect + offset
- arg: none. */
- case ETIR__C_STC_NBH_PS:
- _bfd_error_handler (_("%s: not supported"),
- _bfd_vms_etir_name (cmd));
- return FALSE;
- break;
-
- /* Det relocation base: pop stack, set image location counter
- arg: none. */
- case ETIR__C_CTL_SETRB:
- _bfd_vms_pop (abfd, &op1, &rel1);
- if (!(rel1 & RELC_SEC_BASE))
- abort ();
- image_set_ptr (abfd, op1, rel1 & RELC_MASK, info);
- break;
-
- /* Augment relocation base: increment image location counter by offset
- arg: lw offset value. */
- case ETIR__C_CTL_AUGRB:
- if (ptr + 4 >= maxptr)
- goto corrupt_etir;
- op1 = bfd_getl32 (ptr);
- image_inc_ptr (abfd, op1);
- break;
-
- /* Define location: pop index, save location counter under index
- arg: none. */
- case ETIR__C_CTL_DFLOC:
- _bfd_vms_pop (abfd, &op1, &rel1);
- if (rel1 != RELC_NONE)
- goto bad_context;
- dst_define_location (abfd, op1);
- break;
-
- /* Set location: pop index, restore location counter from index
- arg: none. */
- case ETIR__C_CTL_STLOC:
- _bfd_vms_pop (abfd, &op1, &rel1);
- if (rel1 != RELC_NONE)
- goto bad_context;
- dst_restore_location (abfd, op1);
- break;
-
- /* Stack defined location: pop index, push location counter from index
- arg: none. */
- case ETIR__C_CTL_STKDL:
- _bfd_vms_pop (abfd, &op1, &rel1);
- if (rel1 != RELC_NONE)
- goto bad_context;
- _bfd_vms_push (abfd, dst_retrieve_location (abfd, op1), RELC_NONE);
- break;
-
- case ETIR__C_OPR_NOP: /* No-op. */
- break;
-
- case ETIR__C_OPR_ADD: /* Add. */
- _bfd_vms_pop (abfd, &op1, &rel1);
- _bfd_vms_pop (abfd, &op2, &rel2);
- if (rel1 == RELC_NONE && rel2 != RELC_NONE)
- rel1 = rel2;
- else if (rel1 != RELC_NONE && rel2 != RELC_NONE)
- goto bad_context;
- _bfd_vms_push (abfd, op1 + op2, rel1);
- break;
-
- case ETIR__C_OPR_SUB: /* Subtract. */
- _bfd_vms_pop (abfd, &op1, &rel1);
- _bfd_vms_pop (abfd, &op2, &rel2);
- if (rel1 == RELC_NONE && rel2 != RELC_NONE)
- rel1 = rel2;
- else if ((rel1 & RELC_SEC_BASE) && (rel2 & RELC_SEC_BASE))
- {
- op1 = alpha_vms_fix_sec_rel (abfd, info, rel1, op1);
- op2 = alpha_vms_fix_sec_rel (abfd, info, rel2, op2);
- rel1 = RELC_NONE;
- }
- else if (rel1 != RELC_NONE && rel2 != RELC_NONE)
- goto bad_context;
- _bfd_vms_push (abfd, op2 - op1, rel1);
- break;
-
- case ETIR__C_OPR_MUL: /* Multiply. */
- _bfd_vms_pop (abfd, &op1, &rel1);
- _bfd_vms_pop (abfd, &op2, &rel2);
- if (rel1 != RELC_NONE || rel2 != RELC_NONE)
- goto bad_context;
- _bfd_vms_push (abfd, op1 * op2, RELC_NONE);
- break;
-
- case ETIR__C_OPR_DIV: /* Divide. */
- _bfd_vms_pop (abfd, &op1, &rel1);
- _bfd_vms_pop (abfd, &op2, &rel2);
- if (rel1 != RELC_NONE || rel2 != RELC_NONE)
- goto bad_context;
- if (op2 == 0)
- _bfd_vms_push (abfd, 0, RELC_NONE);
- else
- _bfd_vms_push (abfd, op2 / op1, RELC_NONE);
- break;
-
- case ETIR__C_OPR_AND: /* Logical AND. */
- _bfd_vms_pop (abfd, &op1, &rel1);
- _bfd_vms_pop (abfd, &op2, &rel2);
- if (rel1 != RELC_NONE || rel2 != RELC_NONE)
- goto bad_context;
- _bfd_vms_push (abfd, op1 & op2, RELC_NONE);
- break;
-
- case ETIR__C_OPR_IOR: /* Logical inclusive OR. */
- _bfd_vms_pop (abfd, &op1, &rel1);
- _bfd_vms_pop (abfd, &op2, &rel2);
- if (rel1 != RELC_NONE || rel2 != RELC_NONE)
- goto bad_context;
- _bfd_vms_push (abfd, op1 | op2, RELC_NONE);
- break;
-
- case ETIR__C_OPR_EOR: /* Logical exclusive OR. */
- _bfd_vms_pop (abfd, &op1, &rel1);
- _bfd_vms_pop (abfd, &op2, &rel2);
- if (rel1 != RELC_NONE || rel2 != RELC_NONE)
- goto bad_context;
- _bfd_vms_push (abfd, op1 ^ op2, RELC_NONE);
- break;
-
- case ETIR__C_OPR_NEG: /* Negate. */
- _bfd_vms_pop (abfd, &op1, &rel1);
- if (rel1 != RELC_NONE)
- goto bad_context;
- _bfd_vms_push (abfd, -op1, RELC_NONE);
- break;
-
- case ETIR__C_OPR_COM: /* Complement. */
- _bfd_vms_pop (abfd, &op1, &rel1);
- if (rel1 != RELC_NONE)
- goto bad_context;
- _bfd_vms_push (abfd, ~op1, RELC_NONE);
- break;
-
- case ETIR__C_OPR_ASH: /* Arithmetic shift. */
- _bfd_vms_pop (abfd, &op1, &rel1);
- _bfd_vms_pop (abfd, &op2, &rel2);
- if (rel1 != RELC_NONE || rel2 != RELC_NONE)
- {
- bad_context:
- _bfd_error_handler (_("invalid use of %s with contexts"),
- _bfd_vms_etir_name (cmd));
- return FALSE;
- }
- if ((int)op2 < 0) /* Shift right. */
- op1 >>= -(int)op2;
- else /* Shift left. */
- op1 <<= (int)op2;
- _bfd_vms_push (abfd, op1, RELC_NONE); /* FIXME: sym. */
- break;
-
- case ETIR__C_OPR_INSV: /* Insert field. */
- case ETIR__C_OPR_USH: /* Unsigned shift. */
- case ETIR__C_OPR_ROT: /* Rotate. */
- case ETIR__C_OPR_REDEF: /* Redefine symbol to current location. */
- case ETIR__C_OPR_DFLIT: /* Define a literal. */
- _bfd_error_handler (_("%s: not supported"),
- _bfd_vms_etir_name (cmd));
- return FALSE;
- break;
-
- case ETIR__C_OPR_SEL: /* Select. */
- _bfd_vms_pop (abfd, &op1, &rel1);
- if (op1 & 0x01L)
- _bfd_vms_pop (abfd, &op1, &rel1);
- else
- {
- _bfd_vms_pop (abfd, &op1, &rel1);
- _bfd_vms_pop (abfd, &op2, &rel2);
- _bfd_vms_push (abfd, op1, rel1);
- }
- break;
-
- default:
- _bfd_error_handler (_("reserved cmd %d"), cmd);
- return FALSE;
- break;
- }
+ return FALSE;
+ break;
- ptr += cmd_length - 4;
- }
+ /* 201 Store-conditional Linkage Pair with Procedure Signature
+ lw linkage index
+ cs procedure name
+ by signature length
+ da signature. */
- return TRUE;
-}
+ case ETIR__C_STC_LP_PSB:
+ _bfd_vms_get_value (abfd, ptr + 4, maxptr, info, &op1, &h);
+ if (h && h->sym)
+ {
+ if (h->sym->typ == EGSD__C_SYMG)
+ {
+ if (!alpha_vms_add_fixup_lp (info, abfd, h->sym->owner))
+ return FALSE;
+ op1 = h->sym->symbol_vector;
+ op2 = 0;
+ }
+ else
+ {
+ op1 = alpha_vms_get_sym_value (h->sym->code_section,
+ h->sym->code_value);
+ op2 = alpha_vms_get_sym_value (h->sym->section,
+ h->sym->value);
+ }
+ }
+ else
+ {
+ /* Undefined symbol. */
+ op1 = 0;
+ op2 = 0;
+ }
+ image_write_q (abfd, op1);
+ image_write_q (abfd, op2);
+ break;
-/* Process EDBG/ETBT record.
- Return TRUE on success, FALSE on error */
+ /* 205 Store-conditional NOP at address of global
+ arg: none. */
+ case ETIR__C_STC_NOP_GBL:
+ /* ALPHA_R_NOP */
-static bfd_boolean
-vms_slurp_debug (bfd *abfd)
-{
- asection *section = PRIV (dst_section);
+ /* 207 Store-conditional BSR at global address
+ arg: none. */
- if (section == NULL)
- {
- /* We have no way to find out beforehand how much debug info there
- is in an object file, so pick an initial amount and grow it as
- needed later. */
- flagword flags = SEC_HAS_CONTENTS | SEC_DEBUGGING | SEC_RELOC
- | SEC_IN_MEMORY;
+ case ETIR__C_STC_BSR_GBL:
+ /* ALPHA_R_BSR */
- section = bfd_make_section (abfd, "$DST$");
- if (!section)
- return FALSE;
- if (!bfd_set_section_flags (abfd, section, flags))
- return FALSE;
- PRIV (dst_section) = section;
- }
+ /* 209 Store-conditional LDA at global address
+ arg: none. */
- PRIV (image_section) = section;
- PRIV (image_offset) = section->size;
+ case ETIR__C_STC_LDA_GBL:
+ /* ALPHA_R_LDA */
- if (!_bfd_vms_slurp_etir (abfd, NULL))
- return FALSE;
+ /* 211 Store-conditional BSR or Hint at global address
+ arg: none. */
- section->size = PRIV (image_offset);
- return TRUE;
-}
+ case ETIR__C_STC_BOH_GBL:
+ /* Currentl ignored. */
+ break;
-/* Process EDBG record.
- Return TRUE on success, FALSE on error. */
+ /* 213 Store-conditional NOP,BSR or HINT at global address
+ arg: none. */
-static bfd_boolean
-_bfd_vms_slurp_edbg (bfd *abfd)
-{
- vms_debug2 ((2, "EDBG\n"));
+ case ETIR__C_STC_NBH_GBL:
- abfd->flags |= HAS_DEBUG | HAS_LINENO;
+ /* 206 Store-conditional NOP at pect + offset
+ arg: none. */
- return vms_slurp_debug (abfd);
-}
+ case ETIR__C_STC_NOP_PS:
-/* Process ETBT record.
- Return TRUE on success, FALSE on error. */
+ /* 208 Store-conditional BSR at pect + offset
+ arg: none. */
-static bfd_boolean
-_bfd_vms_slurp_etbt (bfd *abfd)
-{
- vms_debug2 ((2, "ETBT\n"));
+ case ETIR__C_STC_BSR_PS:
- abfd->flags |= HAS_LINENO;
+ /* 210 Store-conditional LDA at psect + offset
+ arg: none. */
- return vms_slurp_debug (abfd);
-}
+ case ETIR__C_STC_LDA_PS:
-/* Process EEOM record.
- Return TRUE on success, FALSE on error. */
+ /* 212 Store-conditional BSR or Hint at pect + offset
+ arg: none. */
-static bfd_boolean
+ case ETIR__C_STC_BOH_PS:
+
+ /* 214 Store-conditional NOP, BSR or HINT at psect + offset
+ arg: none. */
+ case ETIR__C_STC_NBH_PS:
+ _bfd_error_handler (_("%s: not supported"),
+ _bfd_vms_etir_name (cmd));
+ return FALSE;
+ break;
+
+ /* Det relocation base: pop stack, set image location counter
+ arg: none. */
+ case ETIR__C_CTL_SETRB:
+ if (!_bfd_vms_pop (abfd, &op1, &rel1))
+ return FALSE;
+ if (!(rel1 & RELC_SEC_BASE))
+ abort ();
+ image_set_ptr (abfd, op1, rel1 & RELC_MASK, info);
+ break;
+
+ /* Augment relocation base: increment image location counter by offset
+ arg: lw offset value. */
+ case ETIR__C_CTL_AUGRB:
+ if (ptr + 4 > maxptr)
+ goto corrupt_etir;
+ op1 = bfd_getl32 (ptr);
+ image_inc_ptr (abfd, op1);
+ break;
+
+ /* Define location: pop index, save location counter under index
+ arg: none. */
+ case ETIR__C_CTL_DFLOC:
+ if (!_bfd_vms_pop (abfd, &op1, &rel1))
+ return FALSE;
+ if (rel1 != RELC_NONE)
+ goto bad_context;
+ dst_define_location (abfd, op1);
+ break;
+
+ /* Set location: pop index, restore location counter from index
+ arg: none. */
+ case ETIR__C_CTL_STLOC:
+ if (!_bfd_vms_pop (abfd, &op1, &rel1))
+ return FALSE;
+ if (rel1 != RELC_NONE)
+ goto bad_context;
+ dst_restore_location (abfd, op1);
+ break;
+
+ /* Stack defined location: pop index, push location counter from index
+ arg: none. */
+ case ETIR__C_CTL_STKDL:
+ if (!_bfd_vms_pop (abfd, &op1, &rel1))
+ return FALSE;
+ if (rel1 != RELC_NONE)
+ goto bad_context;
+ if (!_bfd_vms_push (abfd, dst_retrieve_location (abfd, op1),
+ RELC_NONE))
+ return FALSE;
+ break;
+
+ case ETIR__C_OPR_NOP: /* No-op. */
+ break;
+
+ case ETIR__C_OPR_ADD: /* Add. */
+ if (!_bfd_vms_pop (abfd, &op1, &rel1)
+ || !_bfd_vms_pop (abfd, &op2, &rel2))
+ return FALSE;
+ if (rel1 == RELC_NONE && rel2 != RELC_NONE)
+ rel1 = rel2;
+ else if (rel1 != RELC_NONE && rel2 != RELC_NONE)
+ goto bad_context;
+ if (!_bfd_vms_push (abfd, op1 + op2, rel1))
+ return FALSE;
+ break;
+
+ case ETIR__C_OPR_SUB: /* Subtract. */
+ if (!_bfd_vms_pop (abfd, &op1, &rel1)
+ || !_bfd_vms_pop (abfd, &op2, &rel2))
+ return FALSE;
+ if (rel1 == RELC_NONE && rel2 != RELC_NONE)
+ rel1 = rel2;
+ else if ((rel1 & RELC_SEC_BASE) && (rel2 & RELC_SEC_BASE))
+ {
+ op1 = alpha_vms_fix_sec_rel (abfd, info, rel1, op1);
+ op2 = alpha_vms_fix_sec_rel (abfd, info, rel2, op2);
+ rel1 = RELC_NONE;
+ }
+ else if (rel1 != RELC_NONE && rel2 != RELC_NONE)
+ goto bad_context;
+ if (!_bfd_vms_push (abfd, op2 - op1, rel1))
+ return FALSE;
+ break;
+
+ case ETIR__C_OPR_MUL: /* Multiply. */
+ if (!_bfd_vms_pop (abfd, &op1, &rel1)
+ || !_bfd_vms_pop (abfd, &op2, &rel2))
+ return FALSE;
+ if (rel1 != RELC_NONE || rel2 != RELC_NONE)
+ goto bad_context;
+ if (!_bfd_vms_push (abfd, op1 * op2, RELC_NONE))
+ return FALSE;
+ break;
+
+ case ETIR__C_OPR_DIV: /* Divide. */
+ if (!_bfd_vms_pop (abfd, &op1, &rel1)
+ || !_bfd_vms_pop (abfd, &op2, &rel2))
+ return FALSE;
+ if (rel1 != RELC_NONE || rel2 != RELC_NONE)
+ goto bad_context;
+ if (op2 == 0)
+ {
+ if (!_bfd_vms_push (abfd, 0, RELC_NONE))
+ return FALSE;
+ }
+ else
+ {
+ if (!_bfd_vms_push (abfd, op2 / op1, RELC_NONE))
+ return FALSE;
+ }
+ break;
+
+ case ETIR__C_OPR_AND: /* Logical AND. */
+ if (!_bfd_vms_pop (abfd, &op1, &rel1)
+ || !_bfd_vms_pop (abfd, &op2, &rel2))
+ return FALSE;
+ if (rel1 != RELC_NONE || rel2 != RELC_NONE)
+ goto bad_context;
+ if (!_bfd_vms_push (abfd, op1 & op2, RELC_NONE))
+ return FALSE;
+ break;
+
+ case ETIR__C_OPR_IOR: /* Logical inclusive OR. */
+ if (!_bfd_vms_pop (abfd, &op1, &rel1)
+ || !_bfd_vms_pop (abfd, &op2, &rel2))
+ return FALSE;
+ if (rel1 != RELC_NONE || rel2 != RELC_NONE)
+ goto bad_context;
+ if (!_bfd_vms_push (abfd, op1 | op2, RELC_NONE))
+ return FALSE;
+ break;
+
+ case ETIR__C_OPR_EOR: /* Logical exclusive OR. */
+ if (!_bfd_vms_pop (abfd, &op1, &rel1)
+ || !_bfd_vms_pop (abfd, &op2, &rel2))
+ return FALSE;
+ if (rel1 != RELC_NONE || rel2 != RELC_NONE)
+ goto bad_context;
+ if (!_bfd_vms_push (abfd, op1 ^ op2, RELC_NONE))
+ return FALSE;
+ break;
+
+ case ETIR__C_OPR_NEG: /* Negate. */
+ if (!_bfd_vms_pop (abfd, &op1, &rel1))
+ return FALSE;
+ if (rel1 != RELC_NONE)
+ goto bad_context;
+ if (!_bfd_vms_push (abfd, -op1, RELC_NONE))
+ return FALSE;
+ break;
+
+ case ETIR__C_OPR_COM: /* Complement. */
+ if (!_bfd_vms_pop (abfd, &op1, &rel1))
+ return FALSE;
+ if (rel1 != RELC_NONE)
+ goto bad_context;
+ if (!_bfd_vms_push (abfd, ~op1, RELC_NONE))
+ return FALSE;
+ break;
+
+ case ETIR__C_OPR_ASH: /* Arithmetic shift. */
+ if (!_bfd_vms_pop (abfd, &op1, &rel1)
+ || !_bfd_vms_pop (abfd, &op2, &rel2))
+ return FALSE;
+ if (rel1 != RELC_NONE || rel2 != RELC_NONE)
+ {
+ bad_context:
+ _bfd_error_handler (_("invalid use of %s with contexts"),
+ _bfd_vms_etir_name (cmd));
+ return FALSE;
+ }
+ if ((int)op2 < 0) /* Shift right. */
+ op1 >>= -(int)op2;
+ else /* Shift left. */
+ op1 <<= (int)op2;
+ if (!_bfd_vms_push (abfd, op1, RELC_NONE)) /* FIXME: sym. */
+ return FALSE;
+ break;
+
+ case ETIR__C_OPR_INSV: /* Insert field. */
+ case ETIR__C_OPR_USH: /* Unsigned shift. */
+ case ETIR__C_OPR_ROT: /* Rotate. */
+ case ETIR__C_OPR_REDEF: /* Redefine symbol to current location. */
+ case ETIR__C_OPR_DFLIT: /* Define a literal. */
+ _bfd_error_handler (_("%s: not supported"),
+ _bfd_vms_etir_name (cmd));
+ return FALSE;
+ break;
+
+ case ETIR__C_OPR_SEL: /* Select. */
+ if (!_bfd_vms_pop (abfd, &op1, &rel1))
+ return FALSE;
+ if (op1 & 0x01L)
+ {
+ if (!_bfd_vms_pop (abfd, &op1, &rel1))
+ return FALSE;
+ }
+ else
+ {
+ if (!_bfd_vms_pop (abfd, &op1, &rel1)
+ || !_bfd_vms_pop (abfd, &op2, &rel2))
+ return FALSE;
+ if (!_bfd_vms_push (abfd, op1, rel1))
+ return FALSE;
+ }
+ break;
+
+ default:
+ _bfd_error_handler (_("reserved cmd %d"), cmd);
+ return FALSE;
+ break;
+ }
+
+ ptr += cmd_length - 4;
+ }
+
+ return TRUE;
+}
+
+/* Process EDBG/ETBT record.
+ Return TRUE on success, FALSE on error */
+
+static bfd_boolean
+vms_slurp_debug (bfd *abfd)
+{
+ asection *section = PRIV (dst_section);
+
+ if (section == NULL)
+ {
+ /* We have no way to find out beforehand how much debug info there
+ is in an object file, so pick an initial amount and grow it as
+ needed later. */
+ flagword flags = SEC_HAS_CONTENTS | SEC_DEBUGGING | SEC_RELOC
+ | SEC_IN_MEMORY;
+
+ section = bfd_make_section (abfd, "$DST$");
+ if (!section)
+ return FALSE;
+ if (!bfd_set_section_flags (section, flags))
+ return FALSE;
+ PRIV (dst_section) = section;
+ }
+
+ PRIV (image_section) = section;
+ PRIV (image_offset) = section->size;
+
+ if (!_bfd_vms_slurp_etir (abfd, NULL))
+ return FALSE;
+
+ section->size = PRIV (image_offset);
+ return TRUE;
+}
+
+/* Process EDBG record.
+ Return TRUE on success, FALSE on error. */
+
+static bfd_boolean
+_bfd_vms_slurp_edbg (bfd *abfd)
+{
+ vms_debug2 ((2, "EDBG\n"));
+
+ abfd->flags |= HAS_DEBUG | HAS_LINENO;
+
+ return vms_slurp_debug (abfd);
+}
+
+/* Process ETBT record.
+ Return TRUE on success, FALSE on error. */
+
+static bfd_boolean
+_bfd_vms_slurp_etbt (bfd *abfd)
+{
+ vms_debug2 ((2, "ETBT\n"));
+
+ abfd->flags |= HAS_LINENO;
+
+ return vms_slurp_debug (abfd);
+}
+
+/* Process EEOM record.
+ Return TRUE on success, FALSE on error. */
+
+static bfd_boolean
_bfd_vms_slurp_eeom (bfd *abfd)
{
struct vms_eeom *eeom = (struct vms_eeom *) PRIV (recrd.rec);
vms_debug2 ((2, "EEOM\n"));
+ /* PR 21813: Check for an undersized record. */
+ if (PRIV (recrd.buf_size) < sizeof (* eeom))
+ {
+ _bfd_error_handler (_("corrupt EEOM record - size is too small"));
+ bfd_set_error (bfd_error_bad_value);
+ return FALSE;
+ }
+
PRIV (eom_data).eom_l_total_lps = bfd_getl32 (eeom->total_lps);
PRIV (eom_data).eom_w_comcod = bfd_getl16 (eeom->comcod);
if (PRIV (eom_data).eom_w_comcod > 1)
{
- _bfd_error_handler (_("Object module NOT error-free !\n"));
+ _bfd_error_handler (_("object module not error-free !"));
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
switch (type)
{
- case EOBJ__C_EMH:
- err = _bfd_vms_slurp_ehdr (abfd);
- break;
- case EOBJ__C_EEOM:
- err = _bfd_vms_slurp_eeom (abfd);
- break;
- case EOBJ__C_EGSD:
- err = _bfd_vms_slurp_egsd (abfd);
- break;
- case EOBJ__C_ETIR:
- err = TRUE; /* _bfd_vms_slurp_etir (abfd); */
- break;
- case EOBJ__C_EDBG:
- err = _bfd_vms_slurp_edbg (abfd);
- break;
- case EOBJ__C_ETBT:
- err = _bfd_vms_slurp_etbt (abfd);
- break;
- default:
- err = FALSE;
+ case EOBJ__C_EMH:
+ err = _bfd_vms_slurp_ehdr (abfd);
+ break;
+ case EOBJ__C_EEOM:
+ err = _bfd_vms_slurp_eeom (abfd);
+ break;
+ case EOBJ__C_EGSD:
+ err = _bfd_vms_slurp_egsd (abfd);
+ break;
+ case EOBJ__C_ETIR:
+ err = TRUE; /* _bfd_vms_slurp_etir (abfd); */
+ break;
+ case EOBJ__C_EDBG:
+ err = _bfd_vms_slurp_edbg (abfd);
+ break;
+ case EOBJ__C_ETBT:
+ err = _bfd_vms_slurp_etbt (abfd);
+ break;
+ default:
+ err = FALSE;
}
if (!err)
{
static bfd_boolean
vms_initialize (bfd * abfd)
{
- bfd_size_type amt;
+ size_t amt;
amt = sizeof (struct vms_private_data_struct);
abfd->tdata.any = bfd_zalloc (abfd, amt);
return FALSE;
}
+/* Free malloc'd memory. */
+
+static void
+alpha_vms_free_private (bfd *abfd)
+{
+ struct module *module;
+
+ free (PRIV (recrd.buf));
+ free (PRIV (sections));
+ free (PRIV (syms));
+ free (PRIV (dst_ptr_offsets));
+
+ for (module = PRIV (modules); module; module = module->next)
+ free (module->file_table);
+}
+
/* Check the format for a file being read.
Return a (bfd_target *) if it's an object file or zero if not. */
/* Allocate alpha-vms specific data. */
if (!vms_initialize (abfd))
- goto error_ret;
+ {
+ abfd->tdata.any = tdata_save;
+ return NULL;
+ }
if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET))
- goto err_wrong_format;
+ goto error_ret;
/* The first challenge with VMS is to discover the kind of the file.
2 bytes size repeated) and 12 bytes for images (4 bytes major id,
4 bytes minor id, 4 bytes length). */
test_len = 12;
-
- /* Size the main buffer. */
- buf = (unsigned char *) bfd_malloc (test_len);
+ buf = _bfd_malloc_and_read (abfd, test_len, test_len);
if (buf == NULL)
goto error_ret;
PRIV (recrd.buf) = buf;
PRIV (recrd.buf_size) = test_len;
-
- /* Initialize the record pointer. */
PRIV (recrd.rec) = buf;
- if (bfd_bread (buf, test_len, abfd) != test_len)
- goto err_wrong_format;
-
/* Is it an image? */
if ((bfd_getl32 (buf) == EIHD__K_MAJORID)
&& (bfd_getl32 (buf + 4) == EIHD__K_MINORID))
{
- unsigned int to_read;
- unsigned int read_so_far;
- unsigned int remaining;
unsigned int eisd_offset, eihs_offset;
/* Extract the header size. */
/* The header size is 0 for DSF files. */
if (PRIV (recrd.rec_size) == 0)
- PRIV (recrd.rec_size) = sizeof (struct vms_eihd);
-
- if (PRIV (recrd.rec_size) > PRIV (recrd.buf_size))
- {
- buf = bfd_realloc_or_free (buf, PRIV (recrd.rec_size));
-
- if (buf == NULL)
- {
- PRIV (recrd.buf) = NULL;
- goto error_ret;
- }
- PRIV (recrd.buf) = buf;
- PRIV (recrd.buf_size) = PRIV (recrd.rec_size);
- }
-
- /* Read the remaining record. */
- remaining = PRIV (recrd.rec_size) - test_len;
- to_read = MIN (VMS_BLOCK_SIZE - test_len, remaining);
- read_so_far = test_len;
-
- while (remaining > 0)
- {
- if (bfd_bread (buf + read_so_far, to_read, abfd) != to_read)
- goto err_wrong_format;
+ PRIV (recrd.rec_size) = sizeof (struct vms_eihd);
+
+ /* PR 21813: Check for a truncated record. */
+ /* PR 17512: file: 7d7c57c2. */
+ if (PRIV (recrd.rec_size) < sizeof (struct vms_eihd))
+ goto err_wrong_format;
- read_so_far += to_read;
- remaining -= to_read;
+ if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET))
+ goto error_ret;
- to_read = MIN (VMS_BLOCK_SIZE, remaining);
- }
+ free (PRIV (recrd.buf));
+ PRIV (recrd.buf) = NULL;
+ buf = _bfd_malloc_and_read (abfd, PRIV (recrd.rec_size),
+ PRIV (recrd.rec_size));
+ if (buf == NULL)
+ goto error_ret;
- /* Reset the record pointer. */
+ PRIV (recrd.buf) = buf;
+ PRIV (recrd.buf_size) = PRIV (recrd.rec_size);
PRIV (recrd.rec) = buf;
- /* PR 17512: file: 7d7c57c2. */
- if (PRIV (recrd.rec_size) < sizeof (struct vms_eihd))
- goto error_ret;
vms_debug2 ((2, "file type is image\n"));
if (!_bfd_vms_slurp_eihd (abfd, &eisd_offset, &eihs_offset))
- goto err_wrong_format;
+ goto err_wrong_format;
if (!_bfd_vms_slurp_eisd (abfd, eisd_offset))
- goto err_wrong_format;
+ goto err_wrong_format;
/* EIHS is optional. */
if (eihs_offset != 0 && !_bfd_vms_slurp_eihs (abfd, eihs_offset))
- goto err_wrong_format;
+ goto err_wrong_format;
}
else
{
/* But is it really a module? */
if (bfd_getl16 (PRIV (recrd.rec)) <= EOBJ__C_MAXRECTYP
- && bfd_getl16 (PRIV (recrd.rec) + 2) <= EOBJ__C_MAXRECSIZ)
- {
- if (vms_get_remaining_object_record (abfd, test_len) <= 0)
- goto err_wrong_format;
+ && bfd_getl16 (PRIV (recrd.rec) + 2) <= EOBJ__C_MAXRECSIZ)
+ {
+ if (vms_get_remaining_object_record (abfd, test_len) <= 0)
+ goto err_wrong_format;
- vms_debug2 ((2, "file type is module\n"));
+ vms_debug2 ((2, "file type is module\n"));
- type = bfd_getl16 (PRIV (recrd.rec));
- if (type != EOBJ__C_EMH || !_bfd_vms_slurp_ehdr (abfd))
- goto err_wrong_format;
+ type = bfd_getl16 (PRIV (recrd.rec));
+ if (type != EOBJ__C_EMH || !_bfd_vms_slurp_ehdr (abfd))
+ goto err_wrong_format;
- if (!_bfd_vms_slurp_object_records (abfd))
- goto err_wrong_format;
- }
+ if (!_bfd_vms_slurp_object_records (abfd))
+ goto err_wrong_format;
+ }
else
- goto err_wrong_format;
+ goto err_wrong_format;
}
/* Set arch_info to alpha. */
bfd_set_error (bfd_error_wrong_format);
error_ret:
- if (PRIV (recrd.buf))
- free (PRIV (recrd.buf));
+ alpha_vms_free_private (abfd);
if (abfd->tdata.any != tdata_save && abfd->tdata.any != NULL)
bfd_release (abfd, abfd->tdata.any);
abfd->tdata.any = tdata_save;
_bfd_vms_output_begin (recwr, EOBJ__C_EMH);
_bfd_vms_output_short (recwr, EMH__C_LNM);
snprintf (version, sizeof (version), "%s %d.%d.%d", name,
- ver / 10000, (ver / 100) % 100, ver % 100);
+ ver / 10000, (ver / 100) % 100, ver % 100);
_bfd_vms_output_dump (recwr, (unsigned char *)version, strlen (version));
_bfd_vms_output_end (abfd, recwr);
}
return TRUE;
}
-static void
+static void *
vector_grow1 (struct vector_type *vec, size_t elsz)
{
- if (vec->nbr_el + 1 < vec->max_el)
- return;
-
- if (vec->max_el == 0)
- {
- vec->max_el = 16;
- vec->els = bfd_malloc2 (vec->max_el, elsz);
- }
- else
+ if (vec->nbr_el >= vec->max_el)
{
- vec->max_el *= 2;
- vec->els = bfd_realloc2 (vec->els, vec->max_el, elsz);
+ if (vec->max_el == 0)
+ {
+ vec->max_el = 16;
+ vec->els = bfd_malloc (vec->max_el * elsz);
+ }
+ else
+ {
+ size_t amt;
+ if (vec->max_el > -1u / 2)
+ {
+ bfd_set_error (bfd_error_file_too_big);
+ return NULL;
+ }
+ vec->max_el *= 2;
+ if (_bfd_mul_overflow (vec->max_el, elsz, &amt))
+ {
+ bfd_set_error (bfd_error_file_too_big);
+ return NULL;
+ }
+ vec->els = bfd_realloc (vec->els, amt);
+ }
}
+ if (vec->els == NULL)
+ return NULL;
+ return (char *) vec->els + elsz * vec->nbr_el++;
}
/* Bump ABFD file position to next block. */
static void
alpha_vms_swap_eisd_out (struct vms_internal_eisd_map *src,
- struct vms_eisd *dst)
+ struct vms_eisd *dst)
{
bfd_putl32 (src->u.eisd.majorid, dst->majorid);
bfd_putl32 (src->u.eisd.minorid, dst->minorid);
{
bfd_putl32 (src->u.gbl_eisd.ident, dst->ident);
memcpy (dst->gblnam, src->u.gbl_eisd.gblnam,
- src->u.gbl_eisd.gblnam[0] + 1);
+ src->u.gbl_eisd.gblnam[0] + 1);
}
}
eisd->u.gbl_eisd.ident = PRIV2 (shrimg, ident);
eisd->u.gbl_eisd.gblnam[0] = namlen + 4;
memcpy (eisd->u.gbl_eisd.gblnam + 1, PRIV2 (shrimg, hdr_data.hdr_t_name),
- namlen);
+ namlen);
memcpy (eisd->u.gbl_eisd.gblnam + 1 + namlen, "_001", 4);
/* Append it to the list. */
if (sec->flags & SEC_LINKER_CREATED)
{
if (strcmp (sec->name, "$FIXUP$") == 0)
- eisd->u.eisd.flags |= EISD__M_FIXUPVEC;
+ eisd->u.eisd.flags |= EISD__M_FIXUPVEC;
}
/* Append it to the list. */
bfd_putl32 (-1, eihd.privreqs + 4);
bfd_putl32 ((sizeof (eihd) + VMS_BLOCK_SIZE - 1) / VMS_BLOCK_SIZE,
- eihd.hdrblkcnt);
+ eihd.hdrblkcnt);
bfd_putl32 (0, eihd.ident);
bfd_putl32 (0, eihd.sysver);
for (sec = abfd->sections; sec; sec = sec->next)
{
if (!alpha_vms_create_eisd_for_section (abfd, sec))
- return FALSE;
+ return FALSE;
}
/* Merge section EIDS which extra ones. */
{
eisd = bfd_zalloc (abfd, sizeof (*eisd));
if (eisd == NULL)
- return FALSE;
+ return FALSE;
eisd->u.eisd.majorid = 0;
eisd->u.eisd.minorid = 0;
eisd->u.eisd.eisdsize = 0;
/* First block is a little bit special: there is a word at the end. */
if (PRIV (file_pos) < VMS_BLOCK_SIZE && room > 2)
- room -= 2;
+ room -= 2;
if (room < eisd->u.eisd.eisdsize + EISD__K_LENEND)
- alpha_vms_file_position_block (abfd);
+ alpha_vms_file_position_block (abfd);
eisd->file_pos = PRIV (file_pos);
PRIV (file_pos) += eisd->u.eisd.eisdsize;
if (eisd->u.eisd.flags & EISD__M_FIXUPVEC)
- bfd_putl64 (eisd->u.eisd.virt_addr, eihd.iafva);
+ bfd_putl64 (eisd->u.eisd.virt_addr, eihd.iafva);
}
if (first_eisd != NULL)
bfd_putl32 (PRIV (file_pos), eihd.size);
bfd_putl32 ((PRIV (file_pos) + VMS_BLOCK_SIZE - 1) / VMS_BLOCK_SIZE,
- eihd.hdrblkcnt);
+ eihd.hdrblkcnt);
/* Place sections. */
for (sec = abfd->sections; sec; sec = sec->next)
{
if (!(sec->flags & SEC_HAS_CONTENTS))
- continue;
+ continue;
eisd = vms_section_data (sec)->eisd;
sec->filepos = PRIV (file_pos);
if (eisd != NULL)
- eisd->u.eisd.vbn = (sec->filepos / VMS_BLOCK_SIZE) + 1;
+ eisd->u.eisd.vbn = (sec->filepos / VMS_BLOCK_SIZE) + 1;
PRIV (file_pos) += sec->size;
}
bfd_putl32 (dst->size, eihs->dstsize);
if (dmt != NULL)
- {
- lnkflags |= EIHD__M_DBGDMT;
- bfd_putl32 ((dmt->filepos / VMS_BLOCK_SIZE) + 1, eihs->dmtvbn);
- bfd_putl32 (dmt->size, eihs->dmtsize);
- }
+ {
+ lnkflags |= EIHD__M_DBGDMT;
+ bfd_putl32 ((dmt->filepos / VMS_BLOCK_SIZE) + 1, eihs->dmtvbn);
+ bfd_putl32 (dmt->size, eihs->dmtsize);
+ }
if (PRIV (gsd_sym_count) != 0)
- {
- alpha_vms_file_position_block (abfd);
- gst_filepos = PRIV (file_pos);
- bfd_putl32 ((gst_filepos / VMS_BLOCK_SIZE) + 1, eihs->gstvbn);
- bfd_putl32 ((PRIV (gsd_sym_count) + 4) / 5 + 4, eihs->gstsize);
- }
+ {
+ alpha_vms_file_position_block (abfd);
+ gst_filepos = PRIV (file_pos);
+ bfd_putl32 ((gst_filepos / VMS_BLOCK_SIZE) + 1, eihs->gstvbn);
+ bfd_putl32 ((PRIV (gsd_sym_count) + 4) / 5 + 4, eihs->gstsize);
+ }
}
/* Write EISD in hdr. */
memset (blk, 0xff, sizeof (blk));
while (eisd != NULL)
- {
- alpha_vms_swap_eisd_out
- (eisd,
- (struct vms_eisd *)(blk + (eisd->file_pos % VMS_BLOCK_SIZE)));
-
- next_eisd = eisd->next;
- if (next_eisd == NULL
- || (next_eisd->file_pos / VMS_BLOCK_SIZE
- != eisd->file_pos / VMS_BLOCK_SIZE))
- {
- if (bfd_bwrite (blk, sizeof (blk), abfd) != sizeof (blk))
- return FALSE;
+ {
+ alpha_vms_swap_eisd_out
+ (eisd,
+ (struct vms_eisd *)(blk + (eisd->file_pos % VMS_BLOCK_SIZE)));
+
+ next_eisd = eisd->next;
+ if (next_eisd == NULL
+ || (next_eisd->file_pos / VMS_BLOCK_SIZE
+ != eisd->file_pos / VMS_BLOCK_SIZE))
+ {
+ if (bfd_bwrite (blk, sizeof (blk), abfd) != sizeof (blk))
+ return FALSE;
- memset (blk, 0xff, sizeof (blk));
- }
- eisd = next_eisd;
- }
+ memset (blk, 0xff, sizeof (blk));
+ }
+ eisd = next_eisd;
+ }
}
/* Write sections. */
bfd_size_type len;
if (sec->size == 0 || !(sec->flags & SEC_HAS_CONTENTS))
- continue;
+ continue;
if (bfd_bwrite (sec->contents, sec->size, abfd) != sec->size)
- return FALSE;
+ return FALSE;
/* Pad. */
len = VMS_BLOCK_SIZE - sec->size % VMS_BLOCK_SIZE;
if (len != VMS_BLOCK_SIZE)
- {
- memset (blk, 0, len);
- if (bfd_bwrite (blk, len, abfd) != len)
- return FALSE;
- }
+ {
+ memset (blk, 0, len);
+ if (bfd_bwrite (blk, len, abfd) != len)
+ return FALSE;
+ }
}
/* Write GST. */
_bfd_vms_output_end (abfd, recwr);
for (i = 0; i < PRIV (gsd_sym_count); i++)
- {
- struct vms_symbol_entry *sym = PRIV (syms)[i];
- bfd_vma val;
- bfd_vma ep;
-
- if ((i % 5) == 0)
- {
- _bfd_vms_output_alignment (recwr, 8);
- _bfd_vms_output_begin (recwr, EOBJ__C_EGSD);
- _bfd_vms_output_long (recwr, 0);
- }
- _bfd_vms_output_begin_subrec (recwr, EGSD__C_SYMG);
- _bfd_vms_output_short (recwr, 0); /* Data type, alignment. */
- _bfd_vms_output_short (recwr, sym->flags);
-
- if (sym->code_section)
- ep = alpha_vms_get_sym_value (sym->code_section, sym->code_value);
- else
- {
- BFD_ASSERT (sym->code_value == 0);
- ep = 0;
- }
- val = alpha_vms_get_sym_value (sym->section, sym->value);
- _bfd_vms_output_quad
- (recwr, sym->typ == EGSD__C_SYMG ? sym->symbol_vector : val);
+ {
+ struct vms_symbol_entry *sym = PRIV (syms)[i];
+ bfd_vma val;
+ bfd_vma ep;
+
+ if ((i % 5) == 0)
+ {
+ _bfd_vms_output_alignment (recwr, 8);
+ _bfd_vms_output_begin (recwr, EOBJ__C_EGSD);
+ _bfd_vms_output_long (recwr, 0);
+ }
+ _bfd_vms_output_begin_subrec (recwr, EGSD__C_SYMG);
+ _bfd_vms_output_short (recwr, 0); /* Data type, alignment. */
+ _bfd_vms_output_short (recwr, sym->flags);
+
+ if (sym->code_section)
+ ep = alpha_vms_get_sym_value (sym->code_section, sym->code_value);
+ else
+ {
+ BFD_ASSERT (sym->code_value == 0);
+ ep = 0;
+ }
+ val = alpha_vms_get_sym_value (sym->section, sym->value);
+ _bfd_vms_output_quad
+ (recwr, sym->typ == EGSD__C_SYMG ? sym->symbol_vector : val);
_bfd_vms_output_quad (recwr, ep);
_bfd_vms_output_quad (recwr, val);
_bfd_vms_output_long (recwr, 0);
- _bfd_vms_output_counted (recwr, sym->name);
- _bfd_vms_output_end_subrec (recwr);
- if ((i % 5) == 4)
- _bfd_vms_output_end (abfd, recwr);
- }
+ _bfd_vms_output_counted (recwr, sym->name);
+ _bfd_vms_output_end_subrec (recwr);
+ if ((i % 5) == 4)
+ _bfd_vms_output_end (abfd, recwr);
+ }
if ((i % 5) != 0)
- _bfd_vms_output_end (abfd, recwr);
+ _bfd_vms_output_end (abfd, recwr);
if (!_bfd_vms_write_eeom (abfd))
- return FALSE;
+ return FALSE;
}
return TRUE;
}
for (section = abfd->sections; section != NULL; section = section->next)
{
if (section->flags & SEC_DEBUGGING)
- continue;
+ continue;
if (!strcmp (section->name, ".vmsdebug"))
- {
- section->flags |= SEC_DEBUGGING;
- continue;
- }
+ {
+ section->flags |= SEC_DEBUGGING;
+ continue;
+ }
section->target_index = target_index++;
}
for (section = abfd->sections; section != NULL; section = section->next)
{
vms_debug2 ((3, "Section #%d %s, %d bytes\n",
- section->target_index, section->name, (int)section->size));
+ section->target_index, section->name, (int)section->size));
/* Don't write out the VMS debug info section since it is in the
- ETBT and EDBG sections in etir. */
+ ETBT and EDBG sections in etir. */
if (section->flags & SEC_DEBUGGING)
- continue;
+ continue;
/* 13 bytes egsd, max 31 chars name -> should be 44 bytes. */
if (_bfd_vms_output_check (recwr, 64) < 0)
sname = section->name;
if (*sname == '.')
{
- /* Remove leading dot. */
+ /* Remove leading dot. */
sname++;
if ((*sname == 't') && (strcmp (sname, "text") == 0))
sname = EVAX_CODE_NAME;
else if ((*sname == 'l') && (strcmp (sname, "literal") == 0))
sname = EVAX_LITERAL_NAME;
else if ((*sname == 'l') && (strcmp (sname, "literals") == 0))
- sname = EVAX_LITERALS_NAME;
+ sname = EVAX_LITERALS_NAME;
else if ((*sname == 'c') && (strcmp (sname, "comm") == 0))
sname = EVAX_COMMON_NAME;
else if ((*sname == 'l') && (strcmp (sname, "lcomm") == 0))
vms_debug2 ((3, "sec flags %x\n", section->flags));
vms_debug2 ((3, "new_flags %x, _raw_size %lu\n",
- new_flags, (unsigned long)section->size));
+ new_flags, (unsigned long)section->size));
_bfd_vms_output_begin_subrec (recwr, EGSD__C_PSC);
_bfd_vms_output_short (recwr, section->alignment_power & 0xff);
_bfd_vms_output_end_subrec (recwr);
/* If the section is an obsolute one, remind its index as it will be
- used later for absolute symbols. */
+ used later for absolute symbols. */
if ((new_flags & EGPS__V_REL) == 0 && abs_section_index < 0)
- abs_section_index = section->target_index;
+ abs_section_index = section->target_index;
}
/* Output symbols. */
old_flags = symbol->flags;
/* Work-around a missing feature: consider __main as the main entry
- point. */
+ point. */
if (symbol->name[0] == '_' && strcmp (symbol->name, "__main") == 0)
bfd_set_start_address (abfd, (bfd_vma)symbol->value);
continue;
if ((old_flags & BSF_GLOBAL) == 0 && !bfd_is_und_section (symbol->section))
- {
- /* If the LIB$INITIIALIZE section is present, add a reference to
- LIB$INITIALIZE symbol. FIXME: this should be done explicitely
- in the assembly file. */
- if (!((old_flags & BSF_SECTION_SYM) != 0
- && strcmp (symbol->section->name, "LIB$INITIALIZE") == 0))
- continue;
- }
+ {
+ /* If the LIB$INITIIALIZE section is present, add a reference to
+ LIB$INITIALIZE symbol. FIXME: this should be done explicitely
+ in the assembly file. */
+ if (!((old_flags & BSF_SECTION_SYM) != 0
+ && strcmp (symbol->section->name, "LIB$INITIALIZE") == 0))
+ continue;
+ }
/* 13 bytes egsd, max 64 chars name -> should be 77 bytes. Add 16 more
- bytes for a possible ABS section. */
+ bytes for a possible ABS section. */
if (_bfd_vms_output_check (recwr, 80 + 16) < 0)
{
_bfd_vms_output_end (abfd, recwr);
}
if ((old_flags & BSF_GLOBAL) != 0
- && bfd_is_abs_section (symbol->section)
- && abs_section_index <= 0)
- {
- /* Create an absolute section if none was defined. It is highly
- unlikely that the name $ABS$ clashes with a user defined
- non-absolute section name. */
- _bfd_vms_output_begin_subrec (recwr, EGSD__C_PSC);
- _bfd_vms_output_short (recwr, 4);
- _bfd_vms_output_short (recwr, EGPS__V_SHR);
- _bfd_vms_output_long (recwr, 0);
- _bfd_vms_output_counted (recwr, "$ABS$");
- _bfd_vms_output_end_subrec (recwr);
-
- abs_section_index = target_index++;
- }
+ && bfd_is_abs_section (symbol->section)
+ && abs_section_index <= 0)
+ {
+ /* Create an absolute section if none was defined. It is highly
+ unlikely that the name $ABS$ clashes with a user defined
+ non-absolute section name. */
+ _bfd_vms_output_begin_subrec (recwr, EGSD__C_PSC);
+ _bfd_vms_output_short (recwr, 4);
+ _bfd_vms_output_short (recwr, EGPS__V_SHR);
+ _bfd_vms_output_long (recwr, 0);
+ _bfd_vms_output_counted (recwr, "$ABS$");
+ _bfd_vms_output_end_subrec (recwr);
+
+ abs_section_index = target_index++;
+ }
_bfd_vms_output_begin_subrec (recwr, EGSD__C_SYM);
{
asymbol *sym;
- sym =
- ((struct evax_private_udata_struct *)symbol->udata.p)->enbsym;
+ sym =
+ ((struct evax_private_udata_struct *)symbol->udata.p)->enbsym;
code_address = sym->value;
ca_psindx = sym->section->target_index;
}
_bfd_vms_output_begin (recwr, EOBJ__C_EMH);
_bfd_vms_output_short (recwr, EMH__C_CPR);
_bfd_vms_output_dump (recwr,
- (unsigned char *)"GNU BFD ported by Klaus Kämpf 1994-1996",
+ (unsigned char *)"GNU BFD ported by Klaus Kämpf 1994-1996",
39);
_bfd_vms_output_end (abfd, recwr);
_bfd_vms_output_begin (recwr, EOBJ__C_ETBT);
if (offset == 0)
- {
- /* Push start offset. */
- _bfd_vms_output_begin_subrec (recwr, ETIR__C_STA_LW);
- _bfd_vms_output_long (recwr, (unsigned long) 0);
- _bfd_vms_output_end_subrec (recwr);
-
- /* Set location. */
- _bfd_vms_output_begin_subrec (recwr, ETIR__C_CTL_DFLOC);
- _bfd_vms_output_end_subrec (recwr);
- }
+ {
+ /* Push start offset. */
+ _bfd_vms_output_begin_subrec (recwr, ETIR__C_STA_LW);
+ _bfd_vms_output_long (recwr, (unsigned long) 0);
+ _bfd_vms_output_end_subrec (recwr);
+
+ /* Set location. */
+ _bfd_vms_output_begin_subrec (recwr, ETIR__C_CTL_DFLOC);
+ _bfd_vms_output_end_subrec (recwr);
+ }
}
else
{
_bfd_vms_output_begin (recwr, EOBJ__C_ETIR);
if (offset == 0)
- {
- /* Push start offset. */
- _bfd_vms_output_begin_subrec (recwr, ETIR__C_STA_PQ);
- _bfd_vms_output_long (recwr, (unsigned long) section->target_index);
- _bfd_vms_output_quad (recwr, offset);
- _bfd_vms_output_end_subrec (recwr);
-
- /* Start = pop (). */
- _bfd_vms_output_begin_subrec (recwr, ETIR__C_CTL_SETRB);
- _bfd_vms_output_end_subrec (recwr);
- }
+ {
+ /* Push start offset. */
+ _bfd_vms_output_begin_subrec (recwr, ETIR__C_STA_PQ);
+ _bfd_vms_output_long (recwr, (unsigned long) section->target_index);
+ _bfd_vms_output_quad (recwr, offset);
+ _bfd_vms_output_end_subrec (recwr);
+
+ /* Start = pop (). */
+ _bfd_vms_output_begin_subrec (recwr, ETIR__C_CTL_SETRB);
+ _bfd_vms_output_end_subrec (recwr);
+ }
}
}
static void
sto_imm (bfd *abfd, asection *section,
- bfd_size_type ssize, unsigned char *cptr, bfd_vma vaddr)
+ bfd_size_type ssize, unsigned char *cptr, bfd_vma vaddr)
{
bfd_size_type size;
struct vms_rec_wr *recwr = &PRIV (recwr);
/* Doesn't fit, split ! */
end_etir_record (abfd);
- start_etir_or_etbt_record (abfd, section, vaddr);
+ start_etir_or_etbt_record (abfd, section, vaddr);
size = _bfd_vms_output_check (recwr, 0); /* get max size */
if (size > ssize) /* more than what's left ? */
for (section = abfd->sections; section; section = section->next)
{
vms_debug2 ((4, "writing %d. section '%s' (%d bytes)\n",
- section->target_index, section->name, (int) (section->size)));
+ section->target_index, section->name, (int) (section->size)));
if (!(section->flags & SEC_HAS_CONTENTS)
|| bfd_is_com_section (section))
if (section->reloc_count == 0)
_bfd_error_handler
- (_("SEC_RELOC with no relocs in section %A"), section);
+ (_("SEC_RELOC with no relocs in section %pA"), section);
#if VMS_DEBUG
else
(*(*rptr)->sym_ptr_ptr)->section->name,
(long) (*(*rptr)->sym_ptr_ptr)->value,
(unsigned long)(*rptr)->address,
- (unsigned long)(*rptr)->addend,
+ (unsigned long)(*rptr)->addend,
bfd_get_reloc_size ((*rptr)->howto),
- ( *rptr)->howto->name);
+ ( *rptr)->howto->name);
rptr++;
}
}
}
/* Regular relocs are intertwined with binary data. */
- if (curr_addr > addr)
- _bfd_error_handler (_("Size error in section %A"),
+ if (curr_addr > addr)
+ _bfd_error_handler (_("size error in section %pA"),
section);
size = addr - curr_addr;
sto_imm (abfd, section, size, curr_data, curr_addr);
size = bfd_get_reloc_size (rptr->howto);
switch (rptr->howto->type)
- {
+ {
case ALPHA_R_IGNORE:
break;
else
{
_bfd_vms_output_begin_subrec
- (recwr, ETIR__C_STO_GBL_LW);
+ (recwr, ETIR__C_STO_GBL_LW);
_bfd_vms_output_counted (recwr, sym->name);
_bfd_vms_output_end_subrec (recwr);
}
etir_output_check (abfd, section, curr_addr, 32);
_bfd_vms_output_begin_subrec (recwr, ETIR__C_STA_PQ);
_bfd_vms_output_long (recwr,
- (unsigned long) sec->target_index);
+ (unsigned long) sec->target_index);
_bfd_vms_output_quad (recwr, rptr->addend + sym->value);
_bfd_vms_output_end_subrec (recwr);
/* ??? Table B-8 of the OpenVMS Linker Utilily Manual
etir_output_check (abfd, section, curr_addr, 32);
_bfd_vms_output_begin_subrec (recwr, ETIR__C_STA_PQ);
_bfd_vms_output_long (recwr,
- (unsigned long) sec->target_index);
+ (unsigned long) sec->target_index);
_bfd_vms_output_quad (recwr, rptr->addend + sym->value);
_bfd_vms_output_end_subrec (recwr);
_bfd_vms_output_begin_subrec (recwr, ETIR__C_STO_OFF);
break;
case ALPHA_R_LINKAGE:
+ size = 16;
etir_output_check (abfd, section, curr_addr, 64);
_bfd_vms_output_begin_subrec (recwr, ETIR__C_STC_LP_PSB);
_bfd_vms_output_long
(recwr, (unsigned long) rptr->addend);
- if (rptr->addend > PRIV (vms_linkage_index))
- PRIV (vms_linkage_index) = rptr->addend;
+ if (rptr->addend > PRIV (vms_linkage_index))
+ PRIV (vms_linkage_index) = rptr->addend;
_bfd_vms_output_counted (recwr, sym->name);
_bfd_vms_output_byte (recwr, 0);
_bfd_vms_output_end_subrec (recwr);
break;
case ALPHA_R_BSR:
- _bfd_error_handler (_("Spurious ALPHA_R_BSR reloc"));
+ _bfd_error_handler (_("spurious ALPHA_R_BSR reloc"));
break;
case ALPHA_R_LDA:
break;
default:
- _bfd_error_handler (_("Unhandled relocation %s"),
+ _bfd_error_handler (_("unhandled relocation %s"),
rptr->howto->name);
break;
}
{
/* Output rest of section. */
if (curr_addr > section->size)
- _bfd_error_handler (_("Size error in section %A"), section);
+ {
+ _bfd_error_handler (_("size error in section %pA"), section);
+ return FALSE;
+ }
size = section->size - curr_addr;
sto_imm (abfd, section, size, curr_data, curr_addr);
curr_data += size;
else
{
if (abfd->section_count > 0) /* we have sections */
- {
- if (!_bfd_vms_write_ehdr (abfd))
- return FALSE;
- if (!_bfd_vms_write_egsd (abfd))
- return FALSE;
- if (!_bfd_vms_write_etir (abfd, EOBJ__C_ETIR))
- return FALSE;
- if (!_bfd_vms_write_eeom (abfd))
- return FALSE;
- }
+ {
+ if (!_bfd_vms_write_ehdr (abfd))
+ return FALSE;
+ if (!_bfd_vms_write_egsd (abfd))
+ return FALSE;
+ if (!_bfd_vms_write_etir (abfd, EOBJ__C_ETIR))
+ return FALSE;
+ if (!_bfd_vms_write_eeom (abfd))
+ return FALSE;
+ }
}
return TRUE;
}
vms_debug2 ((2, "DST record: leng %d, type %d\n", rec_length, rec_type));
if (length == -1 && rec_type == DST__K_MODEND)
- break;
+ break;
switch (rec_type)
{
case DST__K_MODBEG:
module->name
- = _bfd_vms_save_counted_string (ptr + DST_S_B_MODBEG_NAME);
+ = _bfd_vms_save_counted_string (abfd, ptr + DST_S_B_MODBEG_NAME,
+ maxptr - (ptr + DST_S_B_MODBEG_NAME));
curr_pc = 0;
prev_pc = 0;
curr_linenum = 0;
prev_linum = 0;
- vms_debug2 ((3, "module: %s\n", module->name));
+ vms_debug2 ((3, "module: %s\n", module->name));
break;
case DST__K_MODEND:
case DST__K_RTNBEG:
funcinfo = (struct funcinfo *)
bfd_zalloc (abfd, sizeof (struct funcinfo));
- funcinfo->name
- = _bfd_vms_save_counted_string (ptr + DST_S_B_RTNBEG_NAME);
+ funcinfo->name
+ = _bfd_vms_save_counted_string (abfd, ptr + DST_S_B_RTNBEG_NAME,
+ maxptr - (ptr + DST_S_B_RTNBEG_NAME));
funcinfo->low = bfd_getl32 (ptr + DST_S_L_RTNBEG_ADDRESS);
funcinfo->next = module->func_table;
module->func_table = funcinfo;
- vms_debug2 ((3, "routine: %s at 0x%lx\n",
- funcinfo->name, (unsigned long) funcinfo->low));
+ vms_debug2 ((3, "routine: %s at 0x%lx\n",
+ funcinfo->name, (unsigned long) funcinfo->low));
break;
case DST__K_RTNEND:
if (module->func_table->high > module->high)
module->high = module->func_table->high;
- vms_debug2 ((3, "end routine\n"));
+ vms_debug2 ((3, "end routine\n"));
break;
case DST__K_PROLOG:
- vms_debug2 ((3, "prologue\n"));
+ vms_debug2 ((3, "prologue\n"));
break;
case DST__K_EPILOG:
- vms_debug2 ((3, "epilog\n"));
+ vms_debug2 ((3, "epilog\n"));
break;
case DST__K_BLKBEG:
- vms_debug2 ((3, "block\n"));
+ vms_debug2 ((3, "block\n"));
break;
case DST__K_BLKEND:
- vms_debug2 ((3, "end block\n"));
+ vms_debug2 ((3, "end block\n"));
break;
case DST__K_SOURCE:
{
unsigned int fileid
= bfd_getl16 (src_ptr + DST_S_W_SRC_DF_FILEID);
- char *filename
- = _bfd_vms_save_counted_string (src_ptr
- + DST_S_B_SRC_DF_FILENAME);
+ char *filename = _bfd_vms_save_counted_string
+ (abfd,
+ src_ptr + DST_S_B_SRC_DF_FILENAME,
+ ptr + rec_length - (src_ptr + DST_S_B_SRC_DF_FILENAME));
while (fileid >= module->file_table_count)
{
module->file_table [fileid].srec = 1;
cmd_length = src_ptr[DST_S_B_SRC_DF_LENGTH] + 2;
vms_debug2 ((4, "DST_S_C_SRC_DECLFILE: %d, %s\n",
- fileid, module->file_table [fileid].name));
+ fileid, module->file_table [fileid].name));
}
break;
case DST__K_SET_LINUM_INCR:
_bfd_error_handler
- (_("DST__K_SET_LINUM_INCR not implemented"));
+ (_("%s not implemented"), "DST__K_SET_LINUM_INCR");
cmd_length = 2;
break;
case DST__K_SET_LINUM_INCR_W:
_bfd_error_handler
- (_("DST__K_SET_LINUM_INCR_W not implemented"));
+ (_("%s not implemented"), "DST__K_SET_LINUM_INCR_W");
cmd_length = 3;
break;
case DST__K_RESET_LINUM_INCR:
_bfd_error_handler
- (_("DST__K_RESET_LINUM_INCR not implemented"));
+ (_("%s not implemented"), "DST__K_RESET_LINUM_INCR");
cmd_length = 1;
break;
case DST__K_BEG_STMT_MODE:
_bfd_error_handler
- (_("DST__K_BEG_STMT_MODE not implemented"));
+ (_("%s not implemented"), "DST__K_BEG_STMT_MODE");
cmd_length = 1;
break;
case DST__K_END_STMT_MODE:
_bfd_error_handler
- (_("DST__K_END_STMT_MODE not implemented"));
+ (_("%s not implemented"), "DST__K_END_STMT_MODE");
cmd_length = 1;
break;
case DST__K_SET_PC:
_bfd_error_handler
- (_("DST__K_SET_PC not implemented"));
+ (_("%s not implemented"), "DST__K_SET_PC");
cmd_length = 2;
break;
case DST__K_SET_PC_W:
_bfd_error_handler
- (_("DST__K_SET_PC_W not implemented"));
+ (_("%s not implemented"), "DST__K_SET_PC_W");
cmd_length = 3;
break;
case DST__K_SET_PC_L:
_bfd_error_handler
- (_("DST__K_SET_PC_L not implemented"));
+ (_("%s not implemented"), "DST__K_SET_PC_L");
cmd_length = 5;
break;
case DST__K_SET_STMTNUM:
_bfd_error_handler
- (_("DST__K_SET_STMTNUM not implemented"));
+ (_("%s not implemented"), "DST__K_SET_STMTNUM");
cmd_length = 2;
break;
curr_linenum += 1;
cmd_length = 1;
vms_debug2 ((4, "bump pc to 0x%lx and line to %d\n",
- (unsigned long)curr_pc, curr_linenum));
+ (unsigned long)curr_pc, curr_linenum));
}
else
{
prev_linum = curr_linenum;
prev_pc = curr_pc;
vms_debug2 ((4, "-> correlate pc 0x%lx with line %d\n",
- (unsigned long)curr_pc, curr_linenum));
+ (unsigned long)curr_pc, curr_linenum));
}
pcl_ptr += cmd_length;
section and build the list of modules. This is sufficient
since we can compute the start address and the end address
of every module from the section contents. */
- bfd_size_type size = bfd_get_section_size (dmt);
+ bfd_size_type size = bfd_section_size (dmt);
unsigned char *ptr, *end;
ptr = (unsigned char *) bfd_alloc (abfd, size);
ptr += DBG_S_C_DMT_HEADER_SIZE;
vms_debug2 ((3, "module: modbeg = %d, size = %d, count = %d\n",
- modbeg, msize, count));
+ modbeg, msize, count));
/* We create a 'module' structure for each program section since
we only support contiguous addresses in a 'module' structure.
ptr += DBG_S_C_DMT_PSECT_SIZE;
vms_debug2 ((4, "section: start = 0x%x, length = %d\n",
- start, length));
+ start, length));
}
}
}
void *dst = PRIV (dst_section)->contents;
if (dst == NULL)
- return NULL;
+ return NULL;
module = new_module (abfd);
parse_module (abfd, module, PRIV (dst_section)->contents, -1);
{
unsigned int size = module->size;
unsigned int modbeg = PRIV (dst_section)->filepos + module->modbeg;
- unsigned char *buffer = (unsigned char *) bfd_malloc (module->size);
+ unsigned char *buffer;
if (bfd_seek (abfd, modbeg, SEEK_SET) != 0
- || bfd_bread (buffer, size, abfd) != size)
+ || (buffer = _bfd_malloc_and_read (abfd, size, size)) == NULL)
{
bfd_set_error (bfd_error_no_debug_section);
return FALSE;
for (funcinfo = module->func_table; funcinfo; funcinfo = funcinfo->next)
if (addr >= funcinfo->low && addr <= funcinfo->high)
{
- *func = funcinfo->name;
+ *func = funcinfo->name;
ret = TRUE;
break;
}
{
PRIV (modules) = build_module_list (abfd);
if (PRIV (modules) == NULL)
- return FALSE;
+ return FALSE;
}
for (module = PRIV (modules); module; module = module->next)
{
case EGSD__C_SYM:
if (e->flags & EGSY__V_WEAK)
- flags |= BSF_WEAK;
+ flags |= BSF_WEAK;
if (e->flags & EGSY__V_DEF)
- {
- /* Symbol definition. */
- flags |= BSF_GLOBAL;
- if (e->flags & EGSY__V_NORM)
- flags |= BSF_FUNCTION;
- value = e->value;
- sec = e->section;
- }
+ {
+ /* Symbol definition. */
+ flags |= BSF_GLOBAL;
+ if (e->flags & EGSY__V_NORM)
+ flags |= BSF_FUNCTION;
+ value = e->value;
+ sec = e->section;
+ }
else
- {
- /* Symbol reference. */
- sec = bfd_und_section_ptr;
- }
+ {
+ /* Symbol reference. */
+ sec = bfd_und_section_ptr;
+ }
break;
case EGSD__C_SYMG:
/* ...and dynamic in shared libraries. */
if (abfd->flags & DYNAMIC)
- flags |= BSF_DYNAMIC;
+ flags |= BSF_DYNAMIC;
if (e->flags & EGSY__V_WEAK)
- flags |= BSF_WEAK;
+ flags |= BSF_WEAK;
if (!(e->flags & EGSY__V_DEF))
- abort ();
+ abort ();
if (e->flags & EGSY__V_NORM)
- flags |= BSF_FUNCTION;
+ flags |= BSF_FUNCTION;
value = e->value;
/* sec = e->section; */
alpha_vms_get_symtab_upper_bound (bfd *abfd)
{
vms_debug2 ((1, "alpha_vms_get_symtab_upper_bound (%p), %d symbols\n",
- abfd, PRIV (gsd_sym_count)));
+ abfd, PRIV (gsd_sym_count)));
return (PRIV (gsd_sym_count) + 1) * sizeof (asymbol *);
}
if (PRIV (csymbols) == NULL)
{
PRIV (csymbols) = (asymbol **) bfd_alloc
- (abfd, PRIV (gsd_sym_count) * sizeof (asymbol *));
+ (abfd, PRIV (gsd_sym_count) * sizeof (asymbol *));
/* Traverse table and fill symbols vector. */
for (i = 0; i < PRIV (gsd_sym_count); i++)
- {
- struct vms_symbol_entry *e = PRIV (syms)[i];
- asymbol *sym;
+ {
+ struct vms_symbol_entry *e = PRIV (syms)[i];
+ asymbol *sym;
- sym = bfd_make_empty_symbol (abfd);
- if (sym == NULL || !alpha_vms_convert_symbol (abfd, e, sym))
- {
- bfd_release (abfd, PRIV (csymbols));
- PRIV (csymbols) = NULL;
- return -1;
- }
+ sym = bfd_make_empty_symbol (abfd);
+ if (sym == NULL || !alpha_vms_convert_symbol (abfd, e, sym))
+ {
+ bfd_release (abfd, PRIV (csymbols));
+ PRIV (csymbols) = NULL;
+ return -1;
+ }
- PRIV (csymbols)[i] = sym;
- }
+ PRIV (csymbols)[i] = sym;
+ }
}
if (symbols != NULL)
{
for (i = 0; i < PRIV (gsd_sym_count); i++)
- symbols[i] = PRIV (csymbols)[i];
+ symbols[i] = PRIV (csymbols)[i];
symbols[i] = NULL;
}
/* Skip non-ETIR records. */
type = _bfd_vms_get_object_record (abfd);
if (type == EOBJ__C_EEOM)
- break;
+ break;
if (type != EOBJ__C_ETIR)
- continue;
+ continue;
begin = PRIV (recrd.rec) + 4;
end = PRIV (recrd.rec) + PRIV (recrd.rec_size);
for (ptr = begin; ptr < end; ptr += length)
- {
- int cmd;
-
- cmd = bfd_getl16 (ptr);
- length = bfd_getl16 (ptr + 2);
-
- cur_address = vaddr;
-
- vms_debug2 ((4, "alpha_vms_slurp_relocs: etir %s\n",
- _bfd_vms_etir_name (cmd)));
-
- switch (cmd)
- {
- case ETIR__C_STA_GBL: /* ALPHA_R_REFLONG und_section, step 1 */
- /* ALPHA_R_REFQUAD und_section, step 1 */
- cur_sym = ptr + 4;
- prev_cmd = cmd;
- continue;
-
- case ETIR__C_STA_PQ: /* ALPHA_R_REF{LONG|QUAD}, others part 1 */
- cur_psidx = bfd_getl32 (ptr + 4);
- cur_addend = bfd_getl64 (ptr + 8);
- prev_cmd = cmd;
- continue;
-
- case ETIR__C_CTL_SETRB:
- if (prev_cmd != ETIR__C_STA_PQ)
- {
+ {
+ int cmd;
+
+ cmd = bfd_getl16 (ptr);
+ length = bfd_getl16 (ptr + 2);
+
+ cur_address = vaddr;
+
+ vms_debug2 ((4, "alpha_vms_slurp_relocs: etir %s\n",
+ _bfd_vms_etir_name (cmd)));
+
+ switch (cmd)
+ {
+ case ETIR__C_STA_GBL: /* ALPHA_R_REFLONG und_section, step 1 */
+ /* ALPHA_R_REFQUAD und_section, step 1 */
+ cur_sym = ptr + 4;
+ prev_cmd = cmd;
+ continue;
+
+ case ETIR__C_STA_PQ: /* ALPHA_R_REF{LONG|QUAD}, others part 1 */
+ cur_psidx = bfd_getl32 (ptr + 4);
+ cur_addend = bfd_getl64 (ptr + 8);
+ prev_cmd = cmd;
+ continue;
+
+ case ETIR__C_CTL_SETRB:
+ if (prev_cmd != ETIR__C_STA_PQ)
+ {
_bfd_error_handler
/* xgettext:c-format */
- (_("Unknown reloc %s + %s"), _bfd_vms_etir_name (prev_cmd),
- _bfd_vms_etir_name (cmd));
- return FALSE;
- }
- cur_psect = cur_psidx;
- vaddr = cur_addend;
- cur_psidx = -1;
- cur_addend = 0;
- continue;
-
- case ETIR__C_STA_LW: /* ALPHA_R_REFLONG abs_section, step 1 */
- /* ALPHA_R_REFLONG und_section, step 2 */
- if (prev_cmd != -1)
- {
- if (prev_cmd != ETIR__C_STA_GBL)
- {
+ (_("unknown reloc %s + %s"), _bfd_vms_etir_name (prev_cmd),
+ _bfd_vms_etir_name (cmd));
+ return FALSE;
+ }
+ cur_psect = cur_psidx;
+ vaddr = cur_addend;
+ cur_psidx = -1;
+ cur_addend = 0;
+ continue;
+
+ case ETIR__C_STA_LW: /* ALPHA_R_REFLONG abs_section, step 1 */
+ /* ALPHA_R_REFLONG und_section, step 2 */
+ if (prev_cmd != -1)
+ {
+ if (prev_cmd != ETIR__C_STA_GBL)
+ {
_bfd_error_handler
/* xgettext:c-format */
- (_("Unknown reloc %s + %s"), _bfd_vms_etir_name (cmd),
- _bfd_vms_etir_name (ETIR__C_STA_LW));
- return FALSE;
- }
- }
- cur_addend = bfd_getl32 (ptr + 4);
- prev_cmd = cmd;
- continue;
-
- case ETIR__C_STA_QW: /* ALPHA_R_REFQUAD abs_section, step 1 */
- /* ALPHA_R_REFQUAD und_section, step 2 */
- if (prev_cmd != -1 && prev_cmd != ETIR__C_STA_GBL)
- {
+ (_("unknown reloc %s + %s"), _bfd_vms_etir_name (cmd),
+ _bfd_vms_etir_name (ETIR__C_STA_LW));
+ return FALSE;
+ }
+ }
+ cur_addend = bfd_getl32 (ptr + 4);
+ prev_cmd = cmd;
+ continue;
+
+ case ETIR__C_STA_QW: /* ALPHA_R_REFQUAD abs_section, step 1 */
+ /* ALPHA_R_REFQUAD und_section, step 2 */
+ if (prev_cmd != -1 && prev_cmd != ETIR__C_STA_GBL)
+ {
_bfd_error_handler
/* xgettext:c-format */
- (_("Unknown reloc %s + %s"), _bfd_vms_etir_name (cmd),
- _bfd_vms_etir_name (ETIR__C_STA_QW));
- return FALSE;
- }
- cur_addend = bfd_getl64 (ptr + 4);
- prev_cmd = cmd;
- continue;
-
- case ETIR__C_STO_LW: /* ALPHA_R_REFLONG und_section, step 4 */
- /* ALPHA_R_REFLONG abs_section, step 2 */
- /* ALPHA_R_REFLONG others, step 2 */
- if (prev_cmd != ETIR__C_OPR_ADD
- && prev_cmd != ETIR__C_STA_LW
- && prev_cmd != ETIR__C_STA_PQ)
- {
+ (_("unknown reloc %s + %s"), _bfd_vms_etir_name (cmd),
+ _bfd_vms_etir_name (ETIR__C_STA_QW));
+ return FALSE;
+ }
+ cur_addend = bfd_getl64 (ptr + 4);
+ prev_cmd = cmd;
+ continue;
+
+ case ETIR__C_STO_LW: /* ALPHA_R_REFLONG und_section, step 4 */
+ /* ALPHA_R_REFLONG abs_section, step 2 */
+ /* ALPHA_R_REFLONG others, step 2 */
+ if (prev_cmd != ETIR__C_OPR_ADD
+ && prev_cmd != ETIR__C_STA_LW
+ && prev_cmd != ETIR__C_STA_PQ)
+ {
/* xgettext:c-format */
- _bfd_error_handler (_("Unknown reloc %s + %s"),
+ _bfd_error_handler (_("unknown reloc %s + %s"),
_bfd_vms_etir_name (prev_cmd),
_bfd_vms_etir_name (ETIR__C_STO_LW));
- return FALSE;
- }
- reloc_code = BFD_RELOC_32;
- break;
-
- case ETIR__C_STO_QW: /* ALPHA_R_REFQUAD und_section, step 4 */
- /* ALPHA_R_REFQUAD abs_section, step 2 */
- if (prev_cmd != ETIR__C_OPR_ADD && prev_cmd != ETIR__C_STA_QW)
- {
+ return FALSE;
+ }
+ reloc_code = BFD_RELOC_32;
+ break;
+
+ case ETIR__C_STO_QW: /* ALPHA_R_REFQUAD und_section, step 4 */
+ /* ALPHA_R_REFQUAD abs_section, step 2 */
+ if (prev_cmd != ETIR__C_OPR_ADD && prev_cmd != ETIR__C_STA_QW)
+ {
/* xgettext:c-format */
- _bfd_error_handler (_("Unknown reloc %s + %s"),
+ _bfd_error_handler (_("unknown reloc %s + %s"),
_bfd_vms_etir_name (prev_cmd),
_bfd_vms_etir_name (ETIR__C_STO_QW));
- return FALSE;
- }
- reloc_code = BFD_RELOC_64;
- break;
-
- case ETIR__C_STO_OFF: /* ALPHA_R_REFQUAD others, step 2 */
- if (prev_cmd != ETIR__C_STA_PQ)
- {
+ return FALSE;
+ }
+ reloc_code = BFD_RELOC_64;
+ break;
+
+ case ETIR__C_STO_OFF: /* ALPHA_R_REFQUAD others, step 2 */
+ if (prev_cmd != ETIR__C_STA_PQ)
+ {
/* xgettext:c-format */
- _bfd_error_handler (_("Unknown reloc %s + %s"),
+ _bfd_error_handler (_("unknown reloc %s + %s"),
_bfd_vms_etir_name (prev_cmd),
_bfd_vms_etir_name (ETIR__C_STO_OFF));
- return FALSE;
- }
- reloc_code = BFD_RELOC_64;
- break;
-
- case ETIR__C_OPR_ADD: /* ALPHA_R_REFLONG und_section, step 3 */
- /* ALPHA_R_REFQUAD und_section, step 3 */
- if (prev_cmd != ETIR__C_STA_LW && prev_cmd != ETIR__C_STA_QW)
- {
+ return FALSE;
+ }
+ reloc_code = BFD_RELOC_64;
+ break;
+
+ case ETIR__C_OPR_ADD: /* ALPHA_R_REFLONG und_section, step 3 */
+ /* ALPHA_R_REFQUAD und_section, step 3 */
+ if (prev_cmd != ETIR__C_STA_LW && prev_cmd != ETIR__C_STA_QW)
+ {
/* xgettext:c-format */
- _bfd_error_handler (_("Unknown reloc %s + %s"),
+ _bfd_error_handler (_("unknown reloc %s + %s"),
_bfd_vms_etir_name (prev_cmd),
_bfd_vms_etir_name (ETIR__C_OPR_ADD));
- return FALSE;
- }
- prev_cmd = ETIR__C_OPR_ADD;
- continue;
-
- case ETIR__C_STO_CA: /* ALPHA_R_CODEADDR */
- reloc_code = BFD_RELOC_ALPHA_CODEADDR;
- cur_sym = ptr + 4;
- break;
-
- case ETIR__C_STO_GBL: /* ALPHA_R_REFQUAD und_section */
- reloc_code = BFD_RELOC_64;
- cur_sym = ptr + 4;
- break;
-
- case ETIR__C_STO_GBL_LW: /* ALPHA_R_REFLONG und_section */
- reloc_code = BFD_RELOC_32;
- cur_sym = ptr + 4;
- break;
-
- case ETIR__C_STC_LP_PSB: /* ALPHA_R_LINKAGE */
- reloc_code = BFD_RELOC_ALPHA_LINKAGE;
- cur_sym = ptr + 8;
- break;
-
- case ETIR__C_STC_NOP_GBL: /* ALPHA_R_NOP */
- reloc_code = BFD_RELOC_ALPHA_NOP;
- goto call_reloc;
-
- case ETIR__C_STC_BSR_GBL: /* ALPHA_R_BSR */
- reloc_code = BFD_RELOC_ALPHA_BSR;
- goto call_reloc;
-
- case ETIR__C_STC_LDA_GBL: /* ALPHA_R_LDA */
- reloc_code = BFD_RELOC_ALPHA_LDA;
- goto call_reloc;
-
- case ETIR__C_STC_BOH_GBL: /* ALPHA_R_BOH */
- reloc_code = BFD_RELOC_ALPHA_BOH;
- goto call_reloc;
-
- call_reloc:
- cur_sym = ptr + 4 + 32;
- cur_address = bfd_getl64 (ptr + 4 + 8);
- cur_addend = bfd_getl64 (ptr + 4 + 24);
- break;
-
- case ETIR__C_STO_IMM:
- vaddr += bfd_getl32 (ptr + 4);
- continue;
-
- default:
- _bfd_error_handler (_("Unknown reloc %s"),
+ return FALSE;
+ }
+ prev_cmd = ETIR__C_OPR_ADD;
+ continue;
+
+ case ETIR__C_STO_CA: /* ALPHA_R_CODEADDR */
+ reloc_code = BFD_RELOC_ALPHA_CODEADDR;
+ cur_sym = ptr + 4;
+ break;
+
+ case ETIR__C_STO_GBL: /* ALPHA_R_REFQUAD und_section */
+ reloc_code = BFD_RELOC_64;
+ cur_sym = ptr + 4;
+ break;
+
+ case ETIR__C_STO_GBL_LW: /* ALPHA_R_REFLONG und_section */
+ reloc_code = BFD_RELOC_32;
+ cur_sym = ptr + 4;
+ break;
+
+ case ETIR__C_STC_LP_PSB: /* ALPHA_R_LINKAGE */
+ reloc_code = BFD_RELOC_ALPHA_LINKAGE;
+ cur_sym = ptr + 8;
+ break;
+
+ case ETIR__C_STC_NOP_GBL: /* ALPHA_R_NOP */
+ reloc_code = BFD_RELOC_ALPHA_NOP;
+ goto call_reloc;
+
+ case ETIR__C_STC_BSR_GBL: /* ALPHA_R_BSR */
+ reloc_code = BFD_RELOC_ALPHA_BSR;
+ goto call_reloc;
+
+ case ETIR__C_STC_LDA_GBL: /* ALPHA_R_LDA */
+ reloc_code = BFD_RELOC_ALPHA_LDA;
+ goto call_reloc;
+
+ case ETIR__C_STC_BOH_GBL: /* ALPHA_R_BOH */
+ reloc_code = BFD_RELOC_ALPHA_BOH;
+ goto call_reloc;
+
+ call_reloc:
+ cur_sym = ptr + 4 + 32;
+ cur_address = bfd_getl64 (ptr + 4 + 8);
+ cur_addend = bfd_getl64 (ptr + 4 + 24);
+ break;
+
+ case ETIR__C_STO_IMM:
+ vaddr += bfd_getl32 (ptr + 4);
+ continue;
+
+ default:
+ _bfd_error_handler (_("unknown reloc %s"),
_bfd_vms_etir_name (cmd));
- return FALSE;
- }
-
- {
- asection *sec;
- struct vms_section_data_struct *vms_sec;
- arelent *reloc;
-
- /* Get section to which the relocation applies. */
- if (cur_psect < 0 || cur_psect > (int)PRIV (section_count))
- {
- _bfd_error_handler (_("Invalid section index in ETIR"));
- return FALSE;
- }
-
- sec = PRIV (sections)[cur_psect];
- if (sec == bfd_abs_section_ptr)
- {
- _bfd_error_handler (_("Relocation for non-REL psect"));
- return FALSE;
- }
-
- vms_sec = vms_section_data (sec);
-
- /* Allocate a reloc entry. */
- if (sec->reloc_count >= vms_sec->reloc_max)
- {
- if (vms_sec->reloc_max == 0)
- {
- vms_sec->reloc_max = 64;
- sec->relocation = bfd_zmalloc
- (vms_sec->reloc_max * sizeof (arelent));
- }
- else
- {
- vms_sec->reloc_max *= 2;
- sec->relocation = bfd_realloc
- (sec->relocation, vms_sec->reloc_max * sizeof (arelent));
- }
- }
- reloc = &sec->relocation[sec->reloc_count];
- sec->reloc_count++;
-
- reloc->howto = bfd_reloc_type_lookup (abfd, reloc_code);
-
- if (cur_sym != NULL)
- {
- unsigned int j;
- unsigned int symlen = *cur_sym;
- asymbol **sym;
-
- /* Linear search. */
- symlen = *cur_sym;
- cur_sym++;
- sym = NULL;
-
- for (j = 0; j < PRIV (gsd_sym_count); j++)
- if (PRIV (syms)[j]->namelen == symlen
- && memcmp (PRIV (syms)[j]->name, cur_sym, symlen) == 0)
- {
- sym = &PRIV (csymbols)[j];
- break;
- }
- if (sym == NULL)
- {
- _bfd_error_handler (_("Unknown symbol in command %s"),
+ return FALSE;
+ }
+
+ {
+ asection *sec;
+ struct vms_section_data_struct *vms_sec;
+ arelent *reloc;
+ bfd_size_type size;
+
+ /* Get section to which the relocation applies. */
+ if (cur_psect < 0 || cur_psect > (int)PRIV (section_count))
+ {
+ _bfd_error_handler (_("invalid section index in ETIR"));
+ return FALSE;
+ }
+
+ if (PRIV (sections) == NULL)
+ return FALSE;
+ sec = PRIV (sections)[cur_psect];
+ if (sec == bfd_abs_section_ptr)
+ {
+ _bfd_error_handler (_("relocation for non-REL psect"));
+ return FALSE;
+ }
+
+ vms_sec = vms_section_data (sec);
+
+ /* Allocate a reloc entry. */
+ if (sec->reloc_count >= vms_sec->reloc_max)
+ {
+ if (vms_sec->reloc_max == 0)
+ {
+ vms_sec->reloc_max = 64;
+ sec->relocation = bfd_zmalloc
+ (vms_sec->reloc_max * sizeof (arelent));
+ }
+ else
+ {
+ vms_sec->reloc_max *= 2;
+ sec->relocation = bfd_realloc
+ (sec->relocation, vms_sec->reloc_max * sizeof (arelent));
+ }
+ }
+ reloc = &sec->relocation[sec->reloc_count];
+ sec->reloc_count++;
+
+ reloc->howto = bfd_reloc_type_lookup (abfd, reloc_code);
+
+ if (cur_sym != NULL)
+ {
+ unsigned int j;
+ unsigned int symlen = *cur_sym;
+ asymbol **sym;
+
+ /* Linear search. */
+ symlen = *cur_sym;
+ cur_sym++;
+ sym = NULL;
+
+ for (j = 0; j < PRIV (gsd_sym_count); j++)
+ if (PRIV (syms)[j]->namelen == symlen
+ && memcmp (PRIV (syms)[j]->name, cur_sym, symlen) == 0)
+ {
+ sym = &PRIV (csymbols)[j];
+ break;
+ }
+ if (sym == NULL)
+ {
+ _bfd_error_handler (_("unknown symbol in command %s"),
_bfd_vms_etir_name (cmd));
- reloc->sym_ptr_ptr = NULL;
- }
- else
- reloc->sym_ptr_ptr = sym;
- }
- else if (cur_psidx >= 0)
- reloc->sym_ptr_ptr =
- PRIV (sections)[cur_psidx]->symbol_ptr_ptr;
- else
- reloc->sym_ptr_ptr = NULL;
-
- reloc->address = cur_address;
- reloc->addend = cur_addend;
-
- vaddr += bfd_get_reloc_size (reloc->howto);
- }
-
- cur_addend = 0;
- prev_cmd = -1;
- cur_sym = NULL;
- cur_psidx = -1;
- }
+ reloc->sym_ptr_ptr = NULL;
+ }
+ else
+ reloc->sym_ptr_ptr = sym;
+ }
+ else if (cur_psidx >= 0)
+ {
+ if (PRIV (sections) == NULL || cur_psidx >= (int) PRIV (section_count))
+ return FALSE;
+ reloc->sym_ptr_ptr =
+ PRIV (sections)[cur_psidx]->symbol_ptr_ptr;
+ }
+ else
+ reloc->sym_ptr_ptr = NULL;
+
+ reloc->address = cur_address;
+ reloc->addend = cur_addend;
+
+ if (reloc_code == ALPHA_R_LINKAGE)
+ size = 16;
+ else
+ size = bfd_get_reloc_size (reloc->howto);
+ vaddr += size;
+ }
+
+ cur_addend = 0;
+ prev_cmd = -1;
+ cur_sym = NULL;
+ cur_psidx = -1;
+ }
}
vms_debug2 ((3, "alpha_vms_slurp_relocs: result = TRUE\n"));
static long
alpha_vms_canonicalize_reloc (bfd *abfd, asection *section, arelent **relptr,
- asymbol **symbols ATTRIBUTE_UNUSED)
+ asymbol **symbols ATTRIBUTE_UNUSED)
{
arelent *tblptr;
int count;
/* Hack. Linkage is done by linker. */
HOWTO (ALPHA_R_LINKAGE, /* Type. */
0, /* Rightshift. */
- 8, /* Size (0 = byte, 1 = short, 2 = long). */
- 256, /* Bitsize. */
+ 0, /* Size (0 = byte, 1 = short, 2 = long). */
+ 0, /* Bitsize. */
FALSE, /* PC relative. */
0, /* Bitpos. */
complain_overflow_dont,/* Complain_on_overflow. */
/* Return a pointer to a howto structure which, when invoked, will perform
the relocation code on data from the architecture noted. */
-static const struct reloc_howto_struct *
+static reloc_howto_type *
alpha_vms_bfd_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
- bfd_reloc_code_real_type code)
+ bfd_reloc_code_real_type code)
{
int alpha_type;
static reloc_howto_type *
alpha_vms_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
- const char *r_name)
+ const char *r_name)
{
unsigned int i;
\f
static long
alpha_vms_get_synthetic_symtab (bfd *abfd,
- long symcount ATTRIBUTE_UNUSED,
- asymbol **usyms ATTRIBUTE_UNUSED,
- long dynsymcount ATTRIBUTE_UNUSED,
- asymbol **dynsyms ATTRIBUTE_UNUSED,
- asymbol **ret)
+ long symcount ATTRIBUTE_UNUSED,
+ asymbol **usyms ATTRIBUTE_UNUSED,
+ long dynsymcount ATTRIBUTE_UNUSED,
+ asymbol **dynsyms ATTRIBUTE_UNUSED,
+ asymbol **ret)
{
asymbol *syms;
unsigned int i;
sec = NULL;
switch (e->typ)
- {
- case EGSD__C_SYM:
- case EGSD__C_SYMG:
- if ((e->flags & EGSY__V_DEF) && (e->flags & EGSY__V_NORM))
- {
- value = e->code_value;
- sec = e->code_section;
- }
- else
- continue;
- break;
-
- default:
- continue;
- }
+ {
+ case EGSD__C_SYM:
+ case EGSD__C_SYMG:
+ if ((e->flags & EGSY__V_DEF) && (e->flags & EGSY__V_NORM))
+ {
+ value = e->code_value;
+ sec = e->code_section;
+ }
+ else
+ continue;
+ break;
+
+ default:
+ continue;
+ }
l = strlen (name);
sname = bfd_alloc (abfd, l + 5);
if (sname == NULL)
- return FALSE;
+ return FALSE;
memcpy (sname, name, l);
memcpy (sname + l, "..en", 5);
{
struct vms_emh_common *emh = (struct vms_emh_common *)rec;
unsigned int subtype;
+ int extra;
- subtype = (unsigned)bfd_getl16 (emh->subtyp);
+ subtype = (unsigned) bfd_getl16 (emh->subtyp);
/* xgettext:c-format */
fprintf (file, _(" EMH %u (len=%u): "), subtype, rec_len);
+ /* PR 21618: Check for invalid lengths. */
+ if (rec_len < sizeof (* emh))
+ {
+ fprintf (file, _(" Error: The length is less than the length of an EMH record\n"));
+ return;
+ }
+ extra = rec_len - sizeof (struct vms_emh_common);
+
switch (subtype)
{
case EMH__C_MHD:
{
- struct vms_emh_mhd *mhd = (struct vms_emh_mhd *)rec;
- const char *name;
-
- fprintf (file, _("Module header\n"));
- fprintf (file, _(" structure level: %u\n"), mhd->strlvl);
- fprintf (file, _(" max record size: %u\n"),
- (unsigned)bfd_getl32 (mhd->recsiz));
- name = (char *)(mhd + 1);
- fprintf (file, _(" module name : %.*s\n"), name[0], name + 1);
- name += name[0] + 1;
- fprintf (file, _(" module version : %.*s\n"), name[0], name + 1);
- name += name[0] + 1;
- fprintf (file, _(" compile date : %.17s\n"), name);
+ struct vms_emh_mhd *mhd = (struct vms_emh_mhd *) rec;
+ const char * name;
+ const char * nextname;
+ const char * maxname;
+
+ /* PR 21840: Check for invalid lengths. */
+ if (rec_len < sizeof (* mhd))
+ {
+ fprintf (file, _(" Error: The record length is less than the size of an EMH_MHD record\n"));
+ return;
+ }
+ fprintf (file, _("Module header\n"));
+ fprintf (file, _(" structure level: %u\n"), mhd->strlvl);
+ fprintf (file, _(" max record size: %u\n"),
+ (unsigned) bfd_getl32 (mhd->recsiz));
+ name = (char *)(mhd + 1);
+ maxname = (char *) rec + rec_len;
+ if (name > maxname - 2)
+ {
+ fprintf (file, _(" Error: The module name is missing\n"));
+ return;
+ }
+ nextname = name + name[0] + 1;
+ if (nextname >= maxname)
+ {
+ fprintf (file, _(" Error: The module name is too long\n"));
+ return;
+ }
+ fprintf (file, _(" module name : %.*s\n"), name[0], name + 1);
+ name = nextname;
+ if (name > maxname - 2)
+ {
+ fprintf (file, _(" Error: The module version is missing\n"));
+ return;
+ }
+ nextname = name + name[0] + 1;
+ if (nextname >= maxname)
+ {
+ fprintf (file, _(" Error: The module version is too long\n"));
+ return;
+ }
+ fprintf (file, _(" module version : %.*s\n"), name[0], name + 1);
+ name = nextname;
+ if ((maxname - name) < 17 && maxname[-1] != 0)
+ fprintf (file, _(" Error: The compile date is truncated\n"));
+ else
+ fprintf (file, _(" compile date : %.17s\n"), name);
}
break;
+
case EMH__C_LNM:
- {
- fprintf (file, _("Language Processor Name\n"));
- fprintf (file, _(" language name: %.*s\n"),
- (int)(rec_len - sizeof (struct vms_emh_common)),
- (char *)rec + sizeof (struct vms_emh_common));
- }
+ fprintf (file, _("Language Processor Name\n"));
+ fprintf (file, _(" language name: %.*s\n"), extra, (char *)(emh + 1));
break;
+
case EMH__C_SRC:
- {
- fprintf (file, _("Source Files Header\n"));
- fprintf (file, _(" file: %.*s\n"),
- (int)(rec_len - sizeof (struct vms_emh_common)),
- (char *)rec + sizeof (struct vms_emh_common));
- }
+ fprintf (file, _("Source Files Header\n"));
+ fprintf (file, _(" file: %.*s\n"), extra, (char *)(emh + 1));
break;
+
case EMH__C_TTL:
- {
- fprintf (file, _("Title Text Header\n"));
- fprintf (file, _(" title: %.*s\n"),
- (int)(rec_len - sizeof (struct vms_emh_common)),
- (char *)rec + sizeof (struct vms_emh_common));
- }
+ fprintf (file, _("Title Text Header\n"));
+ fprintf (file, _(" title: %.*s\n"), extra, (char *)(emh + 1));
break;
+
case EMH__C_CPR:
- {
- fprintf (file, _("Copyright Header\n"));
- fprintf (file, _(" copyright: %.*s\n"),
- (int)(rec_len - sizeof (struct vms_emh_common)),
- (char *)rec + sizeof (struct vms_emh_common));
- }
+ fprintf (file, _("Copyright Header\n"));
+ fprintf (file, _(" copyright: %.*s\n"), extra, (char *)(emh + 1));
break;
+
default:
fprintf (file, _("unhandled emh subtype %u\n"), subtype);
break;
struct vms_eeom *eeom = (struct vms_eeom *)rec;
fprintf (file, _(" EEOM (len=%u):\n"), rec_len);
+
+ /* PR 21618: Check for invalid lengths. */
+ if (rec_len < sizeof (* eeom))
+ {
+ fprintf (file, _(" Error: The length is less than the length of an EEOM record\n"));
+ return;
+ }
+
fprintf (file, _(" number of cond linkage pairs: %u\n"),
- (unsigned)bfd_getl32 (eeom->total_lps));
+ (unsigned)bfd_getl32 (eeom->total_lps));
fprintf (file, _(" completion code: %u\n"),
- (unsigned)bfd_getl16 (eeom->comcod));
+ (unsigned)bfd_getl16 (eeom->comcod));
if (rec_len > 10)
{
fprintf (file, _(" transfer addr flags: 0x%02x\n"), eeom->tfrflg);
fprintf (file, _(" transfer addr psect: %u\n"),
- (unsigned)bfd_getl32 (eeom->psindx));
+ (unsigned)bfd_getl32 (eeom->psindx));
fprintf (file, _(" transfer address : 0x%08x\n"),
- (unsigned)bfd_getl32 (eeom->tfradr));
+ (unsigned)bfd_getl32 (eeom->tfradr));
}
}
/* xgettext:c-format */
fprintf (file, _(" EGSD entry %2u (type: %u, len: %u): "),
- n, type, len);
+ n, type, len);
n++;
+ if (off + len > rec_len || off + len < off)
+ {
+ fprintf (file, _(" Error: length larger than remaining space in record\n"));
+ return;
+ }
+
switch (type)
- {
- case EGSD__C_PSC:
- {
- struct vms_egps *egps = (struct vms_egps *)e;
- unsigned int flags = bfd_getl16 (egps->flags);
- unsigned int l;
-
- fprintf (file, _("PSC - Program section definition\n"));
- fprintf (file, _(" alignment : 2**%u\n"), egps->align);
- fprintf (file, _(" flags : 0x%04x"), flags);
- evax_bfd_print_egsd_flags (file, flags);
- fputc ('\n', file);
- l = bfd_getl32 (egps->alloc);
- fprintf (file, _(" alloc (len): %u (0x%08x)\n"), l, l);
- fprintf (file, _(" name : %.*s\n"),
- egps->namlng, egps->name);
- }
- break;
- case EGSD__C_SPSC:
- {
- struct vms_esgps *esgps = (struct vms_esgps *)e;
- unsigned int flags = bfd_getl16 (esgps->flags);
- unsigned int l;
-
- fprintf (file, _("SPSC - Shared Image Program section def\n"));
- fprintf (file, _(" alignment : 2**%u\n"), esgps->align);
- fprintf (file, _(" flags : 0x%04x"), flags);
- evax_bfd_print_egsd_flags (file, flags);
- fputc ('\n', file);
- l = bfd_getl32 (esgps->alloc);
- fprintf (file, _(" alloc (len) : %u (0x%08x)\n"), l, l);
- fprintf (file, _(" image offset : 0x%08x\n"),
- (unsigned int)bfd_getl32 (esgps->base));
- fprintf (file, _(" symvec offset : 0x%08x\n"),
- (unsigned int)bfd_getl32 (esgps->value));
- fprintf (file, _(" name : %.*s\n"),
- esgps->namlng, esgps->name);
- }
- break;
- case EGSD__C_SYM:
- {
- struct vms_egsy *egsy = (struct vms_egsy *)e;
- unsigned int flags = bfd_getl16 (egsy->flags);
-
- if (flags & EGSY__V_DEF)
- {
- struct vms_esdf *esdf = (struct vms_esdf *)e;
-
- fprintf (file, _("SYM - Global symbol definition\n"));
- fprintf (file, _(" flags: 0x%04x"), flags);
- exav_bfd_print_egsy_flags (flags, file);
- fputc ('\n', file);
- fprintf (file, _(" psect offset: 0x%08x\n"),
- (unsigned)bfd_getl32 (esdf->value));
- if (flags & EGSY__V_NORM)
- {
- fprintf (file, _(" code address: 0x%08x\n"),
- (unsigned)bfd_getl32 (esdf->code_address));
- fprintf (file, _(" psect index for entry point : %u\n"),
- (unsigned)bfd_getl32 (esdf->ca_psindx));
- }
- fprintf (file, _(" psect index : %u\n"),
- (unsigned)bfd_getl32 (esdf->psindx));
- fprintf (file, _(" name : %.*s\n"),
- esdf->namlng, esdf->name);
- }
- else
- {
- struct vms_esrf *esrf = (struct vms_esrf *)e;
-
- fprintf (file, _("SYM - Global symbol reference\n"));
- fprintf (file, _(" name : %.*s\n"),
- esrf->namlng, esrf->name);
- }
- }
- break;
- case EGSD__C_IDC:
- {
- struct vms_eidc *eidc = (struct vms_eidc *)e;
- unsigned int flags = bfd_getl32 (eidc->flags);
- unsigned char *p;
-
- fprintf (file, _("IDC - Ident Consistency check\n"));
- fprintf (file, _(" flags : 0x%08x"), flags);
- if (flags & EIDC__V_BINIDENT)
- fputs (" BINDENT", file);
- fputc ('\n', file);
- fprintf (file, _(" id match : %x\n"),
- (flags >> EIDC__V_IDMATCH_SH) & EIDC__V_IDMATCH_MASK);
- fprintf (file, _(" error severity: %x\n"),
- (flags >> EIDC__V_ERRSEV_SH) & EIDC__V_ERRSEV_MASK);
- p = eidc->name;
- fprintf (file, _(" entity name : %.*s\n"), p[0], p + 1);
- p += 1 + p[0];
- fprintf (file, _(" object name : %.*s\n"), p[0], p + 1);
- p += 1 + p[0];
- if (flags & EIDC__V_BINIDENT)
- fprintf (file, _(" binary ident : 0x%08x\n"),
- (unsigned)bfd_getl32 (p + 1));
- else
- fprintf (file, _(" ascii ident : %.*s\n"), p[0], p + 1);
- }
- break;
- case EGSD__C_SYMG:
- {
- struct vms_egst *egst = (struct vms_egst *)e;
- unsigned int flags = bfd_getl16 (egst->header.flags);
-
- fprintf (file, _("SYMG - Universal symbol definition\n"));
- fprintf (file, _(" flags: 0x%04x"), flags);
- exav_bfd_print_egsy_flags (flags, file);
- fputc ('\n', file);
- fprintf (file, _(" symbol vector offset: 0x%08x\n"),
- (unsigned)bfd_getl32 (egst->value));
- fprintf (file, _(" entry point: 0x%08x\n"),
- (unsigned)bfd_getl32 (egst->lp_1));
- fprintf (file, _(" proc descr : 0x%08x\n"),
- (unsigned)bfd_getl32 (egst->lp_2));
- fprintf (file, _(" psect index: %u\n"),
- (unsigned)bfd_getl32 (egst->psindx));
- fprintf (file, _(" name : %.*s\n"),
- egst->namlng, egst->name);
- }
- break;
- case EGSD__C_SYMV:
- {
- struct vms_esdfv *esdfv = (struct vms_esdfv *)e;
- unsigned int flags = bfd_getl16 (esdfv->flags);
-
- fprintf (file, _("SYMV - Vectored symbol definition\n"));
- fprintf (file, _(" flags: 0x%04x"), flags);
- exav_bfd_print_egsy_flags (flags, file);
- fputc ('\n', file);
- fprintf (file, _(" vector : 0x%08x\n"),
- (unsigned)bfd_getl32 (esdfv->vector));
- fprintf (file, _(" psect offset: %u\n"),
- (unsigned)bfd_getl32 (esdfv->value));
- fprintf (file, _(" psect index : %u\n"),
- (unsigned)bfd_getl32 (esdfv->psindx));
- fprintf (file, _(" name : %.*s\n"),
- esdfv->namlng, esdfv->name);
- }
- break;
- case EGSD__C_SYMM:
- {
- struct vms_esdfm *esdfm = (struct vms_esdfm *)e;
- unsigned int flags = bfd_getl16 (esdfm->flags);
-
- fprintf (file, _("SYMM - Global symbol definition with version\n"));
- fprintf (file, _(" flags: 0x%04x"), flags);
- exav_bfd_print_egsy_flags (flags, file);
- fputc ('\n', file);
- fprintf (file, _(" version mask: 0x%08x\n"),
- (unsigned)bfd_getl32 (esdfm->version_mask));
- fprintf (file, _(" psect offset: %u\n"),
- (unsigned)bfd_getl32 (esdfm->value));
- fprintf (file, _(" psect index : %u\n"),
- (unsigned)bfd_getl32 (esdfm->psindx));
- fprintf (file, _(" name : %.*s\n"),
- esdfm->namlng, esdfm->name);
- }
- break;
- default:
- fprintf (file, _("unhandled egsd entry type %u\n"), type);
- break;
- }
+ {
+ case EGSD__C_PSC:
+ {
+ struct vms_egps *egps = (struct vms_egps *)e;
+ unsigned int flags = bfd_getl16 (egps->flags);
+ unsigned int l;
+
+ fprintf (file, _("PSC - Program section definition\n"));
+ fprintf (file, _(" alignment : 2**%u\n"), egps->align);
+ fprintf (file, _(" flags : 0x%04x"), flags);
+ evax_bfd_print_egsd_flags (file, flags);
+ fputc ('\n', file);
+ l = bfd_getl32 (egps->alloc);
+ fprintf (file, _(" alloc (len): %u (0x%08x)\n"), l, l);
+ fprintf (file, _(" name : %.*s\n"),
+ egps->namlng, egps->name);
+ }
+ break;
+ case EGSD__C_SPSC:
+ {
+ struct vms_esgps *esgps = (struct vms_esgps *)e;
+ unsigned int flags = bfd_getl16 (esgps->flags);
+ unsigned int l;
+
+ fprintf (file, _("SPSC - Shared Image Program section def\n"));
+ fprintf (file, _(" alignment : 2**%u\n"), esgps->align);
+ fprintf (file, _(" flags : 0x%04x"), flags);
+ evax_bfd_print_egsd_flags (file, flags);
+ fputc ('\n', file);
+ l = bfd_getl32 (esgps->alloc);
+ fprintf (file, _(" alloc (len) : %u (0x%08x)\n"), l, l);
+ fprintf (file, _(" image offset : 0x%08x\n"),
+ (unsigned int)bfd_getl32 (esgps->base));
+ fprintf (file, _(" symvec offset : 0x%08x\n"),
+ (unsigned int)bfd_getl32 (esgps->value));
+ fprintf (file, _(" name : %.*s\n"),
+ esgps->namlng, esgps->name);
+ }
+ break;
+ case EGSD__C_SYM:
+ {
+ struct vms_egsy *egsy = (struct vms_egsy *)e;
+ unsigned int flags = bfd_getl16 (egsy->flags);
+
+ if (flags & EGSY__V_DEF)
+ {
+ struct vms_esdf *esdf = (struct vms_esdf *)e;
+
+ fprintf (file, _("SYM - Global symbol definition\n"));
+ fprintf (file, _(" flags: 0x%04x"), flags);
+ exav_bfd_print_egsy_flags (flags, file);
+ fputc ('\n', file);
+ fprintf (file, _(" psect offset: 0x%08x\n"),
+ (unsigned)bfd_getl32 (esdf->value));
+ if (flags & EGSY__V_NORM)
+ {
+ fprintf (file, _(" code address: 0x%08x\n"),
+ (unsigned)bfd_getl32 (esdf->code_address));
+ fprintf (file, _(" psect index for entry point : %u\n"),
+ (unsigned)bfd_getl32 (esdf->ca_psindx));
+ }
+ fprintf (file, _(" psect index : %u\n"),
+ (unsigned)bfd_getl32 (esdf->psindx));
+ fprintf (file, _(" name : %.*s\n"),
+ esdf->namlng, esdf->name);
+ }
+ else
+ {
+ struct vms_esrf *esrf = (struct vms_esrf *)e;
+
+ fprintf (file, _("SYM - Global symbol reference\n"));
+ fprintf (file, _(" name : %.*s\n"),
+ esrf->namlng, esrf->name);
+ }
+ }
+ break;
+ case EGSD__C_IDC:
+ {
+ struct vms_eidc *eidc = (struct vms_eidc *)e;
+ unsigned int flags = bfd_getl32 (eidc->flags);
+ unsigned char *p;
+
+ fprintf (file, _("IDC - Ident Consistency check\n"));
+ fprintf (file, _(" flags : 0x%08x"), flags);
+ if (flags & EIDC__V_BINIDENT)
+ fputs (" BINDENT", file);
+ fputc ('\n', file);
+ fprintf (file, _(" id match : %x\n"),
+ (flags >> EIDC__V_IDMATCH_SH) & EIDC__V_IDMATCH_MASK);
+ fprintf (file, _(" error severity: %x\n"),
+ (flags >> EIDC__V_ERRSEV_SH) & EIDC__V_ERRSEV_MASK);
+ p = eidc->name;
+ fprintf (file, _(" entity name : %.*s\n"), p[0], p + 1);
+ p += 1 + p[0];
+ fprintf (file, _(" object name : %.*s\n"), p[0], p + 1);
+ p += 1 + p[0];
+ if (flags & EIDC__V_BINIDENT)
+ fprintf (file, _(" binary ident : 0x%08x\n"),
+ (unsigned)bfd_getl32 (p + 1));
+ else
+ fprintf (file, _(" ascii ident : %.*s\n"), p[0], p + 1);
+ }
+ break;
+ case EGSD__C_SYMG:
+ {
+ struct vms_egst *egst = (struct vms_egst *)e;
+ unsigned int flags = bfd_getl16 (egst->header.flags);
+
+ fprintf (file, _("SYMG - Universal symbol definition\n"));
+ fprintf (file, _(" flags: 0x%04x"), flags);
+ exav_bfd_print_egsy_flags (flags, file);
+ fputc ('\n', file);
+ fprintf (file, _(" symbol vector offset: 0x%08x\n"),
+ (unsigned)bfd_getl32 (egst->value));
+ fprintf (file, _(" entry point: 0x%08x\n"),
+ (unsigned)bfd_getl32 (egst->lp_1));
+ fprintf (file, _(" proc descr : 0x%08x\n"),
+ (unsigned)bfd_getl32 (egst->lp_2));
+ fprintf (file, _(" psect index: %u\n"),
+ (unsigned)bfd_getl32 (egst->psindx));
+ fprintf (file, _(" name : %.*s\n"),
+ egst->namlng, egst->name);
+ }
+ break;
+ case EGSD__C_SYMV:
+ {
+ struct vms_esdfv *esdfv = (struct vms_esdfv *)e;
+ unsigned int flags = bfd_getl16 (esdfv->flags);
+
+ fprintf (file, _("SYMV - Vectored symbol definition\n"));
+ fprintf (file, _(" flags: 0x%04x"), flags);
+ exav_bfd_print_egsy_flags (flags, file);
+ fputc ('\n', file);
+ fprintf (file, _(" vector : 0x%08x\n"),
+ (unsigned)bfd_getl32 (esdfv->vector));
+ fprintf (file, _(" psect offset: %u\n"),
+ (unsigned)bfd_getl32 (esdfv->value));
+ fprintf (file, _(" psect index : %u\n"),
+ (unsigned)bfd_getl32 (esdfv->psindx));
+ fprintf (file, _(" name : %.*s\n"),
+ esdfv->namlng, esdfv->name);
+ }
+ break;
+ case EGSD__C_SYMM:
+ {
+ struct vms_esdfm *esdfm = (struct vms_esdfm *)e;
+ unsigned int flags = bfd_getl16 (esdfm->flags);
+
+ fprintf (file, _("SYMM - Global symbol definition with version\n"));
+ fprintf (file, _(" flags: 0x%04x"), flags);
+ exav_bfd_print_egsy_flags (flags, file);
+ fputc ('\n', file);
+ fprintf (file, _(" version mask: 0x%08x\n"),
+ (unsigned)bfd_getl32 (esdfm->version_mask));
+ fprintf (file, _(" psect offset: %u\n"),
+ (unsigned)bfd_getl32 (esdfm->value));
+ fprintf (file, _(" psect index : %u\n"),
+ (unsigned)bfd_getl32 (esdfm->psindx));
+ fprintf (file, _(" name : %.*s\n"),
+ esdfm->namlng, esdfm->name);
+ }
+ break;
+ default:
+ fprintf (file, _("unhandled egsd entry type %u\n"), type);
+ break;
+ }
off += len;
}
}
static void
evax_bfd_print_hex (FILE *file, const char *pfx,
- const unsigned char *buf, unsigned int len)
+ const unsigned char *buf, unsigned int len)
{
unsigned int i;
unsigned int n;
for (i = 0; i < len; i++)
{
if (n == 0)
- fputs (pfx, file);
+ fputs (pfx, file);
fprintf (file, " %02x", buf[i]);
n++;
if (n == 16)
- {
- n = 0;
- fputc ('\n', file);
- }
+ {
+ n = 0;
+ fputc ('\n', file);
+ }
}
if (n != 0)
fputc ('\n', file);
{
/* xgettext:c-format */
fprintf (file, _(" linkage index: %u, replacement insn: 0x%08x\n"),
- (unsigned)bfd_getl32 (buf),
- (unsigned)bfd_getl32 (buf + 16));
+ (unsigned)bfd_getl32 (buf),
+ (unsigned)bfd_getl32 (buf + 16));
/* xgettext:c-format */
fprintf (file, _(" psect idx 1: %u, offset 1: 0x%08x %08x\n"),
- (unsigned)bfd_getl32 (buf + 4),
- (unsigned)bfd_getl32 (buf + 12),
- (unsigned)bfd_getl32 (buf + 8));
+ (unsigned)bfd_getl32 (buf + 4),
+ (unsigned)bfd_getl32 (buf + 12),
+ (unsigned)bfd_getl32 (buf + 8));
/* xgettext:c-format */
fprintf (file, _(" psect idx 2: %u, offset 2: 0x%08x %08x\n"),
- (unsigned)bfd_getl32 (buf + 20),
- (unsigned)bfd_getl32 (buf + 28),
- (unsigned)bfd_getl32 (buf + 24));
+ (unsigned)bfd_getl32 (buf + 20),
+ (unsigned)bfd_getl32 (buf + 28),
+ (unsigned)bfd_getl32 (buf + 24));
if (is_ps)
/* xgettext:c-format */
fprintf (file, _(" psect idx 3: %u, offset 3: 0x%08x %08x\n"),
- (unsigned)bfd_getl32 (buf + 32),
- (unsigned)bfd_getl32 (buf + 40),
- (unsigned)bfd_getl32 (buf + 36));
+ (unsigned)bfd_getl32 (buf + 32),
+ (unsigned)bfd_getl32 (buf + 40),
+ (unsigned)bfd_getl32 (buf + 36));
else
fprintf (file, _(" global name: %.*s\n"), buf[32], buf + 33);
}
static void
evax_bfd_print_etir (FILE *file, const char *name,
- unsigned char *rec, unsigned int rec_len)
+ unsigned char *rec, unsigned int rec_len)
{
unsigned int off = sizeof (struct vms_egsd);
unsigned int sec_len = 0;
/* xgettext:c-format */
fprintf (file, _(" %s (len=%u+%u):\n"), name,
- (unsigned)(rec_len - sizeof (struct vms_eobjrec)),
- (unsigned)sizeof (struct vms_eobjrec));
+ (unsigned)(rec_len - sizeof (struct vms_eobjrec)),
+ (unsigned)sizeof (struct vms_eobjrec));
for (off = sizeof (struct vms_eobjrec); off < rec_len; )
{
size = bfd_getl16 (etir->size);
buf = rec + off + sizeof (struct vms_etir);
+ if (off + size > rec_len || off + size < off)
+ {
+ fprintf (file, _(" Error: length larger than remaining space in record\n"));
+ return;
+ }
+
/* xgettext:c-format */
fprintf (file, _(" (type: %3u, size: 4+%3u): "), type, size - 4);
switch (type)
- {
- case ETIR__C_STA_GBL:
- fprintf (file, _("STA_GBL (stack global) %.*s\n"),
- buf[0], buf + 1);
- break;
- case ETIR__C_STA_LW:
- fprintf (file, _("STA_LW (stack longword) 0x%08x\n"),
- (unsigned)bfd_getl32 (buf));
- break;
- case ETIR__C_STA_QW:
- fprintf (file, _("STA_QW (stack quadword) 0x%08x %08x\n"),
- (unsigned)bfd_getl32 (buf + 4),
- (unsigned)bfd_getl32 (buf + 0));
- break;
- case ETIR__C_STA_PQ:
- fprintf (file, _("STA_PQ (stack psect base + offset)\n"));
+ {
+ case ETIR__C_STA_GBL:
+ fprintf (file, _("STA_GBL (stack global) %.*s\n"),
+ buf[0], buf + 1);
+ break;
+ case ETIR__C_STA_LW:
+ fprintf (file, _("STA_LW (stack longword) 0x%08x\n"),
+ (unsigned)bfd_getl32 (buf));
+ break;
+ case ETIR__C_STA_QW:
+ fprintf (file, _("STA_QW (stack quadword) 0x%08x %08x\n"),
+ (unsigned)bfd_getl32 (buf + 4),
+ (unsigned)bfd_getl32 (buf + 0));
+ break;
+ case ETIR__C_STA_PQ:
+ fprintf (file, _("STA_PQ (stack psect base + offset)\n"));
/* xgettext:c-format */
- fprintf (file, _(" psect: %u, offset: 0x%08x %08x\n"),
- (unsigned)bfd_getl32 (buf + 0),
- (unsigned)bfd_getl32 (buf + 8),
- (unsigned)bfd_getl32 (buf + 4));
- break;
- case ETIR__C_STA_LI:
- fprintf (file, _("STA_LI (stack literal)\n"));
- break;
- case ETIR__C_STA_MOD:
- fprintf (file, _("STA_MOD (stack module)\n"));
- break;
- case ETIR__C_STA_CKARG:
- fprintf (file, _("STA_CKARG (compare procedure argument)\n"));
- break;
-
- case ETIR__C_STO_B:
- fprintf (file, _("STO_B (store byte)\n"));
- break;
- case ETIR__C_STO_W:
- fprintf (file, _("STO_W (store word)\n"));
- break;
- case ETIR__C_STO_LW:
- fprintf (file, _("STO_LW (store longword)\n"));
- break;
- case ETIR__C_STO_QW:
- fprintf (file, _("STO_QW (store quadword)\n"));
- break;
- case ETIR__C_STO_IMMR:
- {
- unsigned int len = bfd_getl32 (buf);
- fprintf (file,
- _("STO_IMMR (store immediate repeat) %u bytes\n"),
- len);
- evax_bfd_print_hex (file, " ", buf + 4, len);
- sec_len += len;
- }
- break;
- case ETIR__C_STO_GBL:
- fprintf (file, _("STO_GBL (store global) %.*s\n"),
- buf[0], buf + 1);
- break;
- case ETIR__C_STO_CA:
- fprintf (file, _("STO_CA (store code address) %.*s\n"),
- buf[0], buf + 1);
- break;
- case ETIR__C_STO_RB:
- fprintf (file, _("STO_RB (store relative branch)\n"));
- break;
- case ETIR__C_STO_AB:
- fprintf (file, _("STO_AB (store absolute branch)\n"));
- break;
- case ETIR__C_STO_OFF:
- fprintf (file, _("STO_OFF (store offset to psect)\n"));
- break;
- case ETIR__C_STO_IMM:
- {
- unsigned int len = bfd_getl32 (buf);
- fprintf (file,
- _("STO_IMM (store immediate) %u bytes\n"),
- len);
- evax_bfd_print_hex (file, " ", buf + 4, len);
- sec_len += len;
- }
- break;
- case ETIR__C_STO_GBL_LW:
- fprintf (file, _("STO_GBL_LW (store global longword) %.*s\n"),
- buf[0], buf + 1);
- break;
- case ETIR__C_STO_LP_PSB:
- fprintf (file, _("STO_OFF (store LP with procedure signature)\n"));
- break;
- case ETIR__C_STO_HINT_GBL:
- fprintf (file, _("STO_BR_GBL (store branch global) *todo*\n"));
- break;
- case ETIR__C_STO_HINT_PS:
- fprintf (file, _("STO_BR_PS (store branch psect + offset) *todo*\n"));
- break;
-
- case ETIR__C_OPR_NOP:
- fprintf (file, _("OPR_NOP (no-operation)\n"));
- break;
- case ETIR__C_OPR_ADD:
- fprintf (file, _("OPR_ADD (add)\n"));
- break;
- case ETIR__C_OPR_SUB:
- fprintf (file, _("OPR_SUB (substract)\n"));
- break;
- case ETIR__C_OPR_MUL:
- fprintf (file, _("OPR_MUL (multiply)\n"));
- break;
- case ETIR__C_OPR_DIV:
- fprintf (file, _("OPR_DIV (divide)\n"));
- break;
- case ETIR__C_OPR_AND:
- fprintf (file, _("OPR_AND (logical and)\n"));
- break;
- case ETIR__C_OPR_IOR:
- fprintf (file, _("OPR_IOR (logical inclusive or)\n"));
- break;
- case ETIR__C_OPR_EOR:
- fprintf (file, _("OPR_EOR (logical exclusive or)\n"));
- break;
- case ETIR__C_OPR_NEG:
- fprintf (file, _("OPR_NEG (negate)\n"));
- break;
- case ETIR__C_OPR_COM:
- fprintf (file, _("OPR_COM (complement)\n"));
- break;
- case ETIR__C_OPR_INSV:
- fprintf (file, _("OPR_INSV (insert field)\n"));
- break;
- case ETIR__C_OPR_ASH:
- fprintf (file, _("OPR_ASH (arithmetic shift)\n"));
- break;
- case ETIR__C_OPR_USH:
- fprintf (file, _("OPR_USH (unsigned shift)\n"));
- break;
- case ETIR__C_OPR_ROT:
- fprintf (file, _("OPR_ROT (rotate)\n"));
- break;
- case ETIR__C_OPR_SEL:
- fprintf (file, _("OPR_SEL (select)\n"));
- break;
- case ETIR__C_OPR_REDEF:
- fprintf (file, _("OPR_REDEF (redefine symbol to curr location)\n"));
- break;
- case ETIR__C_OPR_DFLIT:
- fprintf (file, _("OPR_REDEF (define a literal)\n"));
- break;
-
- case ETIR__C_STC_LP:
- fprintf (file, _("STC_LP (store cond linkage pair)\n"));
- break;
- case ETIR__C_STC_LP_PSB:
- fprintf (file,
- _("STC_LP_PSB (store cond linkage pair + signature)\n"));
+ fprintf (file, _(" psect: %u, offset: 0x%08x %08x\n"),
+ (unsigned)bfd_getl32 (buf + 0),
+ (unsigned)bfd_getl32 (buf + 8),
+ (unsigned)bfd_getl32 (buf + 4));
+ break;
+ case ETIR__C_STA_LI:
+ fprintf (file, _("STA_LI (stack literal)\n"));
+ break;
+ case ETIR__C_STA_MOD:
+ fprintf (file, _("STA_MOD (stack module)\n"));
+ break;
+ case ETIR__C_STA_CKARG:
+ fprintf (file, _("STA_CKARG (compare procedure argument)\n"));
+ break;
+
+ case ETIR__C_STO_B:
+ fprintf (file, _("STO_B (store byte)\n"));
+ break;
+ case ETIR__C_STO_W:
+ fprintf (file, _("STO_W (store word)\n"));
+ break;
+ case ETIR__C_STO_LW:
+ fprintf (file, _("STO_LW (store longword)\n"));
+ break;
+ case ETIR__C_STO_QW:
+ fprintf (file, _("STO_QW (store quadword)\n"));
+ break;
+ case ETIR__C_STO_IMMR:
+ {
+ unsigned int len = bfd_getl32 (buf);
+ fprintf (file,
+ _("STO_IMMR (store immediate repeat) %u bytes\n"),
+ len);
+ evax_bfd_print_hex (file, " ", buf + 4, len);
+ sec_len += len;
+ }
+ break;
+ case ETIR__C_STO_GBL:
+ fprintf (file, _("STO_GBL (store global) %.*s\n"),
+ buf[0], buf + 1);
+ break;
+ case ETIR__C_STO_CA:
+ fprintf (file, _("STO_CA (store code address) %.*s\n"),
+ buf[0], buf + 1);
+ break;
+ case ETIR__C_STO_RB:
+ fprintf (file, _("STO_RB (store relative branch)\n"));
+ break;
+ case ETIR__C_STO_AB:
+ fprintf (file, _("STO_AB (store absolute branch)\n"));
+ break;
+ case ETIR__C_STO_OFF:
+ fprintf (file, _("STO_OFF (store offset to psect)\n"));
+ break;
+ case ETIR__C_STO_IMM:
+ {
+ unsigned int len = bfd_getl32 (buf);
+ fprintf (file,
+ _("STO_IMM (store immediate) %u bytes\n"),
+ len);
+ evax_bfd_print_hex (file, " ", buf + 4, len);
+ sec_len += len;
+ }
+ break;
+ case ETIR__C_STO_GBL_LW:
+ fprintf (file, _("STO_GBL_LW (store global longword) %.*s\n"),
+ buf[0], buf + 1);
+ break;
+ case ETIR__C_STO_LP_PSB:
+ fprintf (file, _("STO_OFF (store LP with procedure signature)\n"));
+ break;
+ case ETIR__C_STO_HINT_GBL:
+ fprintf (file, _("STO_BR_GBL (store branch global) *todo*\n"));
+ break;
+ case ETIR__C_STO_HINT_PS:
+ fprintf (file, _("STO_BR_PS (store branch psect + offset) *todo*\n"));
+ break;
+
+ case ETIR__C_OPR_NOP:
+ fprintf (file, _("OPR_NOP (no-operation)\n"));
+ break;
+ case ETIR__C_OPR_ADD:
+ fprintf (file, _("OPR_ADD (add)\n"));
+ break;
+ case ETIR__C_OPR_SUB:
+ fprintf (file, _("OPR_SUB (subtract)\n"));
+ break;
+ case ETIR__C_OPR_MUL:
+ fprintf (file, _("OPR_MUL (multiply)\n"));
+ break;
+ case ETIR__C_OPR_DIV:
+ fprintf (file, _("OPR_DIV (divide)\n"));
+ break;
+ case ETIR__C_OPR_AND:
+ fprintf (file, _("OPR_AND (logical and)\n"));
+ break;
+ case ETIR__C_OPR_IOR:
+ fprintf (file, _("OPR_IOR (logical inclusive or)\n"));
+ break;
+ case ETIR__C_OPR_EOR:
+ fprintf (file, _("OPR_EOR (logical exclusive or)\n"));
+ break;
+ case ETIR__C_OPR_NEG:
+ fprintf (file, _("OPR_NEG (negate)\n"));
+ break;
+ case ETIR__C_OPR_COM:
+ fprintf (file, _("OPR_COM (complement)\n"));
+ break;
+ case ETIR__C_OPR_INSV:
+ fprintf (file, _("OPR_INSV (insert field)\n"));
+ break;
+ case ETIR__C_OPR_ASH:
+ fprintf (file, _("OPR_ASH (arithmetic shift)\n"));
+ break;
+ case ETIR__C_OPR_USH:
+ fprintf (file, _("OPR_USH (unsigned shift)\n"));
+ break;
+ case ETIR__C_OPR_ROT:
+ fprintf (file, _("OPR_ROT (rotate)\n"));
+ break;
+ case ETIR__C_OPR_SEL:
+ fprintf (file, _("OPR_SEL (select)\n"));
+ break;
+ case ETIR__C_OPR_REDEF:
+ fprintf (file, _("OPR_REDEF (redefine symbol to curr location)\n"));
+ break;
+ case ETIR__C_OPR_DFLIT:
+ fprintf (file, _("OPR_REDEF (define a literal)\n"));
+ break;
+
+ case ETIR__C_STC_LP:
+ fprintf (file, _("STC_LP (store cond linkage pair)\n"));
+ break;
+ case ETIR__C_STC_LP_PSB:
+ fprintf (file,
+ _("STC_LP_PSB (store cond linkage pair + signature)\n"));
/* xgettext:c-format */
- fprintf (file, _(" linkage index: %u, procedure: %.*s\n"),
- (unsigned)bfd_getl32 (buf), buf[4], buf + 5);
- buf += 4 + 1 + buf[4];
- fprintf (file, _(" signature: %.*s\n"), buf[0], buf + 1);
- break;
- case ETIR__C_STC_GBL:
- fprintf (file, _("STC_GBL (store cond global)\n"));
+ fprintf (file, _(" linkage index: %u, procedure: %.*s\n"),
+ (unsigned)bfd_getl32 (buf), buf[4], buf + 5);
+ buf += 4 + 1 + buf[4];
+ fprintf (file, _(" signature: %.*s\n"), buf[0], buf + 1);
+ break;
+ case ETIR__C_STC_GBL:
+ fprintf (file, _("STC_GBL (store cond global)\n"));
/* xgettext:c-format */
- fprintf (file, _(" linkage index: %u, global: %.*s\n"),
- (unsigned)bfd_getl32 (buf), buf[4], buf + 5);
- break;
- case ETIR__C_STC_GCA:
- fprintf (file, _("STC_GCA (store cond code address)\n"));
+ fprintf (file, _(" linkage index: %u, global: %.*s\n"),
+ (unsigned)bfd_getl32 (buf), buf[4], buf + 5);
+ break;
+ case ETIR__C_STC_GCA:
+ fprintf (file, _("STC_GCA (store cond code address)\n"));
/* xgettext:c-format */
- fprintf (file, _(" linkage index: %u, procedure name: %.*s\n"),
- (unsigned)bfd_getl32 (buf), buf[4], buf + 5);
- break;
- case ETIR__C_STC_PS:
- fprintf (file, _("STC_PS (store cond psect + offset)\n"));
- fprintf (file,
+ fprintf (file, _(" linkage index: %u, procedure name: %.*s\n"),
+ (unsigned)bfd_getl32 (buf), buf[4], buf + 5);
+ break;
+ case ETIR__C_STC_PS:
+ fprintf (file, _("STC_PS (store cond psect + offset)\n"));
+ fprintf (file,
/* xgettext:c-format */
- _(" linkage index: %u, psect: %u, offset: 0x%08x %08x\n"),
- (unsigned)bfd_getl32 (buf),
- (unsigned)bfd_getl32 (buf + 4),
- (unsigned)bfd_getl32 (buf + 12),
- (unsigned)bfd_getl32 (buf + 8));
- break;
- case ETIR__C_STC_NOP_GBL:
- fprintf (file, _("STC_NOP_GBL (store cond NOP at global addr)\n"));
- evax_bfd_print_etir_stc_ir (file, buf, 0);
- break;
- case ETIR__C_STC_NOP_PS:
- fprintf (file, _("STC_NOP_PS (store cond NOP at psect + offset)\n"));
- evax_bfd_print_etir_stc_ir (file, buf, 1);
- break;
- case ETIR__C_STC_BSR_GBL:
- fprintf (file, _("STC_BSR_GBL (store cond BSR at global addr)\n"));
- evax_bfd_print_etir_stc_ir (file, buf, 0);
- break;
- case ETIR__C_STC_BSR_PS:
- fprintf (file, _("STC_BSR_PS (store cond BSR at psect + offset)\n"));
- evax_bfd_print_etir_stc_ir (file, buf, 1);
- break;
- case ETIR__C_STC_LDA_GBL:
- fprintf (file, _("STC_LDA_GBL (store cond LDA at global addr)\n"));
- evax_bfd_print_etir_stc_ir (file, buf, 0);
- break;
- case ETIR__C_STC_LDA_PS:
- fprintf (file, _("STC_LDA_PS (store cond LDA at psect + offset)\n"));
- evax_bfd_print_etir_stc_ir (file, buf, 1);
- break;
- case ETIR__C_STC_BOH_GBL:
- fprintf (file, _("STC_BOH_GBL (store cond BOH at global addr)\n"));
- evax_bfd_print_etir_stc_ir (file, buf, 0);
- break;
- case ETIR__C_STC_BOH_PS:
- fprintf (file, _("STC_BOH_PS (store cond BOH at psect + offset)\n"));
- evax_bfd_print_etir_stc_ir (file, buf, 1);
- break;
- case ETIR__C_STC_NBH_GBL:
- fprintf (file,
- _("STC_NBH_GBL (store cond or hint at global addr)\n"));
- break;
- case ETIR__C_STC_NBH_PS:
- fprintf (file,
- _("STC_NBH_PS (store cond or hint at psect + offset)\n"));
- break;
-
- case ETIR__C_CTL_SETRB:
- fprintf (file, _("CTL_SETRB (set relocation base)\n"));
- sec_len += 4;
- break;
- case ETIR__C_CTL_AUGRB:
- {
- unsigned int val = bfd_getl32 (buf);
- fprintf (file, _("CTL_AUGRB (augment relocation base) %u\n"), val);
- }
- break;
- case ETIR__C_CTL_DFLOC:
- fprintf (file, _("CTL_DFLOC (define location)\n"));
- break;
- case ETIR__C_CTL_STLOC:
- fprintf (file, _("CTL_STLOC (set location)\n"));
- break;
- case ETIR__C_CTL_STKDL:
- fprintf (file, _("CTL_STKDL (stack defined location)\n"));
- break;
- default:
- fprintf (file, _("*unhandled*\n"));
- break;
- }
+ _(" linkage index: %u, psect: %u, offset: 0x%08x %08x\n"),
+ (unsigned)bfd_getl32 (buf),
+ (unsigned)bfd_getl32 (buf + 4),
+ (unsigned)bfd_getl32 (buf + 12),
+ (unsigned)bfd_getl32 (buf + 8));
+ break;
+ case ETIR__C_STC_NOP_GBL:
+ fprintf (file, _("STC_NOP_GBL (store cond NOP at global addr)\n"));
+ evax_bfd_print_etir_stc_ir (file, buf, 0);
+ break;
+ case ETIR__C_STC_NOP_PS:
+ fprintf (file, _("STC_NOP_PS (store cond NOP at psect + offset)\n"));
+ evax_bfd_print_etir_stc_ir (file, buf, 1);
+ break;
+ case ETIR__C_STC_BSR_GBL:
+ fprintf (file, _("STC_BSR_GBL (store cond BSR at global addr)\n"));
+ evax_bfd_print_etir_stc_ir (file, buf, 0);
+ break;
+ case ETIR__C_STC_BSR_PS:
+ fprintf (file, _("STC_BSR_PS (store cond BSR at psect + offset)\n"));
+ evax_bfd_print_etir_stc_ir (file, buf, 1);
+ break;
+ case ETIR__C_STC_LDA_GBL:
+ fprintf (file, _("STC_LDA_GBL (store cond LDA at global addr)\n"));
+ evax_bfd_print_etir_stc_ir (file, buf, 0);
+ break;
+ case ETIR__C_STC_LDA_PS:
+ fprintf (file, _("STC_LDA_PS (store cond LDA at psect + offset)\n"));
+ evax_bfd_print_etir_stc_ir (file, buf, 1);
+ break;
+ case ETIR__C_STC_BOH_GBL:
+ fprintf (file, _("STC_BOH_GBL (store cond BOH at global addr)\n"));
+ evax_bfd_print_etir_stc_ir (file, buf, 0);
+ break;
+ case ETIR__C_STC_BOH_PS:
+ fprintf (file, _("STC_BOH_PS (store cond BOH at psect + offset)\n"));
+ evax_bfd_print_etir_stc_ir (file, buf, 1);
+ break;
+ case ETIR__C_STC_NBH_GBL:
+ fprintf (file,
+ _("STC_NBH_GBL (store cond or hint at global addr)\n"));
+ break;
+ case ETIR__C_STC_NBH_PS:
+ fprintf (file,
+ _("STC_NBH_PS (store cond or hint at psect + offset)\n"));
+ break;
+
+ case ETIR__C_CTL_SETRB:
+ fprintf (file, _("CTL_SETRB (set relocation base)\n"));
+ sec_len += 4;
+ break;
+ case ETIR__C_CTL_AUGRB:
+ {
+ unsigned int val = bfd_getl32 (buf);
+ fprintf (file, _("CTL_AUGRB (augment relocation base) %u\n"), val);
+ }
+ break;
+ case ETIR__C_CTL_DFLOC:
+ fprintf (file, _("CTL_DFLOC (define location)\n"));
+ break;
+ case ETIR__C_CTL_STLOC:
+ fprintf (file, _("CTL_STLOC (set location)\n"));
+ break;
+ case ETIR__C_CTL_STKDL:
+ fprintf (file, _("CTL_STKDL (stack defined location)\n"));
+ break;
+ default:
+ fprintf (file, _("*unhandled*\n"));
+ break;
+ }
off += size;
}
}
unsigned int type;
if (is_first)
- {
- unsigned char buf[6];
-
- is_first = FALSE;
-
- /* Read 6 bytes. */
- if (bfd_bread (buf, sizeof (buf), abfd) != sizeof (buf))
- {
- fprintf (file, _("cannot read GST record length\n"));
- return;
- }
- rec_len = bfd_getl16 (buf + 0);
- if (rec_len == bfd_getl16 (buf + 4)
- && bfd_getl16 (buf + 2) == EOBJ__C_EMH)
- {
- /* The format is raw: record-size, type, record-size. */
- has_records = TRUE;
- pad_len = (rec_len + 1) & ~1U;
- hdr_size = 4;
- }
- else if (rec_len == EOBJ__C_EMH)
- {
- has_records = FALSE;
- pad_len = bfd_getl16 (buf + 2);
- hdr_size = 6;
- }
- else
- {
- /* Ill-formed. */
- fprintf (file, _("cannot find EMH in first GST record\n"));
- return;
- }
- rec = bfd_malloc (pad_len);
- memcpy (rec, buf + sizeof (buf) - hdr_size, hdr_size);
- }
+ {
+ unsigned char buf[6];
+
+ is_first = FALSE;
+
+ /* Read 6 bytes. */
+ if (bfd_bread (buf, sizeof (buf), abfd) != sizeof (buf))
+ {
+ fprintf (file, _("cannot read GST record length\n"));
+ return;
+ }
+ rec_len = bfd_getl16 (buf + 0);
+ if (rec_len == bfd_getl16 (buf + 4)
+ && bfd_getl16 (buf + 2) == EOBJ__C_EMH)
+ {
+ /* The format is raw: record-size, type, record-size. */
+ has_records = TRUE;
+ pad_len = (rec_len + 1) & ~1U;
+ hdr_size = 4;
+ }
+ else if (rec_len == EOBJ__C_EMH)
+ {
+ has_records = FALSE;
+ pad_len = bfd_getl16 (buf + 2);
+ hdr_size = 6;
+ }
+ else
+ {
+ /* Ill-formed. */
+ fprintf (file, _("cannot find EMH in first GST record\n"));
+ return;
+ }
+ rec = bfd_malloc (pad_len);
+ memcpy (rec, buf + sizeof (buf) - hdr_size, hdr_size);
+ }
else
- {
- unsigned int rec_len2 = 0;
- unsigned char hdr[4];
-
- if (has_records)
- {
- unsigned char buf_len[2];
-
- if (bfd_bread (buf_len, sizeof (buf_len), abfd)
- != sizeof (buf_len))
- {
- fprintf (file, _("cannot read GST record length\n"));
- return;
- }
- rec_len2 = (unsigned)bfd_getl16 (buf_len);
- }
-
- if (bfd_bread (hdr, sizeof (hdr), abfd) != sizeof (hdr))
- {
- fprintf (file, _("cannot read GST record header\n"));
- return;
- }
- rec_len = (unsigned)bfd_getl16 (hdr + 2);
- if (has_records)
- pad_len = (rec_len + 1) & ~1U;
- else
- pad_len = rec_len;
- rec = bfd_malloc (pad_len);
- memcpy (rec, hdr, sizeof (hdr));
- hdr_size = sizeof (hdr);
- if (has_records && rec_len2 != rec_len)
- {
- fprintf (file, _(" corrupted GST\n"));
- break;
- }
- }
+ {
+ unsigned int rec_len2 = 0;
+ unsigned char hdr[4];
+
+ if (has_records)
+ {
+ unsigned char buf_len[2];
+
+ if (bfd_bread (buf_len, sizeof (buf_len), abfd)
+ != sizeof (buf_len))
+ {
+ fprintf (file, _("cannot read GST record length\n"));
+ return;
+ }
+ rec_len2 = (unsigned)bfd_getl16 (buf_len);
+ }
+
+ if (bfd_bread (hdr, sizeof (hdr), abfd) != sizeof (hdr))
+ {
+ fprintf (file, _("cannot read GST record header\n"));
+ return;
+ }
+ rec_len = (unsigned)bfd_getl16 (hdr + 2);
+ if (has_records)
+ pad_len = (rec_len + 1) & ~1U;
+ else
+ pad_len = rec_len;
+ rec = bfd_malloc (pad_len);
+ memcpy (rec, hdr, sizeof (hdr));
+ hdr_size = sizeof (hdr);
+ if (has_records && rec_len2 != rec_len)
+ {
+ fprintf (file, _(" corrupted GST\n"));
+ break;
+ }
+ }
if (bfd_bread (rec + hdr_size, pad_len - hdr_size, abfd)
- != pad_len - hdr_size)
- {
- fprintf (file, _("cannot read GST record\n"));
- return;
- }
+ != pad_len - hdr_size)
+ {
+ fprintf (file, _("cannot read GST record\n"));
+ return;
+ }
type = (unsigned)bfd_getl16 (rec);
switch (type)
- {
- case EOBJ__C_EMH:
- evax_bfd_print_emh (file, rec, rec_len);
- break;
- case EOBJ__C_EGSD:
- evax_bfd_print_egsd (file, rec, rec_len);
- break;
- case EOBJ__C_EEOM:
- evax_bfd_print_eeom (file, rec, rec_len);
- free (rec);
- return;
- break;
- case EOBJ__C_ETIR:
- evax_bfd_print_etir (file, "ETIR", rec, rec_len);
- break;
- case EOBJ__C_EDBG:
- evax_bfd_print_etir (file, "EDBG", rec, rec_len);
- break;
- case EOBJ__C_ETBT:
- evax_bfd_print_etir (file, "ETBT", rec, rec_len);
- break;
- default:
- fprintf (file, _(" unhandled EOBJ record type %u\n"), type);
- break;
- }
+ {
+ case EOBJ__C_EMH:
+ evax_bfd_print_emh (file, rec, rec_len);
+ break;
+ case EOBJ__C_EGSD:
+ evax_bfd_print_egsd (file, rec, rec_len);
+ break;
+ case EOBJ__C_EEOM:
+ evax_bfd_print_eeom (file, rec, rec_len);
+ free (rec);
+ return;
+ break;
+ case EOBJ__C_ETIR:
+ evax_bfd_print_etir (file, "ETIR", rec, rec_len);
+ break;
+ case EOBJ__C_EDBG:
+ evax_bfd_print_etir (file, "EDBG", rec, rec_len);
+ break;
+ case EOBJ__C_ETBT:
+ evax_bfd_print_etir (file, "ETBT", rec, rec_len);
+ break;
+ default:
+ fprintf (file, _(" unhandled EOBJ record type %u\n"), type);
+ break;
+ }
free (rec);
}
}
static void
evax_bfd_print_relocation_records (FILE *file, const unsigned char *rel,
- unsigned int stride)
+ unsigned int stride)
{
while (1)
{
count = bfd_getl32 (rel + 0);
if (count == 0)
- break;
+ break;
base = bfd_getl32 (rel + 4);
/* xgettext:c-format */
fprintf (file, _(" bitcount: %u, base addr: 0x%08x\n"),
- count, base);
+ count, base);
rel += 8;
for (j = 0; count > 0; j += 4, count -= 32)
- {
- unsigned int k;
- unsigned int n = 0;
- unsigned int val;
+ {
+ unsigned int k;
+ unsigned int n = 0;
+ unsigned int val;
- val = bfd_getl32 (rel);
- rel += 4;
+ val = bfd_getl32 (rel);
+ rel += 4;
/* xgettext:c-format */
- fprintf (file, _(" bitmap: 0x%08x (count: %u):\n"), val, count);
-
- for (k = 0; k < 32; k++)
- if (val & (1 << k))
- {
- if (n == 0)
- fputs (" ", file);
- fprintf (file, _(" %08x"), base + (j * 8 + k) * stride);
- n++;
- if (n == 8)
- {
- fputs ("\n", file);
- n = 0;
- }
- }
- if (n)
- fputs ("\n", file);
- }
+ fprintf (file, _(" bitmap: 0x%08x (count: %u):\n"), val, count);
+
+ for (k = 0; k < 32; k++)
+ if (val & (1u << k))
+ {
+ if (n == 0)
+ fputs (" ", file);
+ fprintf (file, _(" %08x"), base + (j * 8 + k) * stride);
+ n++;
+ if (n == 8)
+ {
+ fputs ("\n", file);
+ n = 0;
+ }
+ }
+ if (n)
+ fputs ("\n", file);
+ }
}
}
count = bfd_getl32 (rel + 0);
if (count == 0)
- return;
+ return;
/* xgettext:c-format */
fprintf (file, _(" image %u (%u entries)\n"),
- (unsigned)bfd_getl32 (rel + 4), count);
+ (unsigned)bfd_getl32 (rel + 4), count);
rel += 8;
for (j = 0; j < count; j++)
- {
+ {
/* xgettext:c-format */
- fprintf (file, _(" offset: 0x%08x, val: 0x%08x\n"),
- (unsigned)bfd_getl32 (rel + 0),
- (unsigned)bfd_getl32 (rel + 4));
- rel += 8;
- }
+ fprintf (file, _(" offset: 0x%08x, val: 0x%08x\n"),
+ (unsigned)bfd_getl32 (rel + 0),
+ (unsigned)bfd_getl32 (rel + 4));
+ rel += 8;
+ }
}
}
count = bfd_getl32 (rel + 0);
if (count == 0)
- break;
+ break;
/* xgettext:c-format */
fprintf (file, _(" image %u (%u entries), offsets:\n"),
- (unsigned)bfd_getl32 (rel + 4), count);
+ (unsigned)bfd_getl32 (rel + 4), count);
rel += 8;
for (j = 0; j < count; j++)
- {
- if (n == 0)
- fputs (" ", file);
- fprintf (file, _(" 0x%08x"), (unsigned)bfd_getl32 (rel));
- n++;
- if (n == 7)
- {
- fputs ("\n", file);
- n = 0;
- }
- rel += 4;
- }
+ {
+ if (n == 0)
+ fputs (" ", file);
+ fprintf (file, _(" 0x%08x"), (unsigned)bfd_getl32 (rel));
+ n++;
+ if (n == 7)
+ {
+ fputs ("\n", file);
+ n = 0;
+ }
+ rel += 4;
+ }
if (n)
- fputs ("\n", file);
+ fputs ("\n", file);
}
}
{
/* xgettext:c-format */
fprintf (file, _("class: %u, dtype: %u, length: %u, pointer: 0x%08x\n"),
- bclass, dtype, len, pointer);
+ bclass, dtype, len, pointer);
switch (bclass)
- {
- case DSC__K_CLASS_NCA:
- {
- const struct vms_dsc_nca *dsc = (const void *)buf;
- unsigned int i;
- const unsigned char *b;
-
- evax_bfd_print_indent (indent, file);
- fprintf (file, _("non-contiguous array of %s\n"),
- evax_bfd_get_dsc_name (dsc->dtype));
- evax_bfd_print_indent (indent + 1, file);
- fprintf (file,
+ {
+ case DSC__K_CLASS_NCA:
+ {
+ const struct vms_dsc_nca *dsc = (const void *)buf;
+ unsigned int i;
+ const unsigned char *b;
+
+ evax_bfd_print_indent (indent, file);
+ fprintf (file, _("non-contiguous array of %s\n"),
+ evax_bfd_get_dsc_name (dsc->dtype));
+ evax_bfd_print_indent (indent + 1, file);
+ fprintf (file,
/* xgettext:c-format */
- _("dimct: %u, aflags: 0x%02x, digits: %u, scale: %u\n"),
- dsc->dimct, dsc->aflags, dsc->digits, dsc->scale);
- evax_bfd_print_indent (indent + 1, file);
- fprintf (file,
+ _("dimct: %u, aflags: 0x%02x, digits: %u, scale: %u\n"),
+ dsc->dimct, dsc->aflags, dsc->digits, dsc->scale);
+ evax_bfd_print_indent (indent + 1, file);
+ fprintf (file,
/* xgettext:c-format */
- _("arsize: %u, a0: 0x%08x\n"),
- (unsigned)bfd_getl32 (dsc->arsize),
- (unsigned)bfd_getl32 (dsc->a0));
- evax_bfd_print_indent (indent + 1, file);
- fprintf (file, _("Strides:\n"));
- b = buf + sizeof (*dsc);
- for (i = 0; i < dsc->dimct; i++)
- {
- evax_bfd_print_indent (indent + 2, file);
- fprintf (file, "[%u]: %u\n", i + 1,
- (unsigned)bfd_getl32 (b));
- b += 4;
- }
- evax_bfd_print_indent (indent + 1, file);
- fprintf (file, _("Bounds:\n"));
- b = buf + sizeof (*dsc);
- for (i = 0; i < dsc->dimct; i++)
- {
- evax_bfd_print_indent (indent + 2, file);
+ _("arsize: %u, a0: 0x%08x\n"),
+ (unsigned)bfd_getl32 (dsc->arsize),
+ (unsigned)bfd_getl32 (dsc->a0));
+ evax_bfd_print_indent (indent + 1, file);
+ fprintf (file, _("Strides:\n"));
+ b = buf + sizeof (*dsc);
+ for (i = 0; i < dsc->dimct; i++)
+ {
+ evax_bfd_print_indent (indent + 2, file);
+ fprintf (file, "[%u]: %u\n", i + 1,
+ (unsigned)bfd_getl32 (b));
+ b += 4;
+ }
+ evax_bfd_print_indent (indent + 1, file);
+ fprintf (file, _("Bounds:\n"));
+ b = buf + sizeof (*dsc);
+ for (i = 0; i < dsc->dimct; i++)
+ {
+ evax_bfd_print_indent (indent + 2, file);
/* xgettext:c-format */
- fprintf (file, _("[%u]: Lower: %u, upper: %u\n"), i + 1,
- (unsigned)bfd_getl32 (b + 0),
- (unsigned)bfd_getl32 (b + 4));
- b += 8;
- }
- }
- break;
- case DSC__K_CLASS_UBS:
- {
- const struct vms_dsc_ubs *ubs = (const void *)buf;
-
- evax_bfd_print_indent (indent, file);
- fprintf (file, _("unaligned bit-string of %s\n"),
- evax_bfd_get_dsc_name (ubs->dtype));
- evax_bfd_print_indent (indent + 1, file);
- fprintf (file,
+ fprintf (file, _("[%u]: Lower: %u, upper: %u\n"), i + 1,
+ (unsigned)bfd_getl32 (b + 0),
+ (unsigned)bfd_getl32 (b + 4));
+ b += 8;
+ }
+ }
+ break;
+ case DSC__K_CLASS_UBS:
+ {
+ const struct vms_dsc_ubs *ubs = (const void *)buf;
+
+ evax_bfd_print_indent (indent, file);
+ fprintf (file, _("unaligned bit-string of %s\n"),
+ evax_bfd_get_dsc_name (ubs->dtype));
+ evax_bfd_print_indent (indent + 1, file);
+ fprintf (file,
/* xgettext:c-format */
- _("base: %u, pos: %u\n"),
- (unsigned)bfd_getl32 (ubs->base),
- (unsigned)bfd_getl32 (ubs->pos));
- }
- break;
- default:
- fprintf (file, _("*unhandled*\n"));
- break;
- }
+ _("base: %u, pos: %u\n"),
+ (unsigned)bfd_getl32 (ubs->base),
+ (unsigned)bfd_getl32 (ubs->pos));
+ }
+ break;
+ default:
+ fprintf (file, _("*unhandled*\n"));
+ break;
+ }
}
}
default:
/* xgettext:c-format */
fprintf (file, _("(reg: %u, disp: %u, indir: %u, kind: "),
- (vflags & DST__K_REGNUM_MASK) >> DST__K_REGNUM_SHIFT,
- vflags & DST__K_DISP ? 1 : 0,
- vflags & DST__K_INDIR ? 1 : 0);
+ (vflags & DST__K_REGNUM_MASK) >> DST__K_REGNUM_SHIFT,
+ vflags & DST__K_DISP ? 1 : 0,
+ vflags & DST__K_INDIR ? 1 : 0);
switch (vflags & DST__K_VALKIND_MASK)
- {
- case DST__K_VALKIND_LITERAL:
- fputs (_("literal"), file);
- break;
- case DST__K_VALKIND_ADDR:
- fputs (_("address"), file);
- break;
- case DST__K_VALKIND_DESC:
- fputs (_("desc"), file);
- break;
- case DST__K_VALKIND_REG:
- fputs (_("reg"), file);
- break;
- }
+ {
+ case DST__K_VALKIND_LITERAL:
+ fputs (_("literal"), file);
+ break;
+ case DST__K_VALKIND_ADDR:
+ fputs (_("address"), file);
+ break;
+ case DST__K_VALKIND_DESC:
+ fputs (_("desc"), file);
+ break;
+ case DST__K_VALKIND_REG:
+ fputs (_("reg"), file);
+ break;
+ }
fputs (")\n", file);
break;
}
case DST__K_TS_ATOM:
/* xgettext:c-format */
fprintf (file, _("atomic, type=0x%02x %s\n"),
- buf[0], evax_bfd_get_dsc_name (buf[0]));
+ buf[0], evax_bfd_get_dsc_name (buf[0]));
break;
case DST__K_TS_IND:
fprintf (file, _("indirect, defined at 0x%08x\n"),
- (unsigned)bfd_getl32 (buf));
+ (unsigned)bfd_getl32 (buf));
break;
case DST__K_TS_TPTR:
fprintf (file, _("typed pointer\n"));
break;
case DST__K_TS_ARRAY:
{
- const unsigned char *vs;
- unsigned int vec_len;
- unsigned int i;
-
- fprintf (file, _("array, dim: %u, bitmap: "), buf[0]);
- vec_len = (buf[0] + 1 + 7) / 8;
- for (i = 0; i < vec_len; i++)
- fprintf (file, " %02x", buf[i + 1]);
- fputc ('\n', file);
- vs = buf + 1 + vec_len;
- evax_bfd_print_indent (indent, file);
- fprintf (file, _("array descriptor:\n"));
- vs += evax_bfd_print_valspec (vs, indent + 1, file);
- for (i = 0; i < buf[0] + 1U; i++)
- if (buf[1 + i / 8] & (1 << (i % 8)))
- {
- evax_bfd_print_indent (indent, file);
- if (i == 0)
- fprintf (file, _("type spec for element:\n"));
- else
- fprintf (file, _("type spec for subscript %u:\n"), i);
- evax_bfd_print_typspec (vs, indent + 1, file);
- vs += bfd_getl16 (vs);
- }
+ const unsigned char *vs;
+ unsigned int vec_len;
+ unsigned int i;
+
+ fprintf (file, _("array, dim: %u, bitmap: "), buf[0]);
+ vec_len = (buf[0] + 1 + 7) / 8;
+ for (i = 0; i < vec_len; i++)
+ fprintf (file, " %02x", buf[i + 1]);
+ fputc ('\n', file);
+ vs = buf + 1 + vec_len;
+ evax_bfd_print_indent (indent, file);
+ fprintf (file, _("array descriptor:\n"));
+ vs += evax_bfd_print_valspec (vs, indent + 1, file);
+ for (i = 0; i < buf[0] + 1U; i++)
+ if (buf[1 + i / 8] & (1 << (i % 8)))
+ {
+ evax_bfd_print_indent (indent, file);
+ if (i == 0)
+ fprintf (file, _("type spec for element:\n"));
+ else
+ fprintf (file, _("type spec for subscript %u:\n"), i);
+ evax_bfd_print_typspec (vs, indent + 1, file);
+ vs += bfd_getl16 (vs);
+ }
}
break;
default:
unsigned char *buf;
if (bfd_bread (&dsth, sizeof (dsth), abfd) != sizeof (dsth))
- {
- fprintf (file, _("cannot read DST header\n"));
- return;
- }
+ {
+ fprintf (file, _("cannot read DST header\n"));
+ return;
+ }
len = bfd_getl16 (dsth.length);
type = bfd_getl16 (dsth.type);
/* xgettext:c-format */
fprintf (file, _(" type: %3u, len: %3u (at 0x%08x): "),
- type, len, off);
+ type, len, off);
if (len == 0)
- {
- fputc ('\n', file);
- break;
- }
+ {
+ fputc ('\n', file);
+ break;
+ }
len++;
dst_size -= len;
off += len;
len -= sizeof (dsth);
- buf = bfd_malloc (len);
- if (bfd_bread (buf, len, abfd) != len)
- {
- fprintf (file, _("cannot read DST symbol\n"));
- return;
- }
+ buf = _bfd_malloc_and_read (abfd, len, len);
+ if (buf == NULL)
+ {
+ fprintf (file, _("cannot read DST symbol\n"));
+ return;
+ }
switch (type)
- {
- case DSC__K_DTYPE_V:
- case DSC__K_DTYPE_BU:
- case DSC__K_DTYPE_WU:
- case DSC__K_DTYPE_LU:
- case DSC__K_DTYPE_QU:
- case DSC__K_DTYPE_B:
- case DSC__K_DTYPE_W:
- case DSC__K_DTYPE_L:
- case DSC__K_DTYPE_Q:
- case DSC__K_DTYPE_F:
- case DSC__K_DTYPE_D:
- case DSC__K_DTYPE_FC:
- case DSC__K_DTYPE_DC:
- case DSC__K_DTYPE_T:
- case DSC__K_DTYPE_NU:
- case DSC__K_DTYPE_NL:
- case DSC__K_DTYPE_NLO:
- case DSC__K_DTYPE_NR:
- case DSC__K_DTYPE_NRO:
- case DSC__K_DTYPE_NZ:
- case DSC__K_DTYPE_P:
- case DSC__K_DTYPE_ZI:
- case DSC__K_DTYPE_ZEM:
- case DSC__K_DTYPE_DSC:
- case DSC__K_DTYPE_OU:
- case DSC__K_DTYPE_O:
- case DSC__K_DTYPE_G:
- case DSC__K_DTYPE_H:
- case DSC__K_DTYPE_GC:
- case DSC__K_DTYPE_HC:
- case DSC__K_DTYPE_CIT:
- case DSC__K_DTYPE_BPV:
- case DSC__K_DTYPE_BLV:
- case DSC__K_DTYPE_VU:
- case DSC__K_DTYPE_ADT:
- case DSC__K_DTYPE_VT:
- case DSC__K_DTYPE_T2:
- case DSC__K_DTYPE_VT2:
- fprintf (file, _("standard data: %s\n"),
- evax_bfd_get_dsc_name (type));
- evax_bfd_print_valspec (buf, 4, file);
- fprintf (file, _(" name: %.*s\n"), buf[5], buf + 6);
- break;
- case DST__K_MODBEG:
- {
- struct vms_dst_modbeg *dst = (void *)buf;
- const char *name = (const char *)buf + sizeof (*dst);
-
- fprintf (file, _("modbeg\n"));
+ {
+ case DSC__K_DTYPE_V:
+ case DSC__K_DTYPE_BU:
+ case DSC__K_DTYPE_WU:
+ case DSC__K_DTYPE_LU:
+ case DSC__K_DTYPE_QU:
+ case DSC__K_DTYPE_B:
+ case DSC__K_DTYPE_W:
+ case DSC__K_DTYPE_L:
+ case DSC__K_DTYPE_Q:
+ case DSC__K_DTYPE_F:
+ case DSC__K_DTYPE_D:
+ case DSC__K_DTYPE_FC:
+ case DSC__K_DTYPE_DC:
+ case DSC__K_DTYPE_T:
+ case DSC__K_DTYPE_NU:
+ case DSC__K_DTYPE_NL:
+ case DSC__K_DTYPE_NLO:
+ case DSC__K_DTYPE_NR:
+ case DSC__K_DTYPE_NRO:
+ case DSC__K_DTYPE_NZ:
+ case DSC__K_DTYPE_P:
+ case DSC__K_DTYPE_ZI:
+ case DSC__K_DTYPE_ZEM:
+ case DSC__K_DTYPE_DSC:
+ case DSC__K_DTYPE_OU:
+ case DSC__K_DTYPE_O:
+ case DSC__K_DTYPE_G:
+ case DSC__K_DTYPE_H:
+ case DSC__K_DTYPE_GC:
+ case DSC__K_DTYPE_HC:
+ case DSC__K_DTYPE_CIT:
+ case DSC__K_DTYPE_BPV:
+ case DSC__K_DTYPE_BLV:
+ case DSC__K_DTYPE_VU:
+ case DSC__K_DTYPE_ADT:
+ case DSC__K_DTYPE_VT:
+ case DSC__K_DTYPE_T2:
+ case DSC__K_DTYPE_VT2:
+ fprintf (file, _("standard data: %s\n"),
+ evax_bfd_get_dsc_name (type));
+ evax_bfd_print_valspec (buf, 4, file);
+ fprintf (file, _(" name: %.*s\n"), buf[5], buf + 6);
+ break;
+ case DST__K_MODBEG:
+ {
+ struct vms_dst_modbeg *dst = (void *)buf;
+ const char *name = (const char *)buf + sizeof (*dst);
+
+ fprintf (file, _("modbeg\n"));
/* xgettext:c-format */
- fprintf (file, _(" flags: %d, language: %u, "
- "major: %u, minor: %u\n"),
- dst->flags,
- (unsigned)bfd_getl32 (dst->language),
- (unsigned)bfd_getl16 (dst->major),
- (unsigned)bfd_getl16 (dst->minor));
- fprintf (file, _(" module name: %.*s\n"),
- name[0], name + 1);
- name += name[0] + 1;
- fprintf (file, _(" compiler : %.*s\n"),
- name[0], name + 1);
- }
- break;
- case DST__K_MODEND:
- fprintf (file, _("modend\n"));
- break;
- case DST__K_RTNBEG:
- {
- struct vms_dst_rtnbeg *dst = (void *)buf;
- const char *name = (const char *)buf + sizeof (*dst);
-
- fputs (_("rtnbeg\n"), file);
+ fprintf (file, _(" flags: %d, language: %u, "
+ "major: %u, minor: %u\n"),
+ dst->flags,
+ (unsigned)bfd_getl32 (dst->language),
+ (unsigned)bfd_getl16 (dst->major),
+ (unsigned)bfd_getl16 (dst->minor));
+ fprintf (file, _(" module name: %.*s\n"),
+ name[0], name + 1);
+ name += name[0] + 1;
+ fprintf (file, _(" compiler : %.*s\n"),
+ name[0], name + 1);
+ }
+ break;
+ case DST__K_MODEND:
+ fprintf (file, _("modend\n"));
+ break;
+ case DST__K_RTNBEG:
+ {
+ struct vms_dst_rtnbeg *dst = (void *)buf;
+ const char *name = (const char *)buf + sizeof (*dst);
+
+ fputs (_("rtnbeg\n"), file);
+ /* xgettext:c-format */
+ fprintf (file, _(" flags: %u, address: 0x%08x, "
+ "pd-address: 0x%08x\n"),
+ dst->flags,
+ (unsigned)bfd_getl32 (dst->address),
+ (unsigned)bfd_getl32 (dst->pd_address));
+ fprintf (file, _(" routine name: %.*s\n"),
+ name[0], name + 1);
+ }
+ break;
+ case DST__K_RTNEND:
+ {
+ struct vms_dst_rtnend *dst = (void *)buf;
+
+ fprintf (file, _("rtnend: size 0x%08x\n"),
+ (unsigned)bfd_getl32 (dst->size));
+ }
+ break;
+ case DST__K_PROLOG:
+ {
+ struct vms_dst_prolog *dst = (void *)buf;
+
+ fprintf (file, _("prolog: bkpt address 0x%08x\n"),
+ (unsigned)bfd_getl32 (dst->bkpt_addr));
+ }
+ break;
+ case DST__K_EPILOG:
+ {
+ struct vms_dst_epilog *dst = (void *)buf;
+
/* xgettext:c-format */
- fprintf (file, _(" flags: %u, address: 0x%08x, "
- "pd-address: 0x%08x\n"),
- dst->flags,
- (unsigned)bfd_getl32 (dst->address),
- (unsigned)bfd_getl32 (dst->pd_address));
- fprintf (file, _(" routine name: %.*s\n"),
- name[0], name + 1);
- }
- break;
- case DST__K_RTNEND:
- {
- struct vms_dst_rtnend *dst = (void *)buf;
-
- fprintf (file, _("rtnend: size 0x%08x\n"),
- (unsigned)bfd_getl32 (dst->size));
- }
- break;
- case DST__K_PROLOG:
- {
- struct vms_dst_prolog *dst = (void *)buf;
-
- fprintf (file, _("prolog: bkpt address 0x%08x\n"),
- (unsigned)bfd_getl32 (dst->bkpt_addr));
- }
- break;
- case DST__K_EPILOG:
- {
- struct vms_dst_epilog *dst = (void *)buf;
+ fprintf (file, _("epilog: flags: %u, count: %u\n"),
+ dst->flags, (unsigned)bfd_getl32 (dst->count));
+ }
+ break;
+ case DST__K_BLKBEG:
+ {
+ struct vms_dst_blkbeg *dst = (void *)buf;
+ const char *name = (const char *)buf + sizeof (*dst);
/* xgettext:c-format */
- fprintf (file, _("epilog: flags: %u, count: %u\n"),
- dst->flags, (unsigned)bfd_getl32 (dst->count));
- }
- break;
- case DST__K_BLKBEG:
- {
- struct vms_dst_blkbeg *dst = (void *)buf;
- const char *name = (const char *)buf + sizeof (*dst);
+ fprintf (file, _("blkbeg: address: 0x%08x, name: %.*s\n"),
+ (unsigned)bfd_getl32 (dst->address),
+ name[0], name + 1);
+ }
+ break;
+ case DST__K_BLKEND:
+ {
+ struct vms_dst_blkend *dst = (void *)buf;
+
+ fprintf (file, _("blkend: size: 0x%08x\n"),
+ (unsigned)bfd_getl32 (dst->size));
+ }
+ break;
+ case DST__K_TYPSPEC:
+ {
+ fprintf (file, _("typspec (len: %u)\n"), len);
+ fprintf (file, _(" name: %.*s\n"), buf[0], buf + 1);
+ evax_bfd_print_typspec (buf + 1 + buf[0], 5, file);
+ }
+ break;
+ case DST__K_SEPTYP:
+ {
+ fprintf (file, _("septyp, name: %.*s\n"), buf[5], buf + 6);
+ evax_bfd_print_valspec (buf, 4, file);
+ }
+ break;
+ case DST__K_RECBEG:
+ {
+ struct vms_dst_recbeg *recbeg = (void *)buf;
+ const char *name = (const char *)buf + sizeof (*recbeg);
+
+ fprintf (file, _("recbeg: name: %.*s\n"), name[0], name + 1);
+ evax_bfd_print_valspec (buf, 4, file);
+ fprintf (file, _(" len: %u bits\n"),
+ (unsigned)bfd_getl32 (name + 1 + name[0]));
+ }
+ break;
+ case DST__K_RECEND:
+ fprintf (file, _("recend\n"));
+ break;
+ case DST__K_ENUMBEG:
+ /* xgettext:c-format */
+ fprintf (file, _("enumbeg, len: %u, name: %.*s\n"),
+ buf[0], buf[1], buf + 2);
+ break;
+ case DST__K_ENUMELT:
+ fprintf (file, _("enumelt, name: %.*s\n"), buf[5], buf + 6);
+ evax_bfd_print_valspec (buf, 4, file);
+ break;
+ case DST__K_ENUMEND:
+ fprintf (file, _("enumend\n"));
+ break;
+ case DST__K_LABEL:
+ {
+ struct vms_dst_label *lab = (void *)buf;
+ fprintf (file, _("label, name: %.*s\n"),
+ lab->name[0], lab->name + 1);
+ fprintf (file, _(" address: 0x%08x\n"),
+ (unsigned)bfd_getl32 (lab->value));
+ }
+ break;
+ case DST__K_DIS_RANGE:
+ {
+ unsigned int cnt = bfd_getl32 (buf);
+ unsigned char *rng = buf + 4;
+ unsigned int i;
+
+ fprintf (file, _("discontiguous range (nbr: %u)\n"), cnt);
+ for (i = 0; i < cnt; i++, rng += 8)
+ /* xgettext:c-format */
+ fprintf (file, _(" address: 0x%08x, size: %u\n"),
+ (unsigned)bfd_getl32 (rng),
+ (unsigned)bfd_getl32 (rng + 4));
+
+ }
+ break;
+ case DST__K_LINE_NUM:
+ {
+ unsigned char *buf_orig = buf;
+
+ fprintf (file, _("line num (len: %u)\n"), len);
+
+ while (len > 0)
+ {
+ signed char cmd;
+ unsigned char cmdlen;
+ unsigned int val;
+
+ cmd = buf[0];
+ cmdlen = 0;
+
+ fputs (" ", file);
+
+ switch (cmd)
+ {
+ case DST__K_DELTA_PC_W:
+ val = bfd_getl16 (buf + 1);
+ fprintf (file, _("delta_pc_w %u\n"), val);
+ pc += val;
+ line++;
+ cmdlen = 3;
+ break;
+ case DST__K_INCR_LINUM:
+ val = buf[1];
+ fprintf (file, _("incr_linum(b): +%u\n"), val);
+ line += val;
+ cmdlen = 2;
+ break;
+ case DST__K_INCR_LINUM_W:
+ val = bfd_getl16 (buf + 1);
+ fprintf (file, _("incr_linum_w: +%u\n"), val);
+ line += val;
+ cmdlen = 3;
+ break;
+ case DST__K_INCR_LINUM_L:
+ val = bfd_getl32 (buf + 1);
+ fprintf (file, _("incr_linum_l: +%u\n"), val);
+ line += val;
+ cmdlen = 5;
+ break;
+ case DST__K_SET_LINUM:
+ line = bfd_getl16 (buf + 1);
+ fprintf (file, _("set_line_num(w) %u\n"), line);
+ cmdlen = 3;
+ break;
+ case DST__K_SET_LINUM_B:
+ line = buf[1];
+ fprintf (file, _("set_line_num_b %u\n"), line);
+ cmdlen = 2;
+ break;
+ case DST__K_SET_LINUM_L:
+ line = bfd_getl32 (buf + 1);
+ fprintf (file, _("set_line_num_l %u\n"), line);
+ cmdlen = 5;
+ break;
+ case DST__K_SET_ABS_PC:
+ pc = bfd_getl32 (buf + 1);
+ fprintf (file, _("set_abs_pc: 0x%08x\n"), pc);
+ cmdlen = 5;
+ break;
+ case DST__K_DELTA_PC_L:
+ fprintf (file, _("delta_pc_l: +0x%08x\n"),
+ (unsigned)bfd_getl32 (buf + 1));
+ cmdlen = 5;
+ break;
+ case DST__K_TERM:
+ fprintf (file, _("term(b): 0x%02x"), buf[1]);
+ pc += buf[1];
+ fprintf (file, _(" pc: 0x%08x\n"), pc);
+ cmdlen = 2;
+ break;
+ case DST__K_TERM_W:
+ val = bfd_getl16 (buf + 1);
+ fprintf (file, _("term_w: 0x%04x"), val);
+ pc += val;
+ fprintf (file, _(" pc: 0x%08x\n"), pc);
+ cmdlen = 3;
+ break;
+ default:
+ if (cmd <= 0)
+ {
+ fprintf (file, _("delta pc +%-4d"), -cmd);
+ line++; /* FIXME: curr increment. */
+ pc += -cmd;
+ /* xgettext:c-format */
+ fprintf (file, _(" pc: 0x%08x line: %5u\n"),
+ pc, line);
+ cmdlen = 1;
+ }
+ else
+ fprintf (file, _(" *unhandled* cmd %u\n"), cmd);
+ break;
+ }
+ if (cmdlen == 0)
+ break;
+ len -= cmdlen;
+ buf += cmdlen;
+ }
+ buf = buf_orig;
+ }
+ break;
+ case DST__K_SOURCE:
+ {
+ unsigned char *buf_orig = buf;
+
+ fprintf (file, _("source (len: %u)\n"), len);
+
+ while (len > 0)
+ {
+ signed char cmd = buf[0];
+ unsigned char cmdlen = 0;
- /* xgettext:c-format */
- fprintf (file, _("blkbeg: address: 0x%08x, name: %.*s\n"),
- (unsigned)bfd_getl32 (dst->address),
- name[0], name + 1);
- }
- break;
- case DST__K_BLKEND:
- {
- struct vms_dst_blkend *dst = (void *)buf;
-
- fprintf (file, _("blkend: size: 0x%08x\n"),
- (unsigned)bfd_getl32 (dst->size));
- }
- break;
- case DST__K_TYPSPEC:
- {
- fprintf (file, _("typspec (len: %u)\n"), len);
- fprintf (file, _(" name: %.*s\n"), buf[0], buf + 1);
- evax_bfd_print_typspec (buf + 1 + buf[0], 5, file);
- }
- break;
- case DST__K_SEPTYP:
- {
- fprintf (file, _("septyp, name: %.*s\n"), buf[5], buf + 6);
- evax_bfd_print_valspec (buf, 4, file);
- }
- break;
- case DST__K_RECBEG:
- {
- struct vms_dst_recbeg *recbeg = (void *)buf;
- const char *name = (const char *)buf + sizeof (*recbeg);
-
- fprintf (file, _("recbeg: name: %.*s\n"), name[0], name + 1);
- evax_bfd_print_valspec (buf, 4, file);
- fprintf (file, _(" len: %u bits\n"),
- (unsigned)bfd_getl32 (name + 1 + name[0]));
- }
- break;
- case DST__K_RECEND:
- fprintf (file, _("recend\n"));
- break;
- case DST__K_ENUMBEG:
- /* xgettext:c-format */
- fprintf (file, _("enumbeg, len: %u, name: %.*s\n"),
- buf[0], buf[1], buf + 2);
- break;
- case DST__K_ENUMELT:
- fprintf (file, _("enumelt, name: %.*s\n"), buf[5], buf + 6);
- evax_bfd_print_valspec (buf, 4, file);
- break;
- case DST__K_ENUMEND:
- fprintf (file, _("enumend\n"));
- break;
- case DST__K_LABEL:
- {
- struct vms_dst_label *lab = (void *)buf;
- fprintf (file, _("label, name: %.*s\n"),
- lab->name[0], lab->name + 1);
- fprintf (file, _(" address: 0x%08x\n"),
- (unsigned)bfd_getl32 (lab->value));
- }
- break;
- case DST__K_DIS_RANGE:
- {
- unsigned int cnt = bfd_getl32 (buf);
- unsigned char *rng = buf + 4;
- unsigned int i;
-
- fprintf (file, _("discontiguous range (nbr: %u)\n"), cnt);
- for (i = 0; i < cnt; i++, rng += 8)
- /* xgettext:c-format */
- fprintf (file, _(" address: 0x%08x, size: %u\n"),
- (unsigned)bfd_getl32 (rng),
- (unsigned)bfd_getl32 (rng + 4));
-
- }
- break;
- case DST__K_LINE_NUM:
- {
- unsigned char *buf_orig = buf;
-
- fprintf (file, _("line num (len: %u)\n"), len);
-
- while (len > 0)
- {
- signed char cmd;
- unsigned char cmdlen;
- unsigned int val;
-
- cmd = buf[0];
- cmdlen = 0;
-
- fputs (" ", file);
-
- switch (cmd)
- {
- case DST__K_DELTA_PC_W:
- val = bfd_getl16 (buf + 1);
- fprintf (file, _("delta_pc_w %u\n"), val);
- pc += val;
- line++;
- cmdlen = 3;
- break;
- case DST__K_INCR_LINUM:
- val = buf[1];
- fprintf (file, _("incr_linum(b): +%u\n"), val);
- line += val;
- cmdlen = 2;
- break;
- case DST__K_INCR_LINUM_W:
- val = bfd_getl16 (buf + 1);
- fprintf (file, _("incr_linum_w: +%u\n"), val);
- line += val;
- cmdlen = 3;
- break;
- case DST__K_INCR_LINUM_L:
- val = bfd_getl32 (buf + 1);
- fprintf (file, _("incr_linum_l: +%u\n"), val);
- line += val;
- cmdlen = 5;
- break;
- case DST__K_SET_LINUM:
- line = bfd_getl16 (buf + 1);
- fprintf (file, _("set_line_num(w) %u\n"), line);
- cmdlen = 3;
- break;
- case DST__K_SET_LINUM_B:
- line = buf[1];
- fprintf (file, _("set_line_num_b %u\n"), line);
- cmdlen = 2;
- break;
- case DST__K_SET_LINUM_L:
- line = bfd_getl32 (buf + 1);
- fprintf (file, _("set_line_num_l %u\n"), line);
- cmdlen = 5;
- break;
- case DST__K_SET_ABS_PC:
- pc = bfd_getl32 (buf + 1);
- fprintf (file, _("set_abs_pc: 0x%08x\n"), pc);
- cmdlen = 5;
- break;
- case DST__K_DELTA_PC_L:
- fprintf (file, _("delta_pc_l: +0x%08x\n"),
- (unsigned)bfd_getl32 (buf + 1));
- cmdlen = 5;
- break;
- case DST__K_TERM:
- fprintf (file, _("term(b): 0x%02x"), buf[1]);
- pc += buf[1];
- fprintf (file, _(" pc: 0x%08x\n"), pc);
- cmdlen = 2;
- break;
- case DST__K_TERM_W:
- val = bfd_getl16 (buf + 1);
- fprintf (file, _("term_w: 0x%04x"), val);
- pc += val;
- fprintf (file, _(" pc: 0x%08x\n"), pc);
- cmdlen = 3;
- break;
- default:
- if (cmd <= 0)
- {
- fprintf (file, _("delta pc +%-4d"), -cmd);
- line++; /* FIXME: curr increment. */
- pc += -cmd;
- /* xgettext:c-format */
- fprintf (file, _(" pc: 0x%08x line: %5u\n"),
- pc, line);
- cmdlen = 1;
- }
- else
- fprintf (file, _(" *unhandled* cmd %u\n"), cmd);
- break;
- }
- if (cmdlen == 0)
- break;
- len -= cmdlen;
- buf += cmdlen;
- }
- buf = buf_orig;
- }
- break;
- case DST__K_SOURCE:
- {
- unsigned char *buf_orig = buf;
-
- fprintf (file, _("source (len: %u)\n"), len);
-
- while (len > 0)
- {
- signed char cmd = buf[0];
- unsigned char cmdlen = 0;
-
- switch (cmd)
- {
- case DST__K_SRC_DECLFILE:
- {
- struct vms_dst_src_decl_src *src = (void *)(buf + 1);
- const char *name;
+ switch (cmd)
+ {
+ case DST__K_SRC_DECLFILE:
+ {
+ struct vms_dst_src_decl_src *src = (void *)(buf + 1);
+ const char *name;
/* xgettext:c-format */
- fprintf (file, _(" declfile: len: %u, flags: %u, "
- "fileid: %u\n"),
- src->length, src->flags,
- (unsigned)bfd_getl16 (src->fileid));
+ fprintf (file, _(" declfile: len: %u, flags: %u, "
+ "fileid: %u\n"),
+ src->length, src->flags,
+ (unsigned)bfd_getl16 (src->fileid));
/* xgettext:c-format */
- fprintf (file, _(" rms: cdt: 0x%08x %08x, "
- "ebk: 0x%08x, ffb: 0x%04x, "
- "rfo: %u\n"),
- (unsigned)bfd_getl32 (src->rms_cdt + 4),
- (unsigned)bfd_getl32 (src->rms_cdt + 0),
- (unsigned)bfd_getl32 (src->rms_ebk),
- (unsigned)bfd_getl16 (src->rms_ffb),
- src->rms_rfo);
- name = (const char *)buf + 1 + sizeof (*src);
- fprintf (file, _(" filename : %.*s\n"),
- name[0], name + 1);
- name += name[0] + 1;
- fprintf (file, _(" module name: %.*s\n"),
- name[0], name + 1);
- cmdlen = 2 + src->length;
- }
- break;
- case DST__K_SRC_SETFILE:
- fprintf (file, _(" setfile %u\n"),
- (unsigned)bfd_getl16 (buf + 1));
- cmdlen = 3;
- break;
- case DST__K_SRC_SETREC_W:
- fprintf (file, _(" setrec %u\n"),
- (unsigned)bfd_getl16 (buf + 1));
- cmdlen = 3;
- break;
- case DST__K_SRC_SETREC_L:
- fprintf (file, _(" setrec %u\n"),
- (unsigned)bfd_getl32 (buf + 1));
- cmdlen = 5;
- break;
- case DST__K_SRC_SETLNUM_W:
- fprintf (file, _(" setlnum %u\n"),
- (unsigned)bfd_getl16 (buf + 1));
- cmdlen = 3;
- break;
- case DST__K_SRC_SETLNUM_L:
- fprintf (file, _(" setlnum %u\n"),
- (unsigned)bfd_getl32 (buf + 1));
- cmdlen = 5;
- break;
- case DST__K_SRC_DEFLINES_W:
- fprintf (file, _(" deflines %u\n"),
- (unsigned)bfd_getl16 (buf + 1));
- cmdlen = 3;
- break;
- case DST__K_SRC_DEFLINES_B:
- fprintf (file, _(" deflines %u\n"), buf[1]);
- cmdlen = 2;
- break;
- case DST__K_SRC_FORMFEED:
- fprintf (file, _(" formfeed\n"));
- cmdlen = 1;
- break;
- default:
- fprintf (file, _(" *unhandled* cmd %u\n"), cmd);
- break;
- }
- if (cmdlen == 0)
- break;
- len -= cmdlen;
- buf += cmdlen;
- }
- buf = buf_orig;
- }
- break;
- default:
- fprintf (file, _("*unhandled* dst type %u\n"), type);
- break;
- }
+ fprintf (file, _(" rms: cdt: 0x%08x %08x, "
+ "ebk: 0x%08x, ffb: 0x%04x, "
+ "rfo: %u\n"),
+ (unsigned)bfd_getl32 (src->rms_cdt + 4),
+ (unsigned)bfd_getl32 (src->rms_cdt + 0),
+ (unsigned)bfd_getl32 (src->rms_ebk),
+ (unsigned)bfd_getl16 (src->rms_ffb),
+ src->rms_rfo);
+ name = (const char *)buf + 1 + sizeof (*src);
+ fprintf (file, _(" filename : %.*s\n"),
+ name[0], name + 1);
+ name += name[0] + 1;
+ fprintf (file, _(" module name: %.*s\n"),
+ name[0], name + 1);
+ cmdlen = 2 + src->length;
+ }
+ break;
+ case DST__K_SRC_SETFILE:
+ fprintf (file, _(" setfile %u\n"),
+ (unsigned)bfd_getl16 (buf + 1));
+ cmdlen = 3;
+ break;
+ case DST__K_SRC_SETREC_W:
+ fprintf (file, _(" setrec %u\n"),
+ (unsigned)bfd_getl16 (buf + 1));
+ cmdlen = 3;
+ break;
+ case DST__K_SRC_SETREC_L:
+ fprintf (file, _(" setrec %u\n"),
+ (unsigned)bfd_getl32 (buf + 1));
+ cmdlen = 5;
+ break;
+ case DST__K_SRC_SETLNUM_W:
+ fprintf (file, _(" setlnum %u\n"),
+ (unsigned)bfd_getl16 (buf + 1));
+ cmdlen = 3;
+ break;
+ case DST__K_SRC_SETLNUM_L:
+ fprintf (file, _(" setlnum %u\n"),
+ (unsigned)bfd_getl32 (buf + 1));
+ cmdlen = 5;
+ break;
+ case DST__K_SRC_DEFLINES_W:
+ fprintf (file, _(" deflines %u\n"),
+ (unsigned)bfd_getl16 (buf + 1));
+ cmdlen = 3;
+ break;
+ case DST__K_SRC_DEFLINES_B:
+ fprintf (file, _(" deflines %u\n"), buf[1]);
+ cmdlen = 2;
+ break;
+ case DST__K_SRC_FORMFEED:
+ fprintf (file, _(" formfeed\n"));
+ cmdlen = 1;
+ break;
+ default:
+ fprintf (file, _(" *unhandled* cmd %u\n"), cmd);
+ break;
+ }
+ if (cmdlen == 0)
+ break;
+ len -= cmdlen;
+ buf += cmdlen;
+ }
+ buf = buf_orig;
+ }
+ break;
+ default:
+ fprintf (file, _("*unhandled* dst type %u\n"), type);
+ break;
+ }
free (buf);
}
}
}
/* xgettext:c-format */
fprintf (file, _("EIHD: (size: %u, nbr blocks: %u)\n"),
- (unsigned)bfd_getl32 (eihd.size),
- (unsigned)bfd_getl32 (eihd.hdrblkcnt));
+ (unsigned)bfd_getl32 (eihd.size),
+ (unsigned)bfd_getl32 (eihd.hdrblkcnt));
/* xgettext:c-format */
fprintf (file, _(" majorid: %u, minorid: %u\n"),
- (unsigned)bfd_getl32 (eihd.majorid),
- (unsigned)bfd_getl32 (eihd.minorid));
+ (unsigned)bfd_getl32 (eihd.majorid),
+ (unsigned)bfd_getl32 (eihd.minorid));
val = (unsigned)bfd_getl32 (eihd.imgtype);
switch (val)
eihs_off = bfd_getl32 (eihd.symdbgoff);
/* xgettext:c-format */
fprintf (file, _(" offsets: isd: %u, activ: %u, symdbg: %u, "
- "imgid: %u, patch: %u\n"),
- eisd_off, eiha_off, eihs_off, eihi_off,
- (unsigned)bfd_getl32 (eihd.patchoff));
+ "imgid: %u, patch: %u\n"),
+ eisd_off, eiha_off, eihs_off, eihi_off,
+ (unsigned)bfd_getl32 (eihd.patchoff));
fprintf (file, _(" fixup info rva: "));
bfd_fprintf_vma (abfd, file, bfd_getl64 (eihd.iafva));
fprintf (file, _(", symbol vector rva: "));
bfd_fprintf_vma (abfd, file, bfd_getl64 (eihd.symvva));
eihvn_off = bfd_getl32 (eihd.version_array_off);
fprintf (file, _("\n"
- " version array off: %u\n"),
- eihvn_off);
+ " version array off: %u\n"),
+ eihvn_off);
fprintf (file,
/* xgettext:c-format */
- _(" img I/O count: %u, nbr channels: %u, req pri: %08x%08x\n"),
- (unsigned)bfd_getl32 (eihd.imgiocnt),
- (unsigned)bfd_getl32 (eihd.iochancnt),
- (unsigned)bfd_getl32 (eihd.privreqs + 4),
- (unsigned)bfd_getl32 (eihd.privreqs + 0));
+ _(" img I/O count: %u, nbr channels: %u, req pri: %08x%08x\n"),
+ (unsigned)bfd_getl32 (eihd.imgiocnt),
+ (unsigned)bfd_getl32 (eihd.iochancnt),
+ (unsigned)bfd_getl32 (eihd.privreqs + 4),
+ (unsigned)bfd_getl32 (eihd.privreqs + 0));
val = (unsigned)bfd_getl32 (eihd.lnkflags);
fprintf (file, _(" linker flags: %08x:"), val);
if (val & EIHD__M_LNKDEBUG)
fprintf (file, "\n");
/* xgettext:c-format */
fprintf (file, _(" ident: 0x%08x, sysver: 0x%08x, "
- "match ctrl: %u, symvect_size: %u\n"),
- (unsigned)bfd_getl32 (eihd.ident),
- (unsigned)bfd_getl32 (eihd.sysver),
- eihd.matchctl,
- (unsigned)bfd_getl32 (eihd.symvect_size));
+ "match ctrl: %u, symvect_size: %u\n"),
+ (unsigned)bfd_getl32 (eihd.ident),
+ (unsigned)bfd_getl32 (eihd.sysver),
+ eihd.matchctl,
+ (unsigned)bfd_getl32 (eihd.symvect_size));
fprintf (file, _(" BPAGE: %u"),
- (unsigned)bfd_getl32 (eihd.virt_mem_block_size));
+ (unsigned)bfd_getl32 (eihd.virt_mem_block_size));
if (val & (EIHD__M_OMV_READY | EIHD__M_EXT_BIND_SECT))
{
eihef_off = bfd_getl32 (eihd.ext_fixup_off);
eihnp_off = bfd_getl32 (eihd.noopt_psect_off);
/* xgettext:c-format */
fprintf (file, _(", ext fixup offset: %u, no_opt psect off: %u"),
- eihef_off, eihnp_off);
+ eihef_off, eihnp_off);
}
fprintf (file, _(", alias: %u\n"), (unsigned)bfd_getl16 (eihd.alias));
fprintf (file, _("system version array information:\n"));
if (bfd_seek (abfd, (file_ptr) eihvn_off, SEEK_SET)
- || bfd_bread (&eihvn, sizeof (eihvn), abfd) != sizeof (eihvn))
- {
- fprintf (file, _("cannot read EIHVN header\n"));
- return;
- }
+ || bfd_bread (&eihvn, sizeof (eihvn), abfd) != sizeof (eihvn))
+ {
+ fprintf (file, _("cannot read EIHVN header\n"));
+ return;
+ }
mask = bfd_getl32 (eihvn.subsystem_mask);
for (j = 0; j < 32; j++)
- if (mask & (1 << j))
- {
- struct vms_eihvn_subversion ver;
- if (bfd_bread (&ver, sizeof (ver), abfd) != sizeof (ver))
- {
- fprintf (file, _("cannot read EIHVN version\n"));
- return;
- }
- fprintf (file, _(" %02u "), j);
- switch (j)
- {
- case EIHVN__BASE_IMAGE_BIT:
+ if (mask & (1 << j))
+ {
+ struct vms_eihvn_subversion ver;
+ if (bfd_bread (&ver, sizeof (ver), abfd) != sizeof (ver))
+ {
+ fprintf (file, _("cannot read EIHVN version\n"));
+ return;
+ }
+ fprintf (file, _(" %02u "), j);
+ switch (j)
+ {
+ case EIHVN__BASE_IMAGE_BIT:
fputs (_("BASE_IMAGE "), file);
- break;
- case EIHVN__MEMORY_MANAGEMENT_BIT:
- fputs (_("MEMORY_MANAGEMENT"), file);
- break;
- case EIHVN__IO_BIT:
- fputs (_("IO "), file);
- break;
- case EIHVN__FILES_VOLUMES_BIT:
- fputs (_("FILES_VOLUMES "), file);
- break;
- case EIHVN__PROCESS_SCHED_BIT:
- fputs (_("PROCESS_SCHED "), file);
- break;
- case EIHVN__SYSGEN_BIT:
+ break;
+ case EIHVN__MEMORY_MANAGEMENT_BIT:
+ fputs (_("MEMORY_MANAGEMENT"), file);
+ break;
+ case EIHVN__IO_BIT:
+ fputs (_("IO "), file);
+ break;
+ case EIHVN__FILES_VOLUMES_BIT:
+ fputs (_("FILES_VOLUMES "), file);
+ break;
+ case EIHVN__PROCESS_SCHED_BIT:
+ fputs (_("PROCESS_SCHED "), file);
+ break;
+ case EIHVN__SYSGEN_BIT:
fputs (_("SYSGEN "), file);
- break;
- case EIHVN__CLUSTERS_LOCKMGR_BIT:
- fputs (_("CLUSTERS_LOCKMGR "), file);
- break;
- case EIHVN__LOGICAL_NAMES_BIT:
- fputs (_("LOGICAL_NAMES "), file);
- break;
- case EIHVN__SECURITY_BIT:
+ break;
+ case EIHVN__CLUSTERS_LOCKMGR_BIT:
+ fputs (_("CLUSTERS_LOCKMGR "), file);
+ break;
+ case EIHVN__LOGICAL_NAMES_BIT:
+ fputs (_("LOGICAL_NAMES "), file);
+ break;
+ case EIHVN__SECURITY_BIT:
fputs (_("SECURITY "), file);
- break;
- case EIHVN__IMAGE_ACTIVATOR_BIT:
- fputs (_("IMAGE_ACTIVATOR "), file);
- break;
- case EIHVN__NETWORKS_BIT:
+ break;
+ case EIHVN__IMAGE_ACTIVATOR_BIT:
+ fputs (_("IMAGE_ACTIVATOR "), file);
+ break;
+ case EIHVN__NETWORKS_BIT:
fputs (_("NETWORKS "), file);
- break;
- case EIHVN__COUNTERS_BIT:
+ break;
+ case EIHVN__COUNTERS_BIT:
fputs (_("COUNTERS "), file);
- break;
- case EIHVN__STABLE_BIT:
+ break;
+ case EIHVN__STABLE_BIT:
fputs (_("STABLE "), file);
- break;
- case EIHVN__MISC_BIT:
- fputs (_("MISC "), file);
- break;
- case EIHVN__CPU_BIT:
- fputs (_("CPU "), file);
- break;
- case EIHVN__VOLATILE_BIT:
+ break;
+ case EIHVN__MISC_BIT:
+ fputs (_("MISC "), file);
+ break;
+ case EIHVN__CPU_BIT:
+ fputs (_("CPU "), file);
+ break;
+ case EIHVN__VOLATILE_BIT:
fputs (_("VOLATILE "), file);
- break;
- case EIHVN__SHELL_BIT:
+ break;
+ case EIHVN__SHELL_BIT:
fputs (_("SHELL "), file);
- break;
- case EIHVN__POSIX_BIT:
+ break;
+ case EIHVN__POSIX_BIT:
fputs (_("POSIX "), file);
- break;
- case EIHVN__MULTI_PROCESSING_BIT:
- fputs (_("MULTI_PROCESSING "), file);
- break;
- case EIHVN__GALAXY_BIT:
+ break;
+ case EIHVN__MULTI_PROCESSING_BIT:
+ fputs (_("MULTI_PROCESSING "), file);
+ break;
+ case EIHVN__GALAXY_BIT:
fputs (_("GALAXY "), file);
- break;
- default:
- fputs (_("*unknown* "), file);
- break;
- }
- fprintf (file, ": %u.%u\n",
- (unsigned)bfd_getl16 (ver.major),
- (unsigned)bfd_getl16 (ver.minor));
- }
+ break;
+ default:
+ fputs (_("*unknown* "), file);
+ break;
+ }
+ fprintf (file, ": %u.%u\n",
+ (unsigned)bfd_getl16 (ver.major),
+ (unsigned)bfd_getl16 (ver.minor));
+ }
}
if (eiha_off != 0)
struct vms_eiha eiha;
if (bfd_seek (abfd, (file_ptr) eiha_off, SEEK_SET)
- || bfd_bread (&eiha, sizeof (eiha), abfd) != sizeof (eiha))
- {
- fprintf (file, _("cannot read EIHA\n"));
- return;
- }
+ || bfd_bread (&eiha, sizeof (eiha), abfd) != sizeof (eiha))
+ {
+ fprintf (file, _("cannot read EIHA\n"));
+ return;
+ }
fprintf (file, _("Image activation: (size=%u)\n"),
- (unsigned)bfd_getl32 (eiha.size));
+ (unsigned)bfd_getl32 (eiha.size));
/* xgettext:c-format */
fprintf (file, _(" First address : 0x%08x 0x%08x\n"),
- (unsigned)bfd_getl32 (eiha.tfradr1_h),
- (unsigned)bfd_getl32 (eiha.tfradr1));
+ (unsigned)bfd_getl32 (eiha.tfradr1_h),
+ (unsigned)bfd_getl32 (eiha.tfradr1));
/* xgettext:c-format */
fprintf (file, _(" Second address: 0x%08x 0x%08x\n"),
- (unsigned)bfd_getl32 (eiha.tfradr2_h),
- (unsigned)bfd_getl32 (eiha.tfradr2));
+ (unsigned)bfd_getl32 (eiha.tfradr2_h),
+ (unsigned)bfd_getl32 (eiha.tfradr2));
/* xgettext:c-format */
fprintf (file, _(" Third address : 0x%08x 0x%08x\n"),
- (unsigned)bfd_getl32 (eiha.tfradr3_h),
- (unsigned)bfd_getl32 (eiha.tfradr3));
+ (unsigned)bfd_getl32 (eiha.tfradr3_h),
+ (unsigned)bfd_getl32 (eiha.tfradr3));
/* xgettext:c-format */
fprintf (file, _(" Fourth address: 0x%08x 0x%08x\n"),
- (unsigned)bfd_getl32 (eiha.tfradr4_h),
- (unsigned)bfd_getl32 (eiha.tfradr4));
+ (unsigned)bfd_getl32 (eiha.tfradr4_h),
+ (unsigned)bfd_getl32 (eiha.tfradr4));
/* xgettext:c-format */
fprintf (file, _(" Shared image : 0x%08x 0x%08x\n"),
- (unsigned)bfd_getl32 (eiha.inishr_h),
- (unsigned)bfd_getl32 (eiha.inishr));
+ (unsigned)bfd_getl32 (eiha.inishr_h),
+ (unsigned)bfd_getl32 (eiha.inishr));
}
if (eihi_off != 0)
{
struct vms_eihi eihi;
if (bfd_seek (abfd, (file_ptr) eihi_off, SEEK_SET)
- || bfd_bread (&eihi, sizeof (eihi), abfd) != sizeof (eihi))
- {
- fprintf (file, _("cannot read EIHI\n"));
- return;
- }
+ || bfd_bread (&eihi, sizeof (eihi), abfd) != sizeof (eihi))
+ {
+ fprintf (file, _("cannot read EIHI\n"));
+ return;
+ }
/* xgettext:c-format */
fprintf (file, _("Image identification: (major: %u, minor: %u)\n"),
- (unsigned)bfd_getl32 (eihi.majorid),
- (unsigned)bfd_getl32 (eihi.minorid));
+ (unsigned)bfd_getl32 (eihi.majorid),
+ (unsigned)bfd_getl32 (eihi.minorid));
fprintf (file, _(" image name : %.*s\n"),
- eihi.imgnam[0], eihi.imgnam + 1);
+ eihi.imgnam[0], eihi.imgnam + 1);
fprintf (file, _(" link time : %s\n"),
- vms_time_to_str (eihi.linktime));
+ vms_time_to_str (eihi.linktime));
fprintf (file, _(" image ident : %.*s\n"),
- eihi.imgid[0], eihi.imgid + 1);
+ eihi.imgid[0], eihi.imgid + 1);
fprintf (file, _(" linker ident : %.*s\n"),
- eihi.linkid[0], eihi.linkid + 1);
+ eihi.linkid[0], eihi.linkid + 1);
fprintf (file, _(" image build ident: %.*s\n"),
- eihi.imgbid[0], eihi.imgbid + 1);
+ eihi.imgbid[0], eihi.imgbid + 1);
}
if (eihs_off != 0)
{
struct vms_eihs eihs;
if (bfd_seek (abfd, (file_ptr) eihs_off, SEEK_SET)
- || bfd_bread (&eihs, sizeof (eihs), abfd) != sizeof (eihs))
- {
- fprintf (file, _("cannot read EIHS\n"));
- return;
- }
+ || bfd_bread (&eihs, sizeof (eihs), abfd) != sizeof (eihs))
+ {
+ fprintf (file, _("cannot read EIHS\n"));
+ return;
+ }
/* xgettext:c-format */
fprintf (file, _("Image symbol & debug table: (major: %u, minor: %u)\n"),
- (unsigned)bfd_getl32 (eihs.majorid),
- (unsigned)bfd_getl32 (eihs.minorid));
+ (unsigned)bfd_getl32 (eihs.majorid),
+ (unsigned)bfd_getl32 (eihs.minorid));
dst_vbn = bfd_getl32 (eihs.dstvbn);
dst_size = bfd_getl32 (eihs.dstsize);
/* xgettext:c-format */
fprintf (file, _(" debug symbol table : vbn: %u, size: %u (0x%x)\n"),
- dst_vbn, dst_size, dst_size);
+ dst_vbn, dst_size, dst_size);
gst_vbn = bfd_getl32 (eihs.gstvbn);
gst_size = bfd_getl32 (eihs.gstsize);
/* xgettext:c-format */
fprintf (file, _(" global symbol table: vbn: %u, records: %u\n"),
- gst_vbn, gst_size);
+ gst_vbn, gst_size);
dmt_vbn = bfd_getl32 (eihs.dmtvbn);
dmt_size = bfd_getl32 (eihs.dmtsize);
/* xgettext:c-format */
fprintf (file, _(" debug module table : vbn: %u, size: %u\n"),
- dmt_vbn, dmt_size);
+ dmt_vbn, dmt_size);
}
while (eisd_off != 0)
{
unsigned int len;
while (1)
- {
- if (bfd_seek (abfd, (file_ptr) eisd_off, SEEK_SET)
- || bfd_bread (&eisd, sizeof (eisd), abfd) != sizeof (eisd))
- {
- fprintf (file, _("cannot read EISD\n"));
- return;
- }
- len = (unsigned)bfd_getl32 (eisd.eisdsize);
- if (len != (unsigned)-1)
- break;
-
- /* Next block. */
- eisd_off = (eisd_off + VMS_BLOCK_SIZE) & ~(VMS_BLOCK_SIZE - 1);
- }
+ {
+ if (bfd_seek (abfd, (file_ptr) eisd_off, SEEK_SET)
+ || bfd_bread (&eisd, sizeof (eisd), abfd) != sizeof (eisd))
+ {
+ fprintf (file, _("cannot read EISD\n"));
+ return;
+ }
+ len = (unsigned)bfd_getl32 (eisd.eisdsize);
+ if (len != (unsigned)-1)
+ break;
+
+ /* Next block. */
+ eisd_off = (eisd_off + VMS_BLOCK_SIZE) & ~(VMS_BLOCK_SIZE - 1);
+ }
/* xgettext:c-format */
fprintf (file, _("Image section descriptor: (major: %u, minor: %u, "
- "size: %u, offset: %u)\n"),
- (unsigned)bfd_getl32 (eisd.majorid),
- (unsigned)bfd_getl32 (eisd.minorid),
- len, eisd_off);
+ "size: %u, offset: %u)\n"),
+ (unsigned)bfd_getl32 (eisd.majorid),
+ (unsigned)bfd_getl32 (eisd.minorid),
+ len, eisd_off);
if (len == 0)
- break;
+ break;
/* xgettext:c-format */
fprintf (file, _(" section: base: 0x%08x%08x size: 0x%08x\n"),
- (unsigned)bfd_getl32 (eisd.virt_addr + 4),
- (unsigned)bfd_getl32 (eisd.virt_addr + 0),
- (unsigned)bfd_getl32 (eisd.secsize));
+ (unsigned)bfd_getl32 (eisd.virt_addr + 4),
+ (unsigned)bfd_getl32 (eisd.virt_addr + 0),
+ (unsigned)bfd_getl32 (eisd.secsize));
val = (unsigned)bfd_getl32 (eisd.flags);
fprintf (file, _(" flags: 0x%04x"), val);
if (val & EISD__M_GBL)
- fprintf (file, " GBL");
+ fprintf (file, " GBL");
if (val & EISD__M_CRF)
- fprintf (file, " CRF");
+ fprintf (file, " CRF");
if (val & EISD__M_DZRO)
- fprintf (file, " DZRO");
+ fprintf (file, " DZRO");
if (val & EISD__M_WRT)
- fprintf (file, " WRT");
+ fprintf (file, " WRT");
if (val & EISD__M_INITALCODE)
fprintf (file, " INITALCODE");
if (val & EISD__M_BASED)
- fprintf (file, " BASED");
+ fprintf (file, " BASED");
if (val & EISD__M_FIXUPVEC)
fprintf (file, " FIXUPVEC");
if (val & EISD__M_RESIDENT)
fprintf (file, " RESIDENT");
if (val & EISD__M_VECTOR)
- fprintf (file, " VECTOR");
+ fprintf (file, " VECTOR");
if (val & EISD__M_PROTECT)
fprintf (file, " PROTECT");
if (val & EISD__M_LASTCLU)
fprintf (file, " LASTCLU");
if (val & EISD__M_EXE)
- fprintf (file, " EXE");
+ fprintf (file, " EXE");
if (val & EISD__M_NONSHRADR)
fprintf (file, " NONSHRADR");
if (val & EISD__M_QUAD_LENGTH)
fprintf (file, " ALLOC_64BIT");
fprintf (file, "\n");
if (val & EISD__M_FIXUPVEC)
- {
- eiaf_vbn = bfd_getl32 (eisd.vbn);
- eiaf_size = bfd_getl32 (eisd.secsize);
- }
+ {
+ eiaf_vbn = bfd_getl32 (eisd.vbn);
+ eiaf_size = bfd_getl32 (eisd.secsize);
+ }
/* xgettext:c-format */
fprintf (file, _(" vbn: %u, pfc: %u, matchctl: %u type: %u ("),
- (unsigned)bfd_getl32 (eisd.vbn),
- eisd.pfc, eisd.matchctl, eisd.type);
+ (unsigned)bfd_getl32 (eisd.vbn),
+ eisd.pfc, eisd.matchctl, eisd.type);
switch (eisd.type)
- {
- case EISD__K_NORMAL:
- fputs (_("NORMAL"), file);
- break;
- case EISD__K_SHRFXD:
- fputs (_("SHRFXD"), file);
- break;
- case EISD__K_PRVFXD:
- fputs (_("PRVFXD"), file);
- break;
- case EISD__K_SHRPIC:
- fputs (_("SHRPIC"), file);
- break;
- case EISD__K_PRVPIC:
- fputs (_("PRVPIC"), file);
- break;
- case EISD__K_USRSTACK:
- fputs (_("USRSTACK"), file);
- break;
- default:
- fputs (_("*unknown*"), file);
- break;
- }
+ {
+ case EISD__K_NORMAL:
+ fputs (_("NORMAL"), file);
+ break;
+ case EISD__K_SHRFXD:
+ fputs (_("SHRFXD"), file);
+ break;
+ case EISD__K_PRVFXD:
+ fputs (_("PRVFXD"), file);
+ break;
+ case EISD__K_SHRPIC:
+ fputs (_("SHRPIC"), file);
+ break;
+ case EISD__K_PRVPIC:
+ fputs (_("PRVPIC"), file);
+ break;
+ case EISD__K_USRSTACK:
+ fputs (_("USRSTACK"), file);
+ break;
+ default:
+ fputs (_("*unknown*"), file);
+ break;
+ }
fputs (_(")\n"), file);
if (val & EISD__M_GBL)
/* xgettext:c-format */
- fprintf (file, _(" ident: 0x%08x, name: %.*s\n"),
- (unsigned)bfd_getl32 (eisd.ident),
- eisd.gblnam[0], eisd.gblnam + 1);
+ fprintf (file, _(" ident: 0x%08x, name: %.*s\n"),
+ (unsigned)bfd_getl32 (eisd.ident),
+ eisd.gblnam[0], eisd.gblnam + 1);
eisd_off += len;
}
if (dmt_vbn != 0)
{
if (bfd_seek (abfd, (file_ptr) (dmt_vbn - 1) * VMS_BLOCK_SIZE, SEEK_SET))
- {
- fprintf (file, _("cannot read DMT\n"));
- return;
- }
+ {
+ fprintf (file, _("cannot read DMT\n"));
+ return;
+ }
fprintf (file, _("Debug module table:\n"));
while (dmt_size > 0)
- {
- struct vms_dmt_header dmth;
- unsigned int count;
-
- if (bfd_bread (&dmth, sizeof (dmth), abfd) != sizeof (dmth))
- {
- fprintf (file, _("cannot read DMT header\n"));
- return;
- }
- count = bfd_getl16 (dmth.psect_count);
- fprintf (file,
+ {
+ struct vms_dmt_header dmth;
+ unsigned int count;
+
+ if (bfd_bread (&dmth, sizeof (dmth), abfd) != sizeof (dmth))
+ {
+ fprintf (file, _("cannot read DMT header\n"));
+ return;
+ }
+ count = bfd_getl16 (dmth.psect_count);
+ fprintf (file,
/* xgettext:c-format */
- _(" module offset: 0x%08x, size: 0x%08x, (%u psects)\n"),
- (unsigned)bfd_getl32 (dmth.modbeg),
- (unsigned)bfd_getl32 (dmth.size), count);
- dmt_size -= sizeof (dmth);
- while (count > 0)
- {
- struct vms_dmt_psect dmtp;
-
- if (bfd_bread (&dmtp, sizeof (dmtp), abfd) != sizeof (dmtp))
- {
- fprintf (file, _("cannot read DMT psect\n"));
- return;
- }
+ _(" module offset: 0x%08x, size: 0x%08x, (%u psects)\n"),
+ (unsigned)bfd_getl32 (dmth.modbeg),
+ (unsigned)bfd_getl32 (dmth.size), count);
+ dmt_size -= sizeof (dmth);
+ while (count > 0)
+ {
+ struct vms_dmt_psect dmtp;
+
+ if (bfd_bread (&dmtp, sizeof (dmtp), abfd) != sizeof (dmtp))
+ {
+ fprintf (file, _("cannot read DMT psect\n"));
+ return;
+ }
/* xgettext:c-format */
- fprintf (file, _(" psect start: 0x%08x, length: %u\n"),
- (unsigned)bfd_getl32 (dmtp.start),
- (unsigned)bfd_getl32 (dmtp.length));
- count--;
- dmt_size -= sizeof (dmtp);
- }
- }
+ fprintf (file, _(" psect start: 0x%08x, length: %u\n"),
+ (unsigned)bfd_getl32 (dmtp.start),
+ (unsigned)bfd_getl32 (dmtp.length));
+ count--;
+ dmt_size -= sizeof (dmtp);
+ }
+ }
}
if (dst_vbn != 0)
{
if (bfd_seek (abfd, (file_ptr) (dst_vbn - 1) * VMS_BLOCK_SIZE, SEEK_SET))
- {
- fprintf (file, _("cannot read DST\n"));
- return;
- }
+ {
+ fprintf (file, _("cannot read DST\n"));
+ return;
+ }
evax_bfd_print_dst (abfd, dst_size, file);
}
if (gst_vbn != 0)
{
if (bfd_seek (abfd, (file_ptr) (gst_vbn - 1) * VMS_BLOCK_SIZE, SEEK_SET))
- {
- fprintf (file, _("cannot read GST\n"));
- return;
- }
+ {
+ fprintf (file, _("cannot read GST\n"));
+ return;
+ }
fprintf (file, _("Global symbol table:\n"));
evax_bfd_print_eobj (abfd, file);
unsigned int codeadroff;
unsigned int lpfixoff;
unsigned int chgprtoff;
+ file_ptr f_off = (file_ptr) (eiaf_vbn - 1) * VMS_BLOCK_SIZE;
- buf = bfd_malloc (eiaf_size);
-
- if (bfd_seek (abfd, (file_ptr) (eiaf_vbn - 1) * VMS_BLOCK_SIZE, SEEK_SET)
- || bfd_bread (buf, eiaf_size, abfd) != eiaf_size)
- {
- fprintf (file, _("cannot read EIHA\n"));
- free (buf);
- return;
- }
+ if (bfd_seek (abfd, f_off, SEEK_SET) != 0
+ || (buf = _bfd_malloc_and_read (abfd, eiaf_size, eiaf_size)) == NULL)
+ {
+ fprintf (file, _("cannot read EIHA\n"));
+ return;
+ }
eiaf = (struct vms_eiaf *)buf;
fprintf (file,
/* xgettext:c-format */
- _("Image activator fixup: (major: %u, minor: %u)\n"),
- (unsigned)bfd_getl32 (eiaf->majorid),
- (unsigned)bfd_getl32 (eiaf->minorid));
+ _("Image activator fixup: (major: %u, minor: %u)\n"),
+ (unsigned)bfd_getl32 (eiaf->majorid),
+ (unsigned)bfd_getl32 (eiaf->minorid));
/* xgettext:c-format */
fprintf (file, _(" iaflink : 0x%08x %08x\n"),
- (unsigned)bfd_getl32 (eiaf->iaflink + 0),
- (unsigned)bfd_getl32 (eiaf->iaflink + 4));
+ (unsigned)bfd_getl32 (eiaf->iaflink + 0),
+ (unsigned)bfd_getl32 (eiaf->iaflink + 4));
/* xgettext:c-format */
fprintf (file, _(" fixuplnk: 0x%08x %08x\n"),
- (unsigned)bfd_getl32 (eiaf->fixuplnk + 0),
- (unsigned)bfd_getl32 (eiaf->fixuplnk + 4));
+ (unsigned)bfd_getl32 (eiaf->fixuplnk + 0),
+ (unsigned)bfd_getl32 (eiaf->fixuplnk + 4));
fprintf (file, _(" size : %u\n"),
- (unsigned)bfd_getl32 (eiaf->size));
+ (unsigned)bfd_getl32 (eiaf->size));
fprintf (file, _(" flags: 0x%08x\n"),
- (unsigned)bfd_getl32 (eiaf->flags));
+ (unsigned)bfd_getl32 (eiaf->flags));
qrelfixoff = bfd_getl32 (eiaf->qrelfixoff);
lrelfixoff = bfd_getl32 (eiaf->lrelfixoff);
/* xgettext:c-format */
fprintf (file, _(" qrelfixoff: %5u, lrelfixoff: %5u\n"),
- qrelfixoff, lrelfixoff);
+ qrelfixoff, lrelfixoff);
qdotadroff = bfd_getl32 (eiaf->qdotadroff);
ldotadroff = bfd_getl32 (eiaf->ldotadroff);
/* xgettext:c-format */
fprintf (file, _(" qdotadroff: %5u, ldotadroff: %5u\n"),
- qdotadroff, ldotadroff);
+ qdotadroff, ldotadroff);
codeadroff = bfd_getl32 (eiaf->codeadroff);
lpfixoff = bfd_getl32 (eiaf->lpfixoff);
/* xgettext:c-format */
fprintf (file, _(" codeadroff: %5u, lpfixoff : %5u\n"),
- codeadroff, lpfixoff);
+ codeadroff, lpfixoff);
chgprtoff = bfd_getl32 (eiaf->chgprtoff);
fprintf (file, _(" chgprtoff : %5u\n"), chgprtoff);
shrimgcnt = bfd_getl32 (eiaf->shrimgcnt);
shlstoff = bfd_getl32 (eiaf->shlstoff);
/* xgettext:c-format */
fprintf (file, _(" shlstoff : %5u, shrimgcnt : %5u\n"),
- shlstoff, shrimgcnt);
+ shlstoff, shrimgcnt);
/* xgettext:c-format */
fprintf (file, _(" shlextra : %5u, permctx : %5u\n"),
- (unsigned)bfd_getl32 (eiaf->shlextra),
- (unsigned)bfd_getl32 (eiaf->permctx));
+ (unsigned)bfd_getl32 (eiaf->shlextra),
+ (unsigned)bfd_getl32 (eiaf->permctx));
fprintf (file, _(" base_va : 0x%08x\n"),
- (unsigned)bfd_getl32 (eiaf->base_va));
+ (unsigned)bfd_getl32 (eiaf->base_va));
fprintf (file, _(" lppsbfixoff: %5u\n"),
- (unsigned)bfd_getl32 (eiaf->lppsbfixoff));
+ (unsigned)bfd_getl32 (eiaf->lppsbfixoff));
if (shlstoff)
- {
- struct vms_shl *shl = (struct vms_shl *)(buf + shlstoff);
- unsigned int j;
-
- fprintf (file, _(" Shareable images:\n"));
- for (j = 0; j < shrimgcnt; j++, shl++)
- {
- fprintf (file,
+ {
+ struct vms_shl *shl = (struct vms_shl *)(buf + shlstoff);
+ unsigned int j;
+
+ fprintf (file, _(" Shareable images:\n"));
+ for (j = 0; j < shrimgcnt; j++, shl++)
+ {
+ fprintf (file,
/* xgettext:c-format */
- _(" %u: size: %u, flags: 0x%02x, name: %.*s\n"),
- j, shl->size, shl->flags,
- shl->imgnam[0], shl->imgnam + 1);
- }
- }
+ _(" %u: size: %u, flags: 0x%02x, name: %.*s\n"),
+ j, shl->size, shl->flags,
+ shl->imgnam[0], shl->imgnam + 1);
+ }
+ }
if (qrelfixoff != 0)
- {
- fprintf (file, _(" quad-word relocation fixups:\n"));
- evax_bfd_print_relocation_records (file, buf + qrelfixoff, 8);
- }
+ {
+ fprintf (file, _(" quad-word relocation fixups:\n"));
+ evax_bfd_print_relocation_records (file, buf + qrelfixoff, 8);
+ }
if (lrelfixoff != 0)
- {
- fprintf (file, _(" long-word relocation fixups:\n"));
- evax_bfd_print_relocation_records (file, buf + lrelfixoff, 4);
- }
+ {
+ fprintf (file, _(" long-word relocation fixups:\n"));
+ evax_bfd_print_relocation_records (file, buf + lrelfixoff, 4);
+ }
if (qdotadroff != 0)
- {
- fprintf (file, _(" quad-word .address reference fixups:\n"));
- evax_bfd_print_address_fixups (file, buf + qdotadroff);
- }
+ {
+ fprintf (file, _(" quad-word .address reference fixups:\n"));
+ evax_bfd_print_address_fixups (file, buf + qdotadroff);
+ }
if (ldotadroff != 0)
- {
- fprintf (file, _(" long-word .address reference fixups:\n"));
- evax_bfd_print_address_fixups (file, buf + ldotadroff);
- }
+ {
+ fprintf (file, _(" long-word .address reference fixups:\n"));
+ evax_bfd_print_address_fixups (file, buf + ldotadroff);
+ }
if (codeadroff != 0)
- {
- fprintf (file, _(" Code Address Reference Fixups:\n"));
- evax_bfd_print_reference_fixups (file, buf + codeadroff);
- }
+ {
+ fprintf (file, _(" Code Address Reference Fixups:\n"));
+ evax_bfd_print_reference_fixups (file, buf + codeadroff);
+ }
if (lpfixoff != 0)
- {
- fprintf (file, _(" Linkage Pairs Reference Fixups:\n"));
- evax_bfd_print_reference_fixups (file, buf + lpfixoff);
- }
+ {
+ fprintf (file, _(" Linkage Pairs Reference Fixups:\n"));
+ evax_bfd_print_reference_fixups (file, buf + lpfixoff);
+ }
if (chgprtoff)
- {
- unsigned int count = (unsigned)bfd_getl32 (buf + chgprtoff);
- struct vms_eicp *eicp = (struct vms_eicp *)(buf + chgprtoff + 4);
- unsigned int j;
-
- fprintf (file, _(" Change Protection (%u entries):\n"), count);
- for (j = 0; j < count; j++, eicp++)
- {
- unsigned int prot = bfd_getl32 (eicp->newprt);
- fprintf (file,
+ {
+ unsigned int count = (unsigned)bfd_getl32 (buf + chgprtoff);
+ struct vms_eicp *eicp = (struct vms_eicp *)(buf + chgprtoff + 4);
+ unsigned int j;
+
+ fprintf (file, _(" Change Protection (%u entries):\n"), count);
+ for (j = 0; j < count; j++, eicp++)
+ {
+ unsigned int prot = bfd_getl32 (eicp->newprt);
+ fprintf (file,
/* xgettext:c-format */
- _(" base: 0x%08x %08x, size: 0x%08x, prot: 0x%08x "),
- (unsigned)bfd_getl32 (eicp->baseva + 4),
- (unsigned)bfd_getl32 (eicp->baseva + 0),
- (unsigned)bfd_getl32 (eicp->size),
- (unsigned)bfd_getl32 (eicp->newprt));
- switch (prot)
- {
- case PRT__C_NA:
- fprintf (file, "NA");
- break;
- case PRT__C_RESERVED:
- fprintf (file, "RES");
- break;
- case PRT__C_KW:
- fprintf (file, "KW");
- break;
- case PRT__C_KR:
- fprintf (file, "KR");
- break;
- case PRT__C_UW:
- fprintf (file, "UW");
- break;
- case PRT__C_EW:
- fprintf (file, "EW");
- break;
- case PRT__C_ERKW:
- fprintf (file, "ERKW");
- break;
- case PRT__C_ER:
- fprintf (file, "ER");
- break;
- case PRT__C_SW:
- fprintf (file, "SW");
- break;
- case PRT__C_SREW:
- fprintf (file, "SREW");
- break;
- case PRT__C_SRKW:
- fprintf (file, "SRKW");
- break;
- case PRT__C_SR:
- fprintf (file, "SR");
- break;
- case PRT__C_URSW:
- fprintf (file, "URSW");
- break;
- case PRT__C_UREW:
- fprintf (file, "UREW");
- break;
- case PRT__C_URKW:
- fprintf (file, "URKW");
- break;
- case PRT__C_UR:
- fprintf (file, "UR");
- break;
- default:
- fputs ("??", file);
- break;
- }
- fputc ('\n', file);
- }
- }
+ _(" base: 0x%08x %08x, size: 0x%08x, prot: 0x%08x "),
+ (unsigned)bfd_getl32 (eicp->baseva + 4),
+ (unsigned)bfd_getl32 (eicp->baseva + 0),
+ (unsigned)bfd_getl32 (eicp->size),
+ (unsigned)bfd_getl32 (eicp->newprt));
+ switch (prot)
+ {
+ case PRT__C_NA:
+ fprintf (file, "NA");
+ break;
+ case PRT__C_RESERVED:
+ fprintf (file, "RES");
+ break;
+ case PRT__C_KW:
+ fprintf (file, "KW");
+ break;
+ case PRT__C_KR:
+ fprintf (file, "KR");
+ break;
+ case PRT__C_UW:
+ fprintf (file, "UW");
+ break;
+ case PRT__C_EW:
+ fprintf (file, "EW");
+ break;
+ case PRT__C_ERKW:
+ fprintf (file, "ERKW");
+ break;
+ case PRT__C_ER:
+ fprintf (file, "ER");
+ break;
+ case PRT__C_SW:
+ fprintf (file, "SW");
+ break;
+ case PRT__C_SREW:
+ fprintf (file, "SREW");
+ break;
+ case PRT__C_SRKW:
+ fprintf (file, "SRKW");
+ break;
+ case PRT__C_SR:
+ fprintf (file, "SR");
+ break;
+ case PRT__C_URSW:
+ fprintf (file, "URSW");
+ break;
+ case PRT__C_UREW:
+ fprintf (file, "UREW");
+ break;
+ case PRT__C_URKW:
+ fprintf (file, "URKW");
+ break;
+ case PRT__C_UR:
+ fprintf (file, "UR");
+ break;
+ default:
+ fputs ("??", file);
+ break;
+ }
+ fputc ('\n', file);
+ }
+ }
free (buf);
}
}
else
{
if (bfd_seek (abfd, 0, SEEK_SET))
- return FALSE;
+ return FALSE;
evax_bfd_print_eobj (abfd, file);
}
return TRUE;
if (info)
{
if (info->strip == strip_all || info->strip == strip_debugger)
- {
- /* Discard the DST section. */
- dst_offset = 0;
- dst_section = NULL;
- }
+ {
+ /* Discard the DST section. */
+ dst_offset = 0;
+ dst_section = NULL;
+ }
else if (dst_section)
- {
- dst_offset = dst_section->output_offset;
- dst_section = dst_section->output_section;
- }
+ {
+ dst_offset = dst_section->output_offset;
+ dst_section = dst_section->output_section;
+ }
}
while (1)
return FALSE;
}
switch (type)
- {
- case EOBJ__C_ETIR:
- PRIV (image_section) = cur_section;
- PRIV (image_offset) = cur_offset;
- res = _bfd_vms_slurp_etir (abfd, info);
- cur_section = PRIV (image_section);
- cur_offset = PRIV (image_offset);
- break;
- case EOBJ__C_EDBG:
- case EOBJ__C_ETBT:
- if (dst_section == NULL)
- continue;
- PRIV (image_section) = dst_section;
- PRIV (image_offset) = dst_offset;
- res = _bfd_vms_slurp_etir (abfd, info);
- dst_offset = PRIV (image_offset);
- break;
- case EOBJ__C_EEOM:
- return TRUE;
- default:
- continue;
- }
+ {
+ case EOBJ__C_ETIR:
+ PRIV (image_section) = cur_section;
+ PRIV (image_offset) = cur_offset;
+ res = _bfd_vms_slurp_etir (abfd, info);
+ cur_section = PRIV (image_section);
+ cur_offset = PRIV (image_offset);
+ break;
+ case EOBJ__C_EDBG:
+ case EOBJ__C_ETBT:
+ if (dst_section == NULL)
+ continue;
+ PRIV (image_section) = dst_section;
+ PRIV (image_offset) = dst_offset;
+ res = _bfd_vms_slurp_etir (abfd, info);
+ dst_offset = PRIV (image_offset);
+ break;
+ case EOBJ__C_EEOM:
+ return TRUE;
+ default:
+ continue;
+ }
if (!res)
- {
- vms_debug2 ((2, "slurp eobj type %d failed\n", type));
- return FALSE;
- }
+ {
+ vms_debug2 ((2, "slurp eobj type %d failed\n", type));
+ return FALSE;
+ }
}
}
static int
alpha_vms_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
- struct bfd_link_info *info ATTRIBUTE_UNUSED)
+ struct bfd_link_info *info ATTRIBUTE_UNUSED)
{
return 0;
}
/* Add a linkage pair fixup at address SECT + OFFSET to SHLIB. */
-static void
+static bfd_boolean
alpha_vms_add_fixup_lp (struct bfd_link_info *info, bfd *src, bfd *shlib)
{
struct alpha_vms_shlib_el *sl;
asection *sect = PRIV2 (src, image_section);
file_ptr offset = PRIV2 (src, image_offset);
+ bfd_vma *p;
sl = &VEC_EL (alpha_vms_link_hash (info)->shrlibs,
- struct alpha_vms_shlib_el, PRIV2 (shlib, shr_index));
+ struct alpha_vms_shlib_el, PRIV2 (shlib, shr_index));
sl->has_fixups = TRUE;
- VEC_APPEND_EL (sl->lp, bfd_vma,
- sect->output_section->vma + sect->output_offset + offset);
+ p = VEC_APPEND (sl->lp, bfd_vma);
+ if (p == NULL)
+ return FALSE;
+ *p = sect->output_section->vma + sect->output_offset + offset;
sect->output_section->flags |= SEC_RELOC;
+ return TRUE;
}
/* Add a code address fixup at address SECT + OFFSET to SHLIB. */
-static void
+static bfd_boolean
alpha_vms_add_fixup_ca (struct bfd_link_info *info, bfd *src, bfd *shlib)
{
struct alpha_vms_shlib_el *sl;
asection *sect = PRIV2 (src, image_section);
file_ptr offset = PRIV2 (src, image_offset);
+ bfd_vma *p;
sl = &VEC_EL (alpha_vms_link_hash (info)->shrlibs,
- struct alpha_vms_shlib_el, PRIV2 (shlib, shr_index));
+ struct alpha_vms_shlib_el, PRIV2 (shlib, shr_index));
sl->has_fixups = TRUE;
- VEC_APPEND_EL (sl->ca, bfd_vma,
- sect->output_section->vma + sect->output_offset + offset);
+ p = VEC_APPEND (sl->ca, bfd_vma);
+ if (p == NULL)
+ return FALSE;
+ *p = sect->output_section->vma + sect->output_offset + offset;
sect->output_section->flags |= SEC_RELOC;
+ return TRUE;
}
/* Add a quad word relocation fixup at address SECT + OFFSET to SHLIB. */
-static void
+static bfd_boolean
alpha_vms_add_fixup_qr (struct bfd_link_info *info, bfd *src,
- bfd *shlib, bfd_vma vec)
+ bfd *shlib, bfd_vma vec)
{
struct alpha_vms_shlib_el *sl;
struct alpha_vms_vma_ref *r;
file_ptr offset = PRIV2 (src, image_offset);
sl = &VEC_EL (alpha_vms_link_hash (info)->shrlibs,
- struct alpha_vms_shlib_el, PRIV2 (shlib, shr_index));
+ struct alpha_vms_shlib_el, PRIV2 (shlib, shr_index));
sl->has_fixups = TRUE;
r = VEC_APPEND (sl->qr, struct alpha_vms_vma_ref);
+ if (r == NULL)
+ return FALSE;
r->vma = sect->output_section->vma + sect->output_offset + offset;
r->ref = vec;
sect->output_section->flags |= SEC_RELOC;
+ return TRUE;
}
-static void
+static bfd_boolean
alpha_vms_add_fixup_lr (struct bfd_link_info *info ATTRIBUTE_UNUSED,
- unsigned int shr ATTRIBUTE_UNUSED,
- bfd_vma vec ATTRIBUTE_UNUSED)
+ unsigned int shr ATTRIBUTE_UNUSED,
+ bfd_vma vec ATTRIBUTE_UNUSED)
{
/* Not yet supported. */
- abort ();
+ return FALSE;
}
/* Add relocation. FIXME: Not yet emitted. */
-static void
+static bfd_boolean
alpha_vms_add_lw_reloc (struct bfd_link_info *info ATTRIBUTE_UNUSED)
{
+ return FALSE;
}
-static void
+static bfd_boolean
alpha_vms_add_qw_reloc (struct bfd_link_info *info ATTRIBUTE_UNUSED)
{
+ return FALSE;
}
static struct bfd_hash_entry *
alpha_vms_link_hash_newfunc (struct bfd_hash_entry *entry,
- struct bfd_hash_table *table,
- const char *string)
+ struct bfd_hash_table *table,
+ const char *string)
{
struct alpha_vms_link_hash_entry *ret =
(struct alpha_vms_link_hash_entry *) entry;
if (ret == NULL)
ret = ((struct alpha_vms_link_hash_entry *)
bfd_hash_allocate (table,
- sizeof (struct alpha_vms_link_hash_entry)));
+ sizeof (struct alpha_vms_link_hash_entry)));
if (ret == NULL)
return NULL;
return (struct bfd_hash_entry *) ret;
}
+static void
+alpha_vms_bfd_link_hash_table_free (bfd *abfd)
+{
+ struct alpha_vms_link_hash_table *t;
+ unsigned i;
+
+ t = (struct alpha_vms_link_hash_table *) abfd->link.hash;
+ for (i = 0; i < VEC_COUNT (t->shrlibs); i++)
+ {
+ struct alpha_vms_shlib_el *shlib;
+
+ shlib = &VEC_EL (t->shrlibs, struct alpha_vms_shlib_el, i);
+ free (&VEC_EL (shlib->ca, bfd_vma, 0));
+ free (&VEC_EL (shlib->lp, bfd_vma, 0));
+ free (&VEC_EL (shlib->qr, struct alpha_vms_vma_ref, 0));
+ }
+ free (&VEC_EL (t->shrlibs, struct alpha_vms_shlib_el, 0));
+
+ _bfd_generic_link_hash_table_free (abfd);
+}
+
/* Create an Alpha/VMS link hash table. */
static struct bfd_link_hash_table *
alpha_vms_bfd_link_hash_table_create (bfd *abfd)
{
struct alpha_vms_link_hash_table *ret;
- bfd_size_type amt = sizeof (struct alpha_vms_link_hash_table);
+ size_t amt = sizeof (struct alpha_vms_link_hash_table);
ret = (struct alpha_vms_link_hash_table *) bfd_malloc (amt);
if (ret == NULL)
VEC_INIT (ret->shrlibs);
ret->fixup = NULL;
+ ret->root.hash_table_free = alpha_vms_bfd_link_hash_table_free;
return &ret->root;
}
asymbol sym;
if (!alpha_vms_convert_symbol (abfd, e, &sym))
- return FALSE;
+ return FALSE;
if ((e->flags & EGSY__V_DEF) && abfd->selective_search)
- {
- /* In selective_search mode, only add definition that are
- required. */
- h = (struct alpha_vms_link_hash_entry *)bfd_link_hash_lookup
- (info->hash, sym.name, FALSE, FALSE, FALSE);
- if (h == NULL || h->root.type != bfd_link_hash_undefined)
- continue;
- }
+ {
+ /* In selective_search mode, only add definition that are
+ required. */
+ h = (struct alpha_vms_link_hash_entry *)bfd_link_hash_lookup
+ (info->hash, sym.name, FALSE, FALSE, FALSE);
+ if (h == NULL || h->root.type != bfd_link_hash_undefined)
+ continue;
+ }
else
- h = NULL;
+ h = NULL;
h_root = (struct bfd_link_hash_entry *) h;
if (!_bfd_generic_link_add_one_symbol (info, abfd, sym.name, sym.flags,
sym.section, sym.value, NULL,
FALSE, FALSE, &h_root))
- return FALSE;
+ return FALSE;
h = (struct alpha_vms_link_hash_entry *) h_root;
if ((e->flags & EGSY__V_DEF)
- && h->sym == NULL
- && abfd->xvec == info->output_bfd->xvec)
- h->sym = e;
+ && h->sym == NULL
+ && abfd->xvec == info->output_bfd->xvec)
+ h->sym = e;
}
if (abfd->flags & DYNAMIC)
struct alpha_vms_shlib_el *shlib;
/* We do not want to include any of the sections in a dynamic
- object in the output file. See comment in elflink.c. */
+ object in the output file. See comment in elflink.c. */
bfd_section_list_clear (abfd);
shlib = VEC_APPEND (alpha_vms_link_hash (info)->shrlibs,
- struct alpha_vms_shlib_el);
+ struct alpha_vms_shlib_el);
+ if (shlib == NULL)
+ return FALSE;
shlib->abfd = abfd;
VEC_INIT (shlib->ca);
VEC_INIT (shlib->lp);
entry if it is the tail, because that would lose any
entries we add to the list later on. */
if (*pundef != info->hash->undefs_tail)
- {
- *pundef = *next_pundef;
- next_pundef = pundef;
- }
+ {
+ *pundef = *next_pundef;
+ next_pundef = pundef;
+ }
continue;
}
return FALSE;
if (element->archive_pass == -1 || element->archive_pass == pass)
- {
- /* Next symbol if this archive is wrong or already handled. */
- continue;
- }
+ {
+ /* Next symbol if this archive is wrong or already handled. */
+ continue;
+ }
if (! bfd_check_format (element, bfd_object))
- {
- element->archive_pass = -1;
- return FALSE;
- }
+ {
+ element->archive_pass = -1;
+ return FALSE;
+ }
orig_element = element;
if (bfd_is_thin_archive (abfd))
- {
- element = _bfd_vms_lib_get_imagelib_file (element);
- if (element == NULL || !bfd_check_format (element, bfd_object))
- {
- orig_element->archive_pass = -1;
- return FALSE;
- }
- }
+ {
+ element = _bfd_vms_lib_get_imagelib_file (element);
+ if (element == NULL || !bfd_check_format (element, bfd_object))
+ {
+ orig_element->archive_pass = -1;
+ return FALSE;
+ }
+ }
/* Unlike the generic linker, we know that this element provides
a definition for an undefined symbol and we know that we want
{
case bfd_object:
vms_debug2 ((2, "vms_link_add_symbols for object %s\n",
- abfd->filename));
+ abfd->filename));
return alpha_vms_link_add_object_symbols (abfd, info);
break;
case bfd_archive:
vms_debug2 ((2, "vms_link_add_symbols for archive %s\n",
- abfd->filename));
+ abfd->filename));
return alpha_vms_link_add_archive_symbols (abfd, info);
break;
default:
shlib = &VEC_EL (t->shrlibs, struct alpha_vms_shlib_el, i);
if (!shlib->has_fixups)
- continue;
+ continue;
shrimg_cnt++;
if (VEC_COUNT (shlib->ca) > 0)
- {
- /* Header + entries. */
- ca_sz += 8;
- ca_sz += VEC_COUNT (shlib->ca) * 4;
- }
+ {
+ /* Header + entries. */
+ ca_sz += 8;
+ ca_sz += VEC_COUNT (shlib->ca) * 4;
+ }
if (VEC_COUNT (shlib->lp) > 0)
- {
- /* Header + entries. */
- lp_sz += 8;
- lp_sz += VEC_COUNT (shlib->lp) * 4;
- }
+ {
+ /* Header + entries. */
+ lp_sz += 8;
+ lp_sz += VEC_COUNT (shlib->lp) * 4;
+ }
if (VEC_COUNT (shlib->qr) > 0)
- {
- /* Header + entries. */
- qr_sz += 8;
- qr_sz += VEC_COUNT (shlib->qr) * 8;
- }
+ {
+ /* Header + entries. */
+ qr_sz += 8;
+ qr_sz += VEC_COUNT (shlib->qr) * 8;
+ }
}
/* Add markers. */
if (ca_sz > 0)
{
/* This isect could be made RO or EXE after relocations are applied. */
if ((sec->flags & SEC_RELOC) != 0
- && (sec->flags & (SEC_CODE | SEC_READONLY)) != 0)
- chgprt_num++;
+ && (sec->flags & (SEC_CODE | SEC_READONLY)) != 0)
+ chgprt_num++;
}
chgprt_sz = 4 + chgprt_num * sizeof (struct vms_eicp);
/* Write shl. */
for (i = 0; i < VEC_COUNT (t->shrlibs); i++)
- {
- struct alpha_vms_shlib_el *shlib;
- struct vms_shl *shl;
-
- shlib = &VEC_EL (t->shrlibs, struct alpha_vms_shlib_el, i);
-
- if (!shlib->has_fixups)
- continue;
-
- /* Renumber shared images. */
- PRIV2 (shlib->abfd, shr_index) = shrimg_cnt++;
-
- shl = (struct vms_shl *)(content + off);
- bfd_putl32 (0, shl->baseva);
- bfd_putl32 (0, shl->shlptr);
- bfd_putl32 (0, shl->ident);
- bfd_putl32 (0, shl->permctx);
- shl->size = sizeof (struct vms_shl);
- bfd_putl16 (0, shl->fill_1);
- shl->flags = 0;
- bfd_putl32 (0, shl->icb);
- shl->imgnam[0] = strlen (PRIV2 (shlib->abfd, hdr_data.hdr_t_name));
- memcpy (shl->imgnam + 1, PRIV2 (shlib->abfd, hdr_data.hdr_t_name),
- shl->imgnam[0]);
-
- off += sizeof (struct vms_shl);
- }
+ {
+ struct alpha_vms_shlib_el *shlib;
+ struct vms_shl *shl;
+
+ shlib = &VEC_EL (t->shrlibs, struct alpha_vms_shlib_el, i);
+
+ if (!shlib->has_fixups)
+ continue;
+
+ /* Renumber shared images. */
+ PRIV2 (shlib->abfd, shr_index) = shrimg_cnt++;
+
+ shl = (struct vms_shl *)(content + off);
+ bfd_putl32 (0, shl->baseva);
+ bfd_putl32 (0, shl->shlptr);
+ bfd_putl32 (0, shl->ident);
+ bfd_putl32 (0, shl->permctx);
+ shl->size = sizeof (struct vms_shl);
+ bfd_putl16 (0, shl->fill_1);
+ shl->flags = 0;
+ bfd_putl32 (0, shl->icb);
+ shl->imgnam[0] = strlen (PRIV2 (shlib->abfd, hdr_data.hdr_t_name));
+ memcpy (shl->imgnam + 1, PRIV2 (shlib->abfd, hdr_data.hdr_t_name),
+ shl->imgnam[0]);
+
+ off += sizeof (struct vms_shl);
+ }
/* CA fixups. */
if (ca_sz != 0)
- {
- bfd_putl32 (off, eiaf->codeadroff);
+ {
+ bfd_putl32 (off, eiaf->codeadroff);
- for (i = 0; i < VEC_COUNT (t->shrlibs); i++)
- {
- struct alpha_vms_shlib_el *shlib;
- unsigned int j;
+ for (i = 0; i < VEC_COUNT (t->shrlibs); i++)
+ {
+ struct alpha_vms_shlib_el *shlib;
+ unsigned int j;
- shlib = &VEC_EL (t->shrlibs, struct alpha_vms_shlib_el, i);
+ shlib = &VEC_EL (t->shrlibs, struct alpha_vms_shlib_el, i);
- if (VEC_COUNT (shlib->ca) == 0)
- continue;
+ if (VEC_COUNT (shlib->ca) == 0)
+ continue;
- bfd_putl32 (VEC_COUNT (shlib->ca), content + off);
- bfd_putl32 (PRIV2 (shlib->abfd, shr_index), content + off + 4);
- off += 8;
+ bfd_putl32 (VEC_COUNT (shlib->ca), content + off);
+ bfd_putl32 (PRIV2 (shlib->abfd, shr_index), content + off + 4);
+ off += 8;
- for (j = 0; j < VEC_COUNT (shlib->ca); j++)
- {
- bfd_putl32 (VEC_EL (shlib->ca, bfd_vma, j) - t->base_addr,
- content + off);
- off += 4;
- }
- }
+ for (j = 0; j < VEC_COUNT (shlib->ca); j++)
+ {
+ bfd_putl32 (VEC_EL (shlib->ca, bfd_vma, j) - t->base_addr,
+ content + off);
+ off += 4;
+ }
+ }
- bfd_putl32 (0, content + off);
- bfd_putl32 (0, content + off + 4);
- off += 8;
- }
+ bfd_putl32 (0, content + off);
+ bfd_putl32 (0, content + off + 4);
+ off += 8;
+ }
/* LP fixups. */
if (lp_sz != 0)
- {
- bfd_putl32 (off, eiaf->lpfixoff);
+ {
+ bfd_putl32 (off, eiaf->lpfixoff);
- for (i = 0; i < VEC_COUNT (t->shrlibs); i++)
- {
- struct alpha_vms_shlib_el *shlib;
- unsigned int j;
+ for (i = 0; i < VEC_COUNT (t->shrlibs); i++)
+ {
+ struct alpha_vms_shlib_el *shlib;
+ unsigned int j;
- shlib = &VEC_EL (t->shrlibs, struct alpha_vms_shlib_el, i);
+ shlib = &VEC_EL (t->shrlibs, struct alpha_vms_shlib_el, i);
- if (VEC_COUNT (shlib->lp) == 0)
- continue;
+ if (VEC_COUNT (shlib->lp) == 0)
+ continue;
- bfd_putl32 (VEC_COUNT (shlib->lp), content + off);
- bfd_putl32 (PRIV2 (shlib->abfd, shr_index), content + off + 4);
- off += 8;
+ bfd_putl32 (VEC_COUNT (shlib->lp), content + off);
+ bfd_putl32 (PRIV2 (shlib->abfd, shr_index), content + off + 4);
+ off += 8;
- for (j = 0; j < VEC_COUNT (shlib->lp); j++)
- {
- bfd_putl32 (VEC_EL (shlib->lp, bfd_vma, j) - t->base_addr,
- content + off);
- off += 4;
- }
- }
+ for (j = 0; j < VEC_COUNT (shlib->lp); j++)
+ {
+ bfd_putl32 (VEC_EL (shlib->lp, bfd_vma, j) - t->base_addr,
+ content + off);
+ off += 4;
+ }
+ }
- bfd_putl32 (0, content + off);
- bfd_putl32 (0, content + off + 4);
- off += 8;
- }
+ bfd_putl32 (0, content + off);
+ bfd_putl32 (0, content + off + 4);
+ off += 8;
+ }
/* QR fixups. */
if (qr_sz != 0)
- {
- bfd_putl32 (off, eiaf->qdotadroff);
+ {
+ bfd_putl32 (off, eiaf->qdotadroff);
- for (i = 0; i < VEC_COUNT (t->shrlibs); i++)
- {
- struct alpha_vms_shlib_el *shlib;
- unsigned int j;
+ for (i = 0; i < VEC_COUNT (t->shrlibs); i++)
+ {
+ struct alpha_vms_shlib_el *shlib;
+ unsigned int j;
- shlib = &VEC_EL (t->shrlibs, struct alpha_vms_shlib_el, i);
+ shlib = &VEC_EL (t->shrlibs, struct alpha_vms_shlib_el, i);
- if (VEC_COUNT (shlib->qr) == 0)
- continue;
+ if (VEC_COUNT (shlib->qr) == 0)
+ continue;
- bfd_putl32 (VEC_COUNT (shlib->qr), content + off);
- bfd_putl32 (PRIV2 (shlib->abfd, shr_index), content + off + 4);
- off += 8;
+ bfd_putl32 (VEC_COUNT (shlib->qr), content + off);
+ bfd_putl32 (PRIV2 (shlib->abfd, shr_index), content + off + 4);
+ off += 8;
- for (j = 0; j < VEC_COUNT (shlib->qr); j++)
- {
- struct alpha_vms_vma_ref *r;
- r = &VEC_EL (shlib->qr, struct alpha_vms_vma_ref, j);
- bfd_putl32 (r->vma - t->base_addr, content + off);
- bfd_putl32 (r->ref, content + off + 4);
- off += 8;
- }
- }
+ for (j = 0; j < VEC_COUNT (shlib->qr); j++)
+ {
+ struct alpha_vms_vma_ref *r;
+ r = &VEC_EL (shlib->qr, struct alpha_vms_vma_ref, j);
+ bfd_putl32 (r->vma - t->base_addr, content + off);
+ bfd_putl32 (r->ref, content + off + 4);
+ off += 8;
+ }
+ }
- bfd_putl32 (0, content + off);
- bfd_putl32 (0, content + off + 4);
- off += 8;
- }
+ bfd_putl32 (0, content + off);
+ bfd_putl32 (0, content + off + 4);
+ off += 8;
+ }
}
/* Write the change protection table. */
unsigned int prot;
if ((sec->flags & SEC_LINKER_CREATED) != 0 &&
- strcmp (sec->name, "$FIXUP$") == 0)
- prot = PRT__C_UREW;
+ strcmp (sec->name, "$FIXUP$") == 0)
+ prot = PRT__C_UREW;
else if ((sec->flags & SEC_RELOC) != 0
- && (sec->flags & (SEC_CODE | SEC_READONLY)) != 0)
- prot = PRT__C_UR;
+ && (sec->flags & (SEC_CODE | SEC_READONLY)) != 0)
+ prot = PRT__C_UR;
else
- continue;
+ continue;
eicp = (struct vms_eicp *)(content + off);
bfd_putl64 (sec->vma - t->base_addr, eicp->baseva);
bfd_putl32 ((sec->size + VMS_BLOCK_SIZE - 1) & ~(VMS_BLOCK_SIZE - 1),
- eicp->size);
+ eicp->size);
bfd_putl32 (prot, eicp->newprt);
off += sizeof (struct vms_eicp);
}
case bfd_link_hash_defined:
case bfd_link_hash_defweak:
{
- asection *sec = h->root.u.def.section;
+ asection *sec = h->root.u.def.section;
- /* FIXME: this is certainly a symbol from a dynamic library. */
- if (bfd_is_abs_section (sec))
- return TRUE;
+ /* FIXME: this is certainly a symbol from a dynamic library. */
+ if (bfd_is_abs_section (sec))
+ return TRUE;
- if (sec->owner->flags & DYNAMIC)
- return TRUE;
+ if (sec->owner->flags & DYNAMIC)
+ return TRUE;
}
break;
case bfd_link_hash_common:
/* Do not write not kept symbols. */
if (info->strip == strip_some
&& bfd_hash_lookup (info->keep_hash, h->root.root.string,
- FALSE, FALSE) != NULL)
+ FALSE, FALSE) != NULL)
return TRUE;
if (h->sym == NULL)
{
/* This symbol doesn't come from a VMS object. So we suppose it is
- a data. */
+ a data. */
int len = strlen (h->root.root.string);
sym = (struct vms_symbol_entry *)bfd_zalloc (info->output_bfd,
- sizeof (*sym) + len);
+ sizeof (*sym) + len);
if (sym == NULL)
- abort ();
+ abort ();
sym->namelen = len;
memcpy (sym->name, h->root.root.string, len);
sym->name[len] = 0;
if (bfd_link_relocatable (info))
{
/* FIXME: we do not yet support relocatable link. It is not obvious
- how to do it for debug infos. */
+ how to do it for debug infos. */
(*info->callbacks->einfo)(_("%P: relocatable link is not supported\n"));
return FALSE;
}
- bfd_get_outsymbols (abfd) = NULL;
- bfd_get_symcount (abfd) = 0;
+ abfd->outsymbols = NULL;
+ abfd->symcount = 0;
/* Mark all sections which will be included in the output file. */
for (o = abfd->sections; o != NULL; o = o->next)
for (o = abfd->sections; o != NULL; o = o->next)
{
printf ("For section %s (at 0x%08x, flags=0x%08x):\n",
- o->name, (unsigned)o->vma, (unsigned)o->flags);
+ o->name, (unsigned)o->vma, (unsigned)o->flags);
for (p = o->map_head.link_order; p != NULL; p = p->next)
{
- printf (" at 0x%08x - 0x%08x: ",
- (unsigned)p->offset, (unsigned)(p->offset + p->size - 1));
+ printf (" at 0x%08x - 0x%08x: ",
+ (unsigned)p->offset, (unsigned)(p->offset + p->size - 1));
switch (p->type)
{
case bfd_section_reloc_link_order:
case bfd_symbol_reloc_link_order:
- printf (" section/symbol reloc\n");
+ printf (" section/symbol reloc\n");
break;
case bfd_indirect_link_order:
- printf (" section %s of %s\n",
- p->u.indirect.section->name,
- p->u.indirect.section->owner->filename);
+ printf (" section %s of %s\n",
+ p->u.indirect.section->name,
+ p->u.indirect.section->owner->filename);
+ break;
+ case bfd_data_link_order:
+ printf (" explicit data\n");
break;
- case bfd_data_link_order:
- printf (" explicit data\n");
- break;
default:
- printf (" *unknown* type %u\n", p->type);
+ printf (" *unknown* type %u\n", p->type);
break;
}
}
bfd *startbfd = NULL;
for (sub = info->input_bfds; sub != NULL; sub = sub->link.next)
- {
- /* Consider only VMS object files. */
- if (sub->xvec != abfd->xvec)
- continue;
-
- if (!PRIV2 (sub, eom_data).eom_has_transfer)
- continue;
- if ((PRIV2 (sub, eom_data).eom_b_tfrflg & EEOM__M_WKTFR) && startbfd)
- continue;
- if (startbfd != NULL
- && !(PRIV2 (sub, eom_data).eom_b_tfrflg & EEOM__M_WKTFR))
- {
- (*info->callbacks->einfo)
+ {
+ /* Consider only VMS object files. */
+ if (sub->xvec != abfd->xvec)
+ continue;
+
+ if (!PRIV2 (sub, eom_data).eom_has_transfer)
+ continue;
+ if ((PRIV2 (sub, eom_data).eom_b_tfrflg & EEOM__M_WKTFR) && startbfd)
+ continue;
+ if (startbfd != NULL
+ && !(PRIV2 (sub, eom_data).eom_b_tfrflg & EEOM__M_WKTFR))
+ {
+ (*info->callbacks->einfo)
/* xgettext:c-format */
- (_("%P: multiple entry points: in modules %B and %B\n"),
- startbfd, sub);
- continue;
- }
- startbfd = sub;
- }
+ (_("%P: multiple entry points: in modules %pB and %pB\n"),
+ startbfd, sub);
+ continue;
+ }
+ startbfd = sub;
+ }
if (startbfd)
- {
- unsigned int ps_idx = PRIV2 (startbfd, eom_data).eom_l_psindx;
- bfd_vma tfradr = PRIV2 (startbfd, eom_data).eom_l_tfradr;
- asection *sec;
+ {
+ unsigned int ps_idx = PRIV2 (startbfd, eom_data).eom_l_psindx;
+ bfd_vma tfradr = PRIV2 (startbfd, eom_data).eom_l_tfradr;
+ asection *sec;
- sec = PRIV2 (startbfd, sections)[ps_idx];
+ sec = PRIV2 (startbfd, sections)[ps_idx];
- bfd_set_start_address
- (abfd, sec->output_section->vma + sec->output_offset + tfradr);
- }
+ bfd_set_start_address
+ (abfd, sec->output_section->vma + sec->output_offset + tfradr);
+ }
}
/* Set transfer addresses. */
h = bfd_link_hash_lookup (info->hash, "LIB$INITIALIZE", FALSE, FALSE, TRUE);
if (h != NULL && h->type == bfd_link_hash_defined)
PRIV (transfer_address[i++]) =
- alpha_vms_get_sym_value (h->u.def.section, h->u.def.value);
+ alpha_vms_get_sym_value (h->u.def.section, h->u.def.value);
PRIV (transfer_address[i++]) = bfd_get_start_address (abfd);
while (i < 4)
PRIV (transfer_address[i++]) = 0;
for (o = abfd->sections; o != NULL; o = o->next)
{
if (o->flags & SEC_HAS_CONTENTS)
- {
- o->contents = bfd_alloc (abfd, o->size);
- if (o->contents == NULL)
- return FALSE;
- }
+ {
+ o->contents = bfd_alloc (abfd, o->size);
+ if (o->contents == NULL)
+ return FALSE;
+ }
if (o->flags & SEC_LOAD)
- {
- if (o->vma < base_addr)
- base_addr = o->vma;
- if (o->vma + o->size > last_addr)
- last_addr = o->vma + o->size;
- }
+ {
+ if (o->vma < base_addr)
+ base_addr = o->vma;
+ if (o->vma + o->size > last_addr)
+ last_addr = o->vma + o->size;
+ }
/* Clear the RELOC flags. Currently we don't support incremental
- linking. We use the RELOC flag for computing the eicp entries. */
+ linking. We use the RELOC flag for computing the eicp entries. */
o->flags &= ~SEC_RELOC;
}
{
PRIV (dst_section) = dst;
dmt = bfd_make_section_anyway_with_flags
- (info->output_bfd, "$DMT$",
- SEC_DEBUGGING | SEC_HAS_CONTENTS | SEC_LINKER_CREATED);
+ (info->output_bfd, "$DMT$",
+ SEC_DEBUGGING | SEC_HAS_CONTENTS | SEC_LINKER_CREATED);
if (dmt == NULL)
- return FALSE;
+ return FALSE;
}
else
dmt = NULL;
for (sub = info->input_bfds; sub != NULL; sub = sub->link.next)
{
if (sub->flags & DYNAMIC)
- {
- alpha_vms_create_eisd_for_shared (abfd, sub);
- continue;
- }
+ {
+ alpha_vms_create_eisd_for_shared (abfd, sub);
+ continue;
+ }
if (!alpha_vms_read_sections_content (sub, info))
- return FALSE;
+ return FALSE;
}
/* Handle all the link order information for the sections.
{
case bfd_section_reloc_link_order:
case bfd_symbol_reloc_link_order:
- abort ();
- return FALSE;
+ abort ();
+ return FALSE;
case bfd_indirect_link_order:
- /* Already done. */
+ /* Already done. */
break;
default:
if (! _bfd_default_link_order (abfd, info, o, p))
/* In pass 1, compute the size. In pass 2, write the DMT contents. */
for (pass = 0; pass < 2; pass++)
- {
- unsigned int off = 0;
-
- /* For each object file (ie for each module). */
- for (sub = info->input_bfds; sub != NULL; sub = sub->link.next)
- {
- asection *sub_dst;
- struct vms_dmt_header *dmth = NULL;
- unsigned int psect_count;
-
- /* Skip this module if it has no DST. */
- sub_dst = PRIV2 (sub, dst_section);
- if (sub_dst == NULL || sub_dst->size == 0)
- continue;
-
- if (pass == 1)
- {
- /* Write the header. */
- dmth = (struct vms_dmt_header *)(contents + off);
- bfd_putl32 (sub_dst->output_offset, dmth->modbeg);
- bfd_putl32 (sub_dst->size, dmth->size);
- }
-
- off += sizeof (struct vms_dmt_header);
- psect_count = 0;
-
- /* For each section (ie for each psect). */
- for (o = sub->sections; o != NULL; o = o->next)
- {
- /* Only consider interesting sections. */
- if (!(o->flags & SEC_ALLOC))
- continue;
- if (o->flags & SEC_LINKER_CREATED)
- continue;
-
- if (pass == 1)
- {
- /* Write an entry. */
- struct vms_dmt_psect *dmtp;
-
- dmtp = (struct vms_dmt_psect *)(contents + off);
- bfd_putl32 (o->output_offset + o->output_section->vma,
- dmtp->start);
- bfd_putl32 (o->size, dmtp->length);
- psect_count++;
- }
- off += sizeof (struct vms_dmt_psect);
- }
- if (pass == 1)
- bfd_putl32 (psect_count, dmth->psect_count);
- }
-
- if (pass == 0)
- {
- contents = bfd_zalloc (info->output_bfd, off);
- if (contents == NULL)
- return FALSE;
- dmt->contents = contents;
- dmt->size = off;
- }
- else
- {
- BFD_ASSERT (off == dmt->size);
- }
- }
+ {
+ unsigned int off = 0;
+
+ /* For each object file (ie for each module). */
+ for (sub = info->input_bfds; sub != NULL; sub = sub->link.next)
+ {
+ asection *sub_dst;
+ struct vms_dmt_header *dmth = NULL;
+ unsigned int psect_count;
+
+ /* Skip this module if it has no DST. */
+ sub_dst = PRIV2 (sub, dst_section);
+ if (sub_dst == NULL || sub_dst->size == 0)
+ continue;
+
+ if (pass == 1)
+ {
+ /* Write the header. */
+ dmth = (struct vms_dmt_header *)(contents + off);
+ bfd_putl32 (sub_dst->output_offset, dmth->modbeg);
+ bfd_putl32 (sub_dst->size, dmth->size);
+ }
+
+ off += sizeof (struct vms_dmt_header);
+ psect_count = 0;
+
+ /* For each section (ie for each psect). */
+ for (o = sub->sections; o != NULL; o = o->next)
+ {
+ /* Only consider interesting sections. */
+ if (!(o->flags & SEC_ALLOC))
+ continue;
+ if (o->flags & SEC_LINKER_CREATED)
+ continue;
+
+ if (pass == 1)
+ {
+ /* Write an entry. */
+ struct vms_dmt_psect *dmtp;
+
+ dmtp = (struct vms_dmt_psect *)(contents + off);
+ bfd_putl32 (o->output_offset + o->output_section->vma,
+ dmtp->start);
+ bfd_putl32 (o->size, dmtp->length);
+ psect_count++;
+ }
+ off += sizeof (struct vms_dmt_psect);
+ }
+ if (pass == 1)
+ bfd_putl32 (psect_count, dmth->psect_count);
+ }
+
+ if (pass == 0)
+ {
+ contents = bfd_zalloc (info->output_bfd, off);
+ if (contents == NULL)
+ return FALSE;
+ dmt->contents = contents;
+ dmt->size = off;
+ }
+ else
+ {
+ BFD_ASSERT (off == dmt->size);
+ }
+ }
}
return TRUE;
static bfd_boolean
alpha_vms_get_section_contents (bfd *abfd, asection *section,
- void *buf, file_ptr offset,
- bfd_size_type count)
+ void *buf, file_ptr offset,
+ bfd_size_type count)
{
asection *sec;
/* Image are easy. */
if (bfd_get_file_flags (abfd) & (EXEC_P | DYNAMIC))
return _bfd_generic_get_section_contents (abfd, section,
- buf, offset, count);
+ buf, offset, count);
/* Safety check. */
if (offset + count < count
BFD_ASSERT (sec->contents == NULL);
if (sec->size != 0 && (sec->flags & SEC_HAS_CONTENTS))
- {
- sec->contents = bfd_alloc (abfd, sec->size);
- if (sec->contents == NULL)
- return FALSE;
- }
+ {
+ sec->contents = bfd_alloc (abfd, sec->size);
+ if (sec->contents == NULL)
+ return FALSE;
+ }
}
if (!alpha_vms_read_sections_content (abfd, NULL))
return FALSE;
if (abfd == NULL || abfd->tdata.any == NULL)
return TRUE;
- if (abfd->format == bfd_archive)
+ if (abfd->format == bfd_object)
{
- bfd_release (abfd, abfd->tdata.any);
- abfd->tdata.any = NULL;
- return TRUE;
- }
-
- if (PRIV (recrd.buf) != NULL)
- free (PRIV (recrd.buf));
-
- if (PRIV (sections) != NULL)
- free (PRIV (sections));
-
- bfd_release (abfd, abfd->tdata.any);
- abfd->tdata.any = NULL;
+ alpha_vms_free_private (abfd);
#ifdef VMS
- if (abfd->direction == write_direction)
- {
- /* Last step on VMS is to convert the file to variable record length
- format. */
- if (!bfd_cache_close (abfd))
- return FALSE;
- if (!_bfd_vms_convert_to_var_unix_filename (abfd->filename))
- return FALSE;
- }
+ if (abfd->direction == write_direction)
+ {
+ /* Last step on VMS is to convert the file to variable record length
+ format. */
+ if (!bfd_cache_close (abfd))
+ return FALSE;
+ if (!_bfd_vms_convert_to_var_unix_filename (abfd->filename))
+ return FALSE;
+ }
#endif
+ }
- return TRUE;
+ return _bfd_generic_close_and_cleanup (abfd);
}
/* Called when a new section is created. */
static bfd_boolean
vms_new_section_hook (bfd * abfd, asection *section)
{
- bfd_size_type amt;
+ size_t amt;
vms_debug2 ((1, "vms_new_section_hook (%p, [%u]%s)\n",
- abfd, section->index, section->name));
+ abfd, section->index, section->name));
- if (! bfd_set_section_alignment (abfd, section, 0))
+ if (!bfd_set_section_alignment (section, 0))
return FALSE;
vms_debug2 ((7, "%u: %s\n", section->index, section->name));
bfd_print_symbol_type how)
{
vms_debug2 ((1, "vms_print_symbol (%p, %p, %p, %d)\n",
- abfd, file, symbol, how));
+ abfd, file, symbol, how));
switch (how)
{
bfd_print_symbol_vandf (abfd, file, symbol);
fprintf ((FILE *) file," %-8s %s", section_name, symbol->name);
- }
+ }
break;
}
}
else if (bfd_is_ind_section (sec))
ret->type = 'I';
else if ((symbol->flags & BSF_FUNCTION)
- || (bfd_get_section_flags (abfd, sec) & SEC_CODE))
+ || (bfd_section_flags (sec) & SEC_CODE))
ret->type = 'T';
- else if (bfd_get_section_flags (abfd, sec) & SEC_DATA)
+ else if (bfd_section_flags (sec) & SEC_DATA)
ret->type = 'D';
- else if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC)
+ else if (bfd_section_flags (sec) & SEC_ALLOC)
ret->type = 'B';
else
ret->type = '?';
static bfd_boolean
_bfd_vms_set_section_contents (bfd * abfd,
- asection *section,
- const void * location,
- file_ptr offset,
- bfd_size_type count)
+ asection *section,
+ const void * location,
+ file_ptr offset,
+ bfd_size_type count)
{
if (section->contents == NULL)
{
section->contents = bfd_alloc (abfd, section->size);
if (section->contents == NULL)
- return FALSE;
+ return FALSE;
memcpy (section->contents + offset, location, (size_t) count);
}
static bfd_boolean
alpha_vms_set_arch_mach (bfd *abfd,
- enum bfd_architecture arch, unsigned long mach)
+ enum bfd_architecture arch, unsigned long mach)
{
if (arch != bfd_arch_alpha
&& arch != bfd_arch_unknown)
return (struct vms_private_data_struct *)abfd->tdata.any;
}
-#define vms_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
-#define vms_bfd_link_just_syms _bfd_generic_link_just_syms
+#define vms_bfd_is_target_special_symbol _bfd_bool_bfd_asymbol_false
+#define vms_bfd_link_just_syms _bfd_generic_link_just_syms
#define vms_bfd_copy_link_hash_symbol_type \
_bfd_generic_copy_link_hash_symbol_type
-#define vms_bfd_is_group_section bfd_generic_is_group_section
-#define vms_bfd_discard_group bfd_generic_discard_group
-#define vms_section_already_linked _bfd_generic_section_already_linked
-#define vms_bfd_define_common_symbol bfd_generic_define_common_symbol
-#define vms_bfd_define_start_stop bfd_generic_define_start_stop
+#define vms_bfd_is_group_section bfd_generic_is_group_section
+#define vms_bfd_group_name bfd_generic_group_name
+#define vms_bfd_discard_group bfd_generic_discard_group
+#define vms_section_already_linked _bfd_generic_section_already_linked
+#define vms_bfd_define_common_symbol bfd_generic_define_common_symbol
+#define vms_bfd_link_hide_symbol _bfd_generic_link_hide_symbol
+#define vms_bfd_define_start_stop bfd_generic_define_start_stop
#define vms_bfd_copy_private_header_data _bfd_generic_bfd_copy_private_header_data
#define vms_bfd_copy_private_bfd_data _bfd_generic_bfd_copy_private_bfd_data
#define vms_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
#define vms_bfd_copy_private_section_data _bfd_generic_bfd_copy_private_section_data
#define vms_bfd_copy_private_symbol_data _bfd_generic_bfd_copy_private_symbol_data
-#define vms_bfd_set_private_flags _bfd_generic_bfd_set_private_flags
-#define vms_bfd_merge_private_bfd_data _bfd_generic_bfd_merge_private_bfd_data
+#define vms_bfd_set_private_flags _bfd_generic_bfd_set_private_flags
+#define vms_bfd_merge_private_bfd_data _bfd_generic_bfd_merge_private_bfd_data
/* Symbols table. */
-#define alpha_vms_make_empty_symbol _bfd_generic_make_empty_symbol
-#define alpha_vms_bfd_is_target_special_symbol \
- ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
-#define alpha_vms_print_symbol vms_print_symbol
-#define alpha_vms_get_symbol_info vms_get_symbol_info
+#define alpha_vms_make_empty_symbol _bfd_generic_make_empty_symbol
+#define alpha_vms_bfd_is_target_special_symbol _bfd_bool_bfd_asymbol_false
+#define alpha_vms_print_symbol vms_print_symbol
+#define alpha_vms_get_symbol_info vms_get_symbol_info
#define alpha_vms_get_symbol_version_string \
_bfd_nosymbols_get_symbol_version_string
-#define alpha_vms_read_minisymbols _bfd_generic_read_minisymbols
-#define alpha_vms_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
-#define alpha_vms_get_lineno _bfd_nosymbols_get_lineno
-#define alpha_vms_find_inliner_info _bfd_nosymbols_find_inliner_info
-#define alpha_vms_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define alpha_vms_find_nearest_line _bfd_vms_find_nearest_line
-#define alpha_vms_find_line _bfd_nosymbols_find_line
+#define alpha_vms_read_minisymbols _bfd_generic_read_minisymbols
+#define alpha_vms_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
+#define alpha_vms_get_lineno _bfd_nosymbols_get_lineno
+#define alpha_vms_find_inliner_info _bfd_nosymbols_find_inliner_info
+#define alpha_vms_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
+#define alpha_vms_find_nearest_line _bfd_vms_find_nearest_line
+#define alpha_vms_find_line _bfd_nosymbols_find_line
#define alpha_vms_bfd_is_local_label_name vms_bfd_is_local_label_name
/* Generic table. */
#define alpha_vms_bfd_lookup_section_flags bfd_generic_lookup_section_flags
#define alpha_vms_bfd_merge_sections bfd_generic_merge_sections
#define alpha_vms_bfd_is_group_section bfd_generic_is_group_section
+#define alpha_vms_bfd_group_name bfd_generic_group_name
#define alpha_vms_bfd_discard_group bfd_generic_discard_group
#define alpha_vms_section_already_linked \
_bfd_generic_section_already_linked
#define alpha_vms_bfd_define_common_symbol bfd_generic_define_common_symbol
+#define alpha_vms_bfd_link_hide_symbol _bfd_generic_link_hide_symbol
#define alpha_vms_bfd_define_start_stop bfd_generic_define_start_stop
#define alpha_vms_bfd_link_just_syms _bfd_generic_link_just_syms
#define alpha_vms_bfd_copy_link_hash_symbol_type \
_bfd_nodynamic_get_dynamic_reloc_upper_bound
#define alpha_vms_canonicalize_dynamic_reloc \
_bfd_nodynamic_canonicalize_dynamic_reloc
-#define alpha_vms_bfd_link_check_relocs _bfd_generic_link_check_relocs
+#define alpha_vms_bfd_link_check_relocs _bfd_generic_link_check_relocs
const bfd_target alpha_vms_vec =
{
bfd_getl32, bfd_getl_signed_32, bfd_putl32,
bfd_getl16, bfd_getl_signed_16, bfd_putl16,
- {_bfd_dummy_target, alpha_vms_object_p, /* bfd_check_format. */
- _bfd_vms_lib_alpha_archive_p, _bfd_dummy_target},
- {bfd_false, alpha_vms_mkobject, /* bfd_set_format. */
- _bfd_vms_lib_alpha_mkarchive, bfd_false},
- {bfd_false, alpha_vms_write_object_contents, /* bfd_write_contents. */
- _bfd_vms_lib_write_archive_contents, bfd_false},
+ { /* bfd_check_format. */
+ _bfd_dummy_target,
+ alpha_vms_object_p,
+ _bfd_vms_lib_alpha_archive_p,
+ _bfd_dummy_target
+ },
+ { /* bfd_set_format. */
+ _bfd_bool_bfd_false_error,
+ alpha_vms_mkobject,
+ _bfd_vms_lib_alpha_mkarchive,
+ _bfd_bool_bfd_false_error
+ },
+ { /* bfd_write_contents. */
+ _bfd_bool_bfd_false_error,
+ alpha_vms_write_object_contents,
+ _bfd_vms_lib_write_archive_contents,
+ _bfd_bool_bfd_false_error
+ },
BFD_JUMP_TABLE_GENERIC (alpha_vms),
BFD_JUMP_TABLE_COPY (vms),