]> git.ipfire.org Git - thirdparty/binutils-gdb.git/blobdiff - bfd/vms-tir.c
bfd/
[thirdparty/binutils-gdb.git] / bfd / vms-tir.c
index 6e5d97c34a5246347478b5d88775f6a71b992845..aa3e536044254b70fc8a23af6d03399d4d957a1b 100644 (file)
@@ -1,6 +1,7 @@
 /* vms-tir.c -- BFD back-end for VAX (openVMS/VAX) and
    EVAX (openVMS/Alpha) files.
-   Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004
+   Free Software Foundation, Inc.
 
    TIR record handling functions
    ETIR record handling functions
 
    Written by Klaus K"ampf (kkaempf@rmi.de)
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* The following type abbreviations are used:
 
@@ -34,8 +34,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
        qw      quadword (8 byte, 64 bit)
        da      data stream  */
 
-#include <ctype.h>
-
 #include "bfd.h"
 #include "sysdep.h"
 #include "bfdlink.h"
@@ -43,42 +41,77 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "vms.h"
 
-static void image_set_ptr PARAMS ((bfd *abfd, int psect, uquad offset));
-static void image_inc_ptr PARAMS ((bfd *abfd, uquad offset));
-static void image_dump PARAMS ((bfd *abfd, unsigned char *ptr, int size, int offset));
-static void image_write_b PARAMS ((bfd *abfd, unsigned int value));
-static void image_write_w PARAMS ((bfd *abfd, unsigned int value));
-static void image_write_l PARAMS ((bfd *abfd, unsigned long value));
-static void image_write_q PARAMS ((bfd *abfd, uquad value));
-
-/*-----------------------------------------------------------------------------*/
+static void image_set_ptr
+  PARAMS ((bfd *abfd, int psect, uquad offset));
+static void image_inc_ptr
+  PARAMS ((bfd *abfd, uquad offset));
+static void image_dump
+  PARAMS ((bfd *abfd, unsigned char *ptr, int size, int offset));
+static void image_write_b
+  PARAMS ((bfd *abfd, unsigned int value));
+static void image_write_w
+  PARAMS ((bfd *abfd, unsigned int value));
+static void image_write_l
+  PARAMS ((bfd *abfd, unsigned long value));
+static void image_write_q
+  PARAMS ((bfd *abfd, uquad value));
+static int check_section
+  PARAMS ((bfd *, int));
+static bfd_boolean etir_sta
+  PARAMS ((bfd *, int, unsigned char *));
+static bfd_boolean etir_sto
+  PARAMS ((bfd *, int, unsigned char *));
+static bfd_boolean etir_opr
+  PARAMS ((bfd *, int, unsigned char *));
+static bfd_boolean etir_ctl
+  PARAMS ((bfd *, int, unsigned char *));
+static bfd_boolean etir_stc
+  PARAMS ((bfd *, int, unsigned char *));
+static asection *new_section
+  PARAMS ((bfd *, int));
+static int alloc_section
+  PARAMS ((bfd *, unsigned int));
+static int etir_cmd
+  PARAMS ((bfd *, int, unsigned char *));
+static int analyze_tir
+  PARAMS ((bfd *, unsigned char *, unsigned int));
+static int analyze_etir
+  PARAMS ((bfd *, unsigned char *, unsigned int));
+static unsigned char * tir_opr
+  PARAMS ((bfd *, unsigned char *));
+static const char * tir_cmd_name
+  PARAMS ((int));
+static const char * cmd_name
+  PARAMS ((int));
 
+\f
 static int
 check_section (abfd, size)
      bfd *abfd;
      int size;
 {
-  int offset;
+  bfd_size_type offset;
 
-  offset = PRIV(image_ptr) - PRIV(image_section)->contents;
-  if ((offset + size) > PRIV(image_section)->_raw_size)
+  offset = PRIV (image_ptr) - PRIV (image_section)->contents;
+  if (offset + size > PRIV (image_section)->size)
     {
-      PRIV(image_section)->contents = bfd_realloc (PRIV(image_section)->contents, offset + size);
-      if (PRIV(image_section)->contents == 0)
+      PRIV (image_section)->contents
+       = bfd_realloc (PRIV (image_section)->contents, offset + size);
+      if (PRIV (image_section)->contents == 0)
        {
          (*_bfd_error_handler) (_("No Mem !"));
          return -1;
        }
-      PRIV(image_section)->_raw_size = offset + size;
-      PRIV(image_ptr) = PRIV(image_section)->contents + offset;
+      PRIV (image_section)->size = offset + size;
+      PRIV (image_ptr) = PRIV (image_section)->contents + offset;
     }
 
   return 0;
 }
 
-/* routines to fill sections contents during tir/etir read */
+/* Routines to fill sections contents during tir/etir read.  */
 
-/* Initialize image buffer pointer to be filled  */
+/* Initialize image buffer pointer to be filled.  */
 
 static void
 image_set_ptr (abfd, psect, offset)
@@ -88,16 +121,15 @@ image_set_ptr (abfd, psect, offset)
 {
 #if VMS_DEBUG
   _bfd_vms_debug (4, "image_set_ptr (%d=%s, %d)\n",
-               psect, PRIV(sections)[psect]->name, offset);
+                 psect, PRIV (sections)[psect]->name, offset);
 #endif
 
-  PRIV(image_ptr) = PRIV(sections)[psect]->contents + offset;
-  PRIV(image_section) = PRIV(sections)[psect];
+  PRIV (image_ptr) = PRIV (sections)[psect]->contents + offset;
+  PRIV (image_section) = PRIV (sections)[psect];
   return;
 }
 
-
-/* Increment image buffer pointer by offset  */
+/* Increment image buffer pointer by offset.  */
 
 static void
 image_inc_ptr (abfd, offset)
@@ -108,36 +140,35 @@ image_inc_ptr (abfd, offset)
   _bfd_vms_debug (4, "image_inc_ptr (%d)\n", offset);
 #endif
 
-  PRIV(image_ptr) += offset;
+  PRIV (image_ptr) += offset;
 
   return;
 }
 
-
-/* Dump multiple bytes to section image  */
+/* Dump multiple bytes to section image.  */
 
 static void
 image_dump (abfd, ptr, size, offset)
     bfd *abfd;
     unsigned char *ptr;
     int size;
-    int offset;
+    int offset ATTRIBUTE_UNUSED;
 {
 #if VMS_DEBUG
-  _bfd_vms_debug (8, "image_dump from (%p, %d) to (%p)\n", ptr, size, PRIV(image_ptr));
+  _bfd_vms_debug (8, "image_dump from (%p, %d) to (%p)\n", ptr, size,
+                 PRIV (image_ptr));
   _bfd_hexdump (9, ptr, size, offset);
 #endif
 
-  if (PRIV(is_vax) && check_section (abfd, size))
+  if (PRIV (is_vax) && check_section (abfd, size))
     return;
 
   while (size-- > 0)
-    *PRIV(image_ptr)++ = *ptr++;
+    *PRIV (image_ptr)++ = *ptr++;
   return;
 }
 
-
-/* Write byte to section image  */
+/* Write byte to section image.  */
 
 static void
 image_write_b (abfd, value)
@@ -145,18 +176,17 @@ image_write_b (abfd, value)
      unsigned int value;
 {
 #if VMS_DEBUG
-  _bfd_vms_debug (6, "image_write_b(%02x)\n", (int)value);
+  _bfd_vms_debug (6, "image_write_b(%02x)\n", (int) value);
 #endif
 
-  if (PRIV(is_vax) && check_section (abfd, 1))
+  if (PRIV (is_vax) && check_section (abfd, 1))
     return;
 
-  *PRIV(image_ptr)++ = (value & 0xff);
+  *PRIV (image_ptr)++ = (value & 0xff);
   return;
 }
 
-
-/* Write 2-byte word to image  */
+/* Write 2-byte word to image.  */
 
 static void
 image_write_w (abfd, value)
@@ -164,20 +194,19 @@ image_write_w (abfd, value)
      unsigned int value;
 {
 #if VMS_DEBUG
-  _bfd_vms_debug (6, "image_write_w(%04x)\n", (int)value);
+  _bfd_vms_debug (6, "image_write_w(%04x)\n", (int) value);
 #endif
 
-  if (PRIV(is_vax) && check_section (abfd, 2))
+  if (PRIV (is_vax) && check_section (abfd, 2))
     return;
 
-  bfd_putl16 (value, PRIV(image_ptr));
-  PRIV(image_ptr) += 2;
+  bfd_putl16 ((bfd_vma) value, PRIV (image_ptr));
+  PRIV (image_ptr) += 2;
 
   return;
 }
 
-
-/* Write 4-byte long to image  */
+/* Write 4-byte long to image.  */
 
 static void
 image_write_l (abfd, value)
@@ -188,17 +217,16 @@ image_write_l (abfd, value)
   _bfd_vms_debug (6, "image_write_l (%08lx)\n", value);
 #endif
 
-  if (PRIV(is_vax) && check_section (abfd, 4))
+  if (PRIV (is_vax) && check_section (abfd, 4))
     return;
 
-  bfd_putl32 (value, PRIV(image_ptr));
-  PRIV(image_ptr) += 4;
+  bfd_putl32 ((bfd_vma) value, PRIV (image_ptr));
+  PRIV (image_ptr) += 4;
 
   return;
 }
 
-
-/* Write 8-byte quad to image  */
+/* Write 8-byte quad to image.  */
 
 static void
 image_write_q (abfd, value)
@@ -209,28 +237,73 @@ image_write_q (abfd, value)
   _bfd_vms_debug (6, "image_write_q (%016lx)\n", value);
 #endif
 
-  if (PRIV(is_vax) && check_section (abfd, 8))
+  if (PRIV (is_vax) && check_section (abfd, 8))
     return;
 
-  bfd_putl64 (value, PRIV(image_ptr));
-  PRIV(image_ptr) += 8;
+  bfd_putl64 (value, PRIV (image_ptr));
+  PRIV (image_ptr) += 8;
 
   return;
 }
 \f
+static const char *
+cmd_name (cmd)
+     int cmd;
+{
+  switch (cmd)
+    {
+    case ETIR_S_C_STA_GBL: return "ETIR_S_C_STA_GBL";
+    case ETIR_S_C_STA_PQ: return "ETIR_S_C_STA_PQ";
+    case ETIR_S_C_STA_LI: return "ETIR_S_C_STA_LI";
+    case ETIR_S_C_STA_MOD: return "ETIR_S_C_STA_MOD";
+    case ETIR_S_C_STA_CKARG: return "ETIR_S_C_STA_CKARG";
+    case ETIR_S_C_STO_B: return "ETIR_S_C_STO_B";
+    case ETIR_S_C_STO_W: return "ETIR_S_C_STO_W";
+    case ETIR_S_C_STO_GBL: return "ETIR_S_C_STO_GBL";
+    case ETIR_S_C_STO_CA: return "ETIR_S_C_STO_CA";
+    case ETIR_S_C_STO_RB: return "ETIR_S_C_STO_RB";
+    case ETIR_S_C_STO_AB: return "ETIR_S_C_STO_AB";
+    case ETIR_S_C_STO_GBL_LW: return "ETIR_S_C_STO_GBL_LW";
+    case ETIR_S_C_STO_LP_PSB: return "ETIR_S_C_STO_LP_PSB";
+    case ETIR_S_C_STO_HINT_GBL: return "ETIR_S_C_STO_HINT_GBL";
+    case ETIR_S_C_STO_HINT_PS: return "ETIR_S_C_STO_HINT_PS";
+    case ETIR_S_C_OPR_INSV: return "ETIR_S_C_OPR_INSV";
+    case ETIR_S_C_OPR_USH: return "ETIR_S_C_OPR_USH";
+    case ETIR_S_C_OPR_ROT: return "ETIR_S_C_OPR_ROT";
+    case ETIR_S_C_OPR_REDEF: return "ETIR_S_C_OPR_REDEF";
+    case ETIR_S_C_OPR_DFLIT: return "ETIR_S_C_OPR_DFLIT";
+    case ETIR_S_C_STC_LP: return "ETIR_S_C_STC_LP";
+    case ETIR_S_C_STC_GBL: return "ETIR_S_C_STC_GBL";
+    case ETIR_S_C_STC_GCA: return "ETIR_S_C_STC_GCA";
+    case ETIR_S_C_STC_PS: return "ETIR_S_C_STC_PS";
+    case ETIR_S_C_STC_NBH_PS: return "ETIR_S_C_STC_NBH_PS";
+    case ETIR_S_C_STC_NOP_GBL: return "ETIR_S_C_STC_NOP_GBL";
+    case ETIR_S_C_STC_NOP_PS: return "ETIR_S_C_STC_NOP_PS";
+    case ETIR_S_C_STC_BSR_GBL: return "ETIR_S_C_STC_BSR_GBL";
+    case ETIR_S_C_STC_BSR_PS: return "ETIR_S_C_STC_BSR_PS";
+    case ETIR_S_C_STC_LDA_GBL: return "ETIR_S_C_STC_LDA_GBL";
+    case ETIR_S_C_STC_LDA_PS: return "ETIR_S_C_STC_LDA_PS";
+    case ETIR_S_C_STC_BOH_GBL: return "ETIR_S_C_STC_BOH_GBL";
+    case ETIR_S_C_STC_BOH_PS: return "ETIR_S_C_STC_BOH_PS";
+    case ETIR_S_C_STC_NBH_GBL: return "ETIR_S_C_STC_NBH_GBL";
 
+    default:
+      /* These names have not yet been added to this switch statement.  */
+      abort ();
+    }
+}
 #define HIGHBIT(op) ((op & 0x80000000L) == 0x80000000L)
 
 /* etir_sta
-  
+
    vms stack commands
-  
+
    handle sta_xxx commands in etir section
    ptr points to data area in record
-  
-   see table B-8 of the openVMS linker manual  */
 
-static boolean
+   see table B-8 of the openVMS linker manual.  */
+
+static bfd_boolean
 etir_sta (abfd, cmd, ptr)
      bfd *abfd;
      int cmd;
@@ -239,7 +312,7 @@ etir_sta (abfd, cmd, ptr)
 
 #if VMS_DEBUG
   _bfd_vms_debug (5, "etir_sta %d/%x\n", cmd, cmd);
-  _bfd_hexdump (8, ptr, 16, (int)ptr);
+  _bfd_hexdump (8, ptr, 16, (int) ptr);
 #endif
 
   switch (cmd)
@@ -247,107 +320,105 @@ etir_sta (abfd, cmd, ptr)
       /* stack */
 
       /* stack global
-          arg: cs      symbol name
+        arg: cs        symbol name
 
-          stack 32 bit value of symbol (high bits set to 0)  */
+        stack 32 bit value of symbol (high bits set to 0)  */
 
-      case ETIR_S_C_STA_GBL:
-       {
-         char *name;
-         vms_symbol_entry *entry;
+    case ETIR_S_C_STA_GBL:
+      {
+       char *name;
+       vms_symbol_entry *entry;
 
-         name = _bfd_vms_save_counted_string (ptr);
-         entry = (vms_symbol_entry *)
-                 bfd_hash_lookup (PRIV(vms_symbol_table), name, false, false);
-         if (entry == (vms_symbol_entry *)NULL)
-           {
+       name = _bfd_vms_save_counted_string (ptr);
+       entry = (vms_symbol_entry *)
+         bfd_hash_lookup (PRIV (vms_symbol_table), name, FALSE, FALSE);
+       if (entry == (vms_symbol_entry *) NULL)
+         {
 #if VMS_DEBUG
-             _bfd_vms_debug (3, "ETIR_S_C_STA_GBL: no symbol \"%s\"\n", name);
+           _bfd_vms_debug (3, "%s: no symbol \"%s\"\n",
+                           cmd_name (cmd), name);
 #endif
-             _bfd_vms_push (abfd, (uquad)0, -1);
-           }
-         else
-           {
-             _bfd_vms_push (abfd, (uquad)(entry->symbol->value), -1);
-           }
-       }
+           _bfd_vms_push (abfd, (uquad) 0, -1);
+         }
+       else
+         {
+           _bfd_vms_push (abfd, (uquad) (entry->symbol->value), -1);
+         }
+      }
       break;
 
-       /* stack longword
-          arg: lw      value
+      /* stack longword
+        arg: lw        value
 
-          stack 32 bit value, sign extend to 64 bit  */
+        stack 32 bit value, sign extend to 64 bit  */
 
-      case ETIR_S_C_STA_LW:
-       _bfd_vms_push (abfd, (uquad)bfd_getl32 (ptr), -1);
+    case ETIR_S_C_STA_LW:
+      _bfd_vms_push (abfd, (uquad) bfd_getl32 (ptr), -1);
       break;
 
-       /* stack global
-          arg: qw      value
+      /* stack global
+        arg: qw        value
 
-          stack 64 bit value of symbol  */
+        stack 64 bit value of symbol    */
 
-      case ETIR_S_C_STA_QW:
-       _bfd_vms_push (abfd, (uquad)bfd_getl64(ptr), -1);
+    case ETIR_S_C_STA_QW:
+      _bfd_vms_push (abfd, (uquad) bfd_getl64 (ptr), -1);
       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_S_C_STO_OFF, ETIR_S_C_CTL_SETRB)  */
+        stack qw argument and section index
+        (see ETIR_S_C_STO_OFF, ETIR_S_C_CTL_SETRB)  */
 
-      case ETIR_S_C_STA_PQ:
-       {
-         uquad dummy;
-         int psect;
+    case ETIR_S_C_STA_PQ:
+      {
+       uquad dummy;
+       unsigned int psect;
 
-         psect = bfd_getl32 (ptr);
-         if (psect >= PRIV(section_count))
-           {
-             (*_bfd_error_handler) (_("Bad section index in ETIR_S_C_STA_PQ"));
-             bfd_set_error (bfd_error_bad_value);
-             return false;
-           }
-         dummy = bfd_getl64 (ptr+4);
-         _bfd_vms_push (abfd, dummy, psect);
-        }
+       psect = bfd_getl32 (ptr);
+       if (psect >= PRIV (section_count))
+         {
+           (*_bfd_error_handler) (_("bad section index in %s"),
+                                  cmd_name (cmd));
+           bfd_set_error (bfd_error_bad_value);
+           return FALSE;
+         }
+       dummy = bfd_getl64 (ptr+4);
+       _bfd_vms_push (abfd, dummy, (int) psect);
+      }
       break;
 
-       /* all not supported  */
-
-      case ETIR_S_C_STA_LI:
-      case ETIR_S_C_STA_MOD:
-      case ETIR_S_C_STA_CKARG:
-
-       (*_bfd_error_handler) (_("Unsupported STA cmd %d"), cmd);
-       return false;
+    case ETIR_S_C_STA_LI:
+    case ETIR_S_C_STA_MOD:
+    case ETIR_S_C_STA_CKARG:
+      (*_bfd_error_handler) (_("unsupported STA cmd %s"), cmd_name (cmd));
+      return FALSE;
       break;
 
-      default:
-       (*_bfd_error_handler) (_("Reserved STA cmd %d"), cmd);
-       return false;
+    default:
+      (*_bfd_error_handler) (_("reserved STA cmd %d"), cmd);
+      return FALSE;
       break;
     }
 #if VMS_DEBUG
   _bfd_vms_debug (5, "etir_sta true\n");
 #endif
-  return true;
+  return TRUE;
 }
 
-
 /*
    etir_sto
-  
+
    vms store commands
-  
+
    handle sto_xxx commands in etir section
    ptr points to data area in record
-  
-   see table B-9 of the openVMS linker manual  */
 
-static boolean
+   see table B-9 of the openVMS linker manual.  */
+
+static bfd_boolean
 etir_sto (abfd, cmd, ptr)
      bfd *abfd;
      int cmd;
@@ -358,12 +429,11 @@ etir_sto (abfd, cmd, ptr)
 
 #if VMS_DEBUG
   _bfd_vms_debug (5, "etir_sto %d/%x\n", cmd, cmd);
-  _bfd_hexdump (8, ptr, 16, (int)ptr);
+  _bfd_hexdump (8, ptr, 16, (int) ptr);
 #endif
 
   switch (cmd)
     {
-
       /* store byte: pop stack, write byte
         arg: -  */
 
@@ -371,9 +441,11 @@ etir_sto (abfd, cmd, ptr)
       dummy = _bfd_vms_pop (abfd, &psect);
 #if 0
       if (is_share)            /* FIXME */
-       (*_bfd_error_handler) ("ETIR_S_C_STO_B: byte fixups not supported");
+       (*_bfd_error_handler) ("%s: byte fixups not supported",
+                              cmd_name (cmd));
 #endif
-      image_write_b (abfd, dummy & 0xff);      /* FIXME: check top bits */
+      /* FIXME: check top bits */
+      image_write_b (abfd, (unsigned int) dummy & 0xff);
       break;
 
       /* store word: pop stack, write word
@@ -383,9 +455,11 @@ etir_sto (abfd, cmd, ptr)
       dummy = _bfd_vms_pop (abfd, &psect);
 #if 0
       if (is_share)            /* FIXME */
-       (*_bfd_error_handler) ("ETIR_S_C_STO_B: word fixups not supported");
+       (*_bfd_error_handler) ("%s: word fixups not supported",
+                              cmd_name (cmd));
 #endif
-      image_write_w (abfd, dummy & 0xffff);    /* FIXME: check top bits */
+      /* FIXME: check top bits */
+      image_write_w (abfd, (unsigned int) dummy & 0xffff);
       break;
 
       /* store longword: pop stack, write longword
@@ -393,8 +467,9 @@ etir_sto (abfd, cmd, ptr)
 
     case ETIR_S_C_STO_LW:
       dummy = _bfd_vms_pop (abfd, &psect);
-      dummy += (PRIV(sections)[psect])->vma;
-      image_write_l (abfd, dummy & 0xffffffff);/* FIXME: check top bits */
+      dummy += (PRIV (sections)[psect])->vma;
+      /* FIXME: check top bits.  */
+      image_write_l (abfd, (unsigned int) dummy & 0xffffffff);
       break;
 
       /* store quadword: pop stack, write quadword
@@ -402,7 +477,7 @@ etir_sto (abfd, cmd, ptr)
 
     case ETIR_S_C_STO_QW:
       dummy = _bfd_vms_pop (abfd, &psect);
-      dummy += (PRIV(sections)[psect])->vma;
+      dummy += (PRIV (sections)[psect])->vma;
       image_write_q (abfd, dummy);             /* FIXME: check top bits */
       break;
 
@@ -412,17 +487,17 @@ etir_sto (abfd, cmd, ptr)
 
     case ETIR_S_C_STO_IMMR:
       {
-       unsigned long size;
+       int size;
 
        size = bfd_getl32 (ptr);
-       dummy = (unsigned long)_bfd_vms_pop (abfd, NULL);
-       while (dummy-- > 0L)
+       dummy = (unsigned long) _bfd_vms_pop (abfd, NULL);
+       while (dummy-- > 0)
          image_dump (abfd, ptr+4, size, 0);
       }
       break;
 
       /* store global: write symbol value
-        arg: cs        global symbol name  */
+        arg: cs        global symbol name.  */
 
     case ETIR_S_C_STO_GBL:
       {
@@ -430,20 +505,22 @@ etir_sto (abfd, cmd, ptr)
        char *name;
 
        name = _bfd_vms_save_counted_string (ptr);
-       entry = (vms_symbol_entry *)bfd_hash_lookup (PRIV(vms_symbol_table), name, false, false);
-       if (entry == (vms_symbol_entry *)NULL)
+       entry = (vms_symbol_entry *) bfd_hash_lookup (PRIV (vms_symbol_table),
+                                                     name, FALSE, FALSE);
+       if (entry == (vms_symbol_entry *) NULL)
          {
-           (*_bfd_error_handler) (_("ETIR_S_C_STO_GBL: no symbol \"%s\""),
-                                  name);
-           return false;
+           (*_bfd_error_handler) (_("%s: no symbol \"%s\""),
+                                  cmd_name (cmd), name);
+           return FALSE;
          }
        else
-         image_write_q (abfd, (uquad)(entry->symbol->value));  /* FIXME, reloc */
+         /* FIXME, reloc.  */
+         image_write_q (abfd, (uquad) (entry->symbol->value));
       }
       break;
 
       /* store code address: write address of entry point
-        arg: cs        global symbol name (procedure)  */
+        arg: cs        global symbol name (procedure).  */
 
     case ETIR_S_C_STO_CA:
       {
@@ -451,42 +528,36 @@ etir_sto (abfd, cmd, ptr)
        char *name;
 
        name = _bfd_vms_save_counted_string (ptr);
-       entry = (vms_symbol_entry *) bfd_hash_lookup (PRIV(vms_symbol_table), name, false, false);
-       if (entry == (vms_symbol_entry *)NULL)
+       entry = (vms_symbol_entry *) bfd_hash_lookup (PRIV (vms_symbol_table),
+                                                     name, FALSE, FALSE);
+       if (entry == (vms_symbol_entry *) NULL)
          {
-           (*_bfd_error_handler) (_("ETIR_S_C_STO_CA: no symbol \"%s\""),
-                                  name);
-           return false;
+           (*_bfd_error_handler) (_("%s: no symbol \"%s\""),
+                                  cmd_name (cmd), name);
+           return FALSE;
          }
        else
-         image_write_q (abfd, (uquad)(entry->symbol->value));  /* FIXME, reloc */
+         image_write_q (abfd, (uquad) (entry->symbol->value)); /* FIXME, reloc */
       }
       break;
 
-      /* not supported  */
-
-    case ETIR_S_C_STO_RB:
-    case ETIR_S_C_STO_AB:
-      (*_bfd_error_handler) (_("ETIR_S_C_STO_RB/AB: Not supported"));
-      break;
-
-    /* store offset to psect: pop stack, add low 32 bits to base of psect
-       arg: -  */
+      /* Store offset to psect: pop stack, add low 32 bits to base of psect
+        arg: none.  */
 
     case ETIR_S_C_STO_OFF:
       {
        uquad q;
-       int psect;
+       int psect1;
 
-       q = _bfd_vms_pop (abfd, &psect);
-       q += (PRIV(sections)[psect])->vma;
+       q = _bfd_vms_pop (abfd, &psect1);
+       q += (PRIV (sections)[psect1])->vma;
        image_write_q (abfd, q);
       }
       break;
 
-      /* store immediate
+      /* Store immediate
         arg: lw        count of bytes
-        da     data  */
+             da        data.  */
 
     case ETIR_S_C_STO_IMM:
       {
@@ -497,11 +568,12 @@ etir_sto (abfd, cmd, ptr)
       }
       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.
+      /* 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  */
+        arg: cs        symbol name.  */
 
     case ETIR_S_C_STO_GBL_LW:
       {
@@ -509,217 +581,163 @@ etir_sto (abfd, cmd, ptr)
        char *name;
 
        name = _bfd_vms_save_counted_string (ptr);
-       entry = (vms_symbol_entry *)bfd_hash_lookup (PRIV(vms_symbol_table), name, false, false);
-       if (entry == (vms_symbol_entry *)NULL)
+       entry = (vms_symbol_entry *) bfd_hash_lookup (PRIV (vms_symbol_table),
+                                                     name, FALSE, FALSE);
+       if (entry == (vms_symbol_entry *) NULL)
          {
 #if VMS_DEBUG
-           _bfd_vms_debug (3, "ETIR_S_C_STO_GBL_LW: no symbol \"%s\"\n", name);
+           _bfd_vms_debug (3, "%s: no symbol \"%s\"\n", cmd_name (cmd), name);
 #endif
-           image_write_l (abfd, (unsigned long)0);     /* FIXME, reloc */
+           image_write_l (abfd, (unsigned long) 0);    /* FIXME, reloc */
          }
        else
-         image_write_l (abfd, (unsigned long)(entry->symbol->value));  /* FIXME, reloc */
+         /* FIXME, reloc.  */
+         image_write_l (abfd, (unsigned long) (entry->symbol->value));
       }
       break;
 
-      /* not supported  */
-
+    case ETIR_S_C_STO_RB:
+    case ETIR_S_C_STO_AB:
     case ETIR_S_C_STO_LP_PSB:
-      (*_bfd_error_handler) (_("ETIR_S_C_STO_LP_PSB: Not supported"));
+      (*_bfd_error_handler) (_("%s: not supported"), cmd_name (cmd));
       break;
 
-    /* */
-
     case ETIR_S_C_STO_HINT_GBL:
-      (*_bfd_error_handler) (_("ETIR_S_C_STO_HINT_GBL: not implemented"));
-      break;
-
-    /* */
-
     case ETIR_S_C_STO_HINT_PS:
-      (*_bfd_error_handler) (_("ETIR_S_C_STO_HINT_PS: not implemented"));
+      (*_bfd_error_handler) (_("%s: not implemented"), cmd_name (cmd));
       break;
 
     default:
-      (*_bfd_error_handler) (_("Reserved STO cmd %d"), cmd);
+      (*_bfd_error_handler) (_("reserved STO cmd %d"), cmd);
       break;
     }
 
-  return true;
+  return TRUE;
 }
 
-/* stack operator commands
+/* Stack operator commands
    all 32 bit signed arithmetic
    all word just like a stack calculator
    arguments are popped from stack, results are pushed on stack
-  
-   see table B-10 of the openVMS linker manual  */
 
-static boolean
+   see table B-10 of the openVMS linker manual.  */
+
+static bfd_boolean
 etir_opr (abfd, cmd, ptr)
      bfd *abfd;
      int cmd;
-     unsigned char *ptr;
+     unsigned char *ptr ATTRIBUTE_UNUSED;
 {
   long op1, op2;
 
 #if VMS_DEBUG
   _bfd_vms_debug (5, "etir_opr %d/%x\n", cmd, cmd);
-  _bfd_hexdump (8, ptr, 16, (int)ptr);
+  _bfd_hexdump (8, ptr, 16, (int) ptr);
 #endif
 
   switch (cmd)
     {
-      /* operation */
-
-      /* no-op  */
-
-    case ETIR_S_C_OPR_NOP:
+    case ETIR_S_C_OPR_NOP:      /* no-op  */
       break;
 
-      /* add  */
-
-    case ETIR_S_C_OPR_ADD:
-      op1 = (long)_bfd_vms_pop (abfd, NULL);
-      op2 = (long)_bfd_vms_pop (abfd, NULL);
-      _bfd_vms_push (abfd, (uquad)(op1 + op2), -1);
+    case ETIR_S_C_OPR_ADD:      /* add  */
+      op1 = (long) _bfd_vms_pop (abfd, NULL);
+      op2 = (long) _bfd_vms_pop (abfd, NULL);
+      _bfd_vms_push (abfd, (uquad) (op1 + op2), -1);
       break;
 
-      /* subtract  */
-
-    case ETIR_S_C_OPR_SUB:
-      op1 = (long)_bfd_vms_pop (abfd, NULL);
-      op2 = (long)_bfd_vms_pop (abfd, NULL);
-      _bfd_vms_push (abfd, (uquad)(op2 - op1), -1);
+    case ETIR_S_C_OPR_SUB:      /* subtract  */
+      op1 = (long) _bfd_vms_pop (abfd, NULL);
+      op2 = (long) _bfd_vms_pop (abfd, NULL);
+      _bfd_vms_push (abfd, (uquad) (op2 - op1), -1);
       break;
 
-      /* multiply  */
-
-    case ETIR_S_C_OPR_MUL:
-      op1 = (long)_bfd_vms_pop (abfd, NULL);
-      op2 = (long)_bfd_vms_pop (abfd, NULL);
-      _bfd_vms_push (abfd, (uquad)(op1 * op2), -1);
+    case ETIR_S_C_OPR_MUL:      /* multiply  */
+      op1 = (long) _bfd_vms_pop (abfd, NULL);
+      op2 = (long) _bfd_vms_pop (abfd, NULL);
+      _bfd_vms_push (abfd, (uquad) (op1 * op2), -1);
       break;
 
-      /* divide  */
-
-    case ETIR_S_C_OPR_DIV:
-      op1 = (long)_bfd_vms_pop (abfd, NULL);
-      op2 = (long)_bfd_vms_pop (abfd, NULL);
+    case ETIR_S_C_OPR_DIV:      /* divide  */
+      op1 = (long) _bfd_vms_pop (abfd, NULL);
+      op2 = (long) _bfd_vms_pop (abfd, NULL);
       if (op2 == 0)
-       _bfd_vms_push (abfd, (uquad)0L, -1);
+       _bfd_vms_push (abfd, (uquad) 0, -1);
       else
-       _bfd_vms_push (abfd, (uquad)(op2 / op1), -1);
+       _bfd_vms_push (abfd, (uquad) (op2 / op1), -1);
       break;
 
-      /* logical and  */
-
-    case ETIR_S_C_OPR_AND:
-      op1 = (long)_bfd_vms_pop (abfd, NULL);
-      op2 = (long)_bfd_vms_pop (abfd, NULL);
-      _bfd_vms_push (abfd, (uquad)(op1 & op2), -1);
-      break;
-
-      /* logical inclusive or   */
-
-    case ETIR_S_C_OPR_IOR:
-      op1 = (long)_bfd_vms_pop (abfd, NULL);
-      op2 = (long)_bfd_vms_pop (abfd, NULL);
-      _bfd_vms_push (abfd, (uquad)(op1 | op2), -1);
+    case ETIR_S_C_OPR_AND:      /* logical and  */
+      op1 = (long) _bfd_vms_pop (abfd, NULL);
+      op2 = (long) _bfd_vms_pop (abfd, NULL);
+      _bfd_vms_push (abfd, (uquad) (op1 & op2), -1);
       break;
 
-      /* logical exclusive or  */
-
-    case ETIR_S_C_OPR_EOR:
-      op1 = (long)_bfd_vms_pop (abfd, NULL);
-      op2 = (long)_bfd_vms_pop (abfd, NULL);
-      _bfd_vms_push (abfd, (uquad)(op1 ^ op2), -1);
+    case ETIR_S_C_OPR_IOR:      /* logical inclusive or         */
+      op1 = (long) _bfd_vms_pop (abfd, NULL);
+      op2 = (long) _bfd_vms_pop (abfd, NULL);
+      _bfd_vms_push (abfd, (uquad) (op1 | op2), -1);
       break;
 
-      /* negate  */
-
-    case ETIR_S_C_OPR_NEG:
-      op1 = (long)_bfd_vms_pop (abfd, NULL);
-      _bfd_vms_push (abfd, (uquad)(-op1), -1);
+    case ETIR_S_C_OPR_EOR:      /* logical exclusive or  */
+      op1 = (long) _bfd_vms_pop (abfd, NULL);
+      op2 = (long) _bfd_vms_pop (abfd, NULL);
+      _bfd_vms_push (abfd, (uquad) (op1 ^ op2), -1);
       break;
 
-      /* complement  */
-
-    case ETIR_S_C_OPR_COM:
-      op1 = (long)_bfd_vms_pop (abfd, NULL);
-      _bfd_vms_push (abfd, (uquad)(op1 ^ -1L), -1);
+    case ETIR_S_C_OPR_NEG:      /* negate  */
+      op1 = (long) _bfd_vms_pop (abfd, NULL);
+      _bfd_vms_push (abfd, (uquad) (-op1), -1);
       break;
 
-      /* insert field  */
-
-    case ETIR_S_C_OPR_INSV:
-      (void)_bfd_vms_pop (abfd, NULL);
-      (*_bfd_error_handler) (_("ETIR_S_C_OPR_INSV: Not supported"));
+    case ETIR_S_C_OPR_COM:      /* complement  */
+      op1 = (long) _bfd_vms_pop (abfd, NULL);
+      _bfd_vms_push (abfd, (uquad) (op1 ^ -1L), -1);
       break;
 
-    /* arithmetic shift  */
-
-    case ETIR_S_C_OPR_ASH:
-      op1 = (long)_bfd_vms_pop (abfd, NULL);
-      op2 = (long)_bfd_vms_pop (abfd, NULL);
+    case ETIR_S_C_OPR_ASH:      /* arithmetic shift  */
+      op1 = (long) _bfd_vms_pop (abfd, NULL);
+      op2 = (long) _bfd_vms_pop (abfd, NULL);
       if (op2 < 0)             /* shift right */
        op1 >>= -op2;
       else                     /* shift left */
        op1 <<= op2;
-      _bfd_vms_push (abfd, (uquad)op1, -1);
-      break;
-
-      /* unsigned shift  */
-
-    case ETIR_S_C_OPR_USH:
-      (*_bfd_error_handler) (_("ETIR_S_C_OPR_USH: Not supported"));
+      _bfd_vms_push (abfd, (uquad) op1, -1);
       break;
 
-      /* rotate  */
-
-    case ETIR_S_C_OPR_ROT:
-      (*_bfd_error_handler) (_("ETIR_S_C_OPR_ROT: Not supported"));
+    case ETIR_S_C_OPR_INSV:      /* insert field  */
+      (void) _bfd_vms_pop (abfd, NULL);
+    case ETIR_S_C_OPR_USH:       /* unsigned shift  */
+    case ETIR_S_C_OPR_ROT:       /* rotate  */
+    case ETIR_S_C_OPR_REDEF:     /* Redefine symbol to current location.  */
+    case ETIR_S_C_OPR_DFLIT:     /* Define a literal.  */
+      (*_bfd_error_handler) (_("%s: not supported"), cmd_name (cmd));
       break;
 
-      /* select  */
-
-    case ETIR_S_C_OPR_SEL:
-      if ((long)_bfd_vms_pop (abfd, NULL) & 0x01L)
-       (void)_bfd_vms_pop (abfd, NULL);
+    case ETIR_S_C_OPR_SEL:      /* select  */
+      if ((long) _bfd_vms_pop (abfd, NULL) & 0x01L)
+       (void) _bfd_vms_pop (abfd, NULL);
       else
        {
-         op1 = (long)_bfd_vms_pop (abfd, NULL);
-         (void)_bfd_vms_pop (abfd, NULL);
-         _bfd_vms_push (abfd, (uquad)op1, -1);
+         op1 = (long) _bfd_vms_pop (abfd, NULL);
+         (void) _bfd_vms_pop (abfd, NULL);
+         _bfd_vms_push (abfd, (uquad) op1, -1);
        }
       break;
 
-      /* redefine symbol to current location  */
-
-    case ETIR_S_C_OPR_REDEF:
-      (*_bfd_error_handler) (_("ETIR_S_C_OPR_REDEF: Not supported"));
-      break;
-
-      /* define a literal  */
-
-    case ETIR_S_C_OPR_DFLIT:
-      (*_bfd_error_handler) (_("ETIR_S_C_OPR_DFLIT: Not supported"));
-      break;
-
     default:
-      (*_bfd_error_handler) (_("Reserved OPR cmd %d"), cmd);
+      (*_bfd_error_handler) (_("reserved OPR cmd %d"), cmd);
       break;
     }
 
-  return true;
+  return TRUE;
 }
 
+/* Control commands.
 
-/* control commands
-  
-   see table B-11 of the openVMS linker manual  */
+   See table B-11 of the openVMS linker manual.  */
 
-static boolean
+static bfd_boolean
 etir_ctl (abfd, cmd, ptr)
      bfd *abfd;
      int cmd;
@@ -730,13 +748,13 @@ etir_ctl (abfd, cmd, ptr)
 
 #if VMS_DEBUG
   _bfd_vms_debug (5, "etir_ctl %d/%x\n", cmd, cmd);
-  _bfd_hexdump (8, ptr, 16, (int)ptr);
+  _bfd_hexdump (8, ptr, 16, (int) ptr);
 #endif
 
   switch (cmd)
     {
       /* set relocation base: pop stack, set image location counter
-        arg: -  */
+        arg: none.  */
 
     case ETIR_S_C_CTL_SETRB:
       dummy = _bfd_vms_pop (abfd, &psect);
@@ -752,7 +770,7 @@ etir_ctl (abfd, cmd, ptr)
       break;
 
       /* define location: pop index, save location counter under index
-        arg: -  */
+        arg: none.  */
 
     case ETIR_S_C_CTL_DFLOC:
       dummy = _bfd_vms_pop (abfd, NULL);
@@ -760,7 +778,7 @@ etir_ctl (abfd, cmd, ptr)
       break;
 
       /* set location: pop index, restore location counter from index
-        arg: -  */
+        arg: none.  */
 
     case ETIR_S_C_CTL_STLOC:
       dummy = _bfd_vms_pop (abfd, &psect);
@@ -768,7 +786,7 @@ etir_ctl (abfd, cmd, ptr)
       break;
 
       /* stack defined location: pop index, push location counter from index
-        arg: -  */
+        arg: none.  */
 
     case ETIR_S_C_CTL_STKDL:
       dummy = _bfd_vms_pop (abfd, &psect);
@@ -776,138 +794,138 @@ etir_ctl (abfd, cmd, ptr)
       break;
 
     default:
-      (*_bfd_error_handler) (_("Reserved CTL cmd %d"), cmd);
+      (*_bfd_error_handler) (_("reserved CTL cmd %d"), cmd);
       break;
     }
-  return true;
+  return TRUE;
 }
 
-
 /* store conditional commands
-  
-   see table B-12 and B-13 of the openVMS linker manual  */
 
-static boolean
+   See table B-12 and B-13 of the openVMS linker manual.  */
+
+static bfd_boolean
 etir_stc (abfd, cmd, ptr)
      bfd *abfd;
      int cmd;
-     unsigned char *ptr;
+     unsigned char *ptr ATTRIBUTE_UNUSED;
 {
-
 #if VMS_DEBUG
   _bfd_vms_debug (5, "etir_stc %d/%x\n", cmd, cmd);
-  _bfd_hexdump (8, ptr, 16, (int)ptr);
+  _bfd_hexdump (8, ptr, 16, (int) ptr);
 #endif
 
   switch (cmd)
     {
       /* 200 Store-conditional Linkage Pair
-        arg:  */
+        arg: none.  */
 
     case ETIR_S_C_STC_LP:
-      (*_bfd_error_handler) (_("ETIR_S_C_STC_LP: not supported"));
+      (*_bfd_error_handler) (_("%s: not supported"), cmd_name (cmd));
       break;
 
       /* 201 Store-conditional Linkage Pair with Procedure Signature
         arg:   lw      linkage index
-        cs     procedure name
-        by     signature length
-        da     signature  */
+               cs      procedure name
+               by      signature length
+               da      signature.  */
 
     case ETIR_S_C_STC_LP_PSB:
-      image_inc_ptr (abfd, 16);        /* skip entry,procval */
+      image_inc_ptr (abfd, (uquad) 16);        /* skip entry,procval */
       break;
 
       /* 202 Store-conditional Address at global address
         arg:   lw      linkage index
-        cs     global name  */
+               cs      global name.  */
 
     case ETIR_S_C_STC_GBL:
-      (*_bfd_error_handler) (_("ETIR_S_C_STC_GBL: not supported"));
+      (*_bfd_error_handler) (_("%s: not supported"), cmd_name (cmd));
       break;
 
       /* 203 Store-conditional Code Address at global address
         arg:   lw      linkage index
-        cs     procedure name  */
+               cs      procedure name.  */
 
     case ETIR_S_C_STC_GCA:
-      (*_bfd_error_handler) (_("ETIR_S_C_STC_GCA: not supported"));
+      (*_bfd_error_handler) (_("%s: not supported"), cmd_name (cmd));
       break;
 
       /* 204 Store-conditional Address at psect + offset
         arg:   lw      linkage index
-        lw     psect index
-        qw     offset  */
+               lw      psect index
+               qw      offset.  */
 
     case ETIR_S_C_STC_PS:
-      (*_bfd_error_handler) (_("ETIR_S_C_STC_PS: not supported"));
+      (*_bfd_error_handler) (_("%s: not supported"), cmd_name (cmd));
       break;
 
       /* 205 Store-conditional NOP at address of global
-        arg:  */
+        arg: none.  */
 
     case ETIR_S_C_STC_NOP_GBL:
 
       /* 206 Store-conditional NOP at pect + offset
-        arg:  */
+        arg: none.  */
 
     case ETIR_S_C_STC_NOP_PS:
 
       /* 207 Store-conditional BSR at global address
-        arg:  */
+        arg: none.  */
 
     case ETIR_S_C_STC_BSR_GBL:
 
       /* 208 Store-conditional BSR at pect + offset
-        arg:  */
+        arg: none.  */
 
     case ETIR_S_C_STC_BSR_PS:
 
       /* 209 Store-conditional LDA at global address
-        arg:  */
+        arg: none.  */
 
     case ETIR_S_C_STC_LDA_GBL:
 
       /* 210 Store-conditional LDA at psect + offset
-        arg:  */
+        arg: none.  */
 
     case ETIR_S_C_STC_LDA_PS:
 
       /* 211 Store-conditional BSR or Hint at global address
-        arg:  */
+        arg: none.  */
 
     case ETIR_S_C_STC_BOH_GBL:
 
       /* 212 Store-conditional BSR or Hint at pect + offset
-        arg:  */
+        arg: none.  */
 
     case ETIR_S_C_STC_BOH_PS:
 
       /* 213 Store-conditional NOP,BSR or HINT at global address
-        arg:  */
+        arg: none.  */
 
     case ETIR_S_C_STC_NBH_GBL:
 
       /* 214 Store-conditional NOP,BSR or HINT at psect + offset
-        arg:  */
+        arg: none.  */
 
     case ETIR_S_C_STC_NBH_PS:
-/* FIXME     (*_bfd_error_handler) ("ETIR_S_C_STC_xx: (%d) not supported", cmd); */
+      /* FIXME */
+#if 0
+      (*_bfd_error_handler) ("%s: not supported", cmd_name (cmd));
+#endif
       break;
 
     default:
 #if VMS_DEBUG
-      _bfd_vms_debug (3,  "Reserved STC cmd %d", cmd);
+      _bfd_vms_debug (3,  "reserved STC cmd %d", cmd);
 #endif
       break;
     }
-  return true;
+  return TRUE;
 }
 
-
 static asection *
 new_section (abfd, idx)
-     bfd *abfd;
+     bfd *abfd ATTRIBUTE_UNUSED;
      int idx;
 {
   asection *section;
@@ -915,16 +933,16 @@ new_section (abfd, idx)
   char *name;
 
 #if VMS_DEBUG
-  _bfd_vms_debug (5,  "new_section %d\n", idx);
+  _bfd_vms_debug (5, "new_section %d\n", idx);
 #endif
   sprintf (sname, SECTION_NAME_TEMPLATE, idx);
 
-  name = bfd_malloc (strlen (sname) + 1);
+  name = bfd_malloc ((bfd_size_type) strlen (sname) + 1);
   if (name == 0)
     return 0;
   strcpy (name, sname);
 
-  section = bfd_malloc (sizeof (asection));
+  section = bfd_malloc ((bfd_size_type) sizeof (asection));
   if (section == 0)
     {
 #if VMS_DEBUG
@@ -933,53 +951,52 @@ new_section (abfd, idx)
       return 0;
     }
 
-  section->_raw_size = 0;
+  section->size = 0;
   section->vma = 0;
   section->contents = 0;
-  section->_cooked_size = 0;
   section->name = name;
   section->index = idx;
 
   return section;
 }
 
-
 static int
 alloc_section (abfd, idx)
      bfd *abfd;
-     int idx;
+     unsigned int idx;
 {
+  bfd_size_type amt;
+
 #if VMS_DEBUG
-  _bfd_vms_debug (4,  "alloc_section %d\n", idx);
+  _bfd_vms_debug (4, "alloc_section %d\n", idx);
 #endif
 
-  PRIV(sections) = ((asection **)
-                   bfd_realloc (PRIV(sections), (idx+1) * sizeof (asection *)));
-  if (PRIV(sections) == 0)
+  amt = idx + 1;
+  amt *= sizeof (asection *);
+  PRIV (sections) = (asection **) bfd_realloc (PRIV (sections), amt);
+  if (PRIV (sections) == 0)
     return -1;
 
-  while (PRIV(section_count) <= idx)
+  while (PRIV (section_count) <= idx)
     {
-      PRIV(sections)[PRIV(section_count)] = new_section (abfd, PRIV(section_count));
-      if (PRIV(sections)[PRIV(section_count)] == 0)
+      PRIV (sections)[PRIV (section_count)]
+       = new_section (abfd, (int) PRIV (section_count));
+      if (PRIV (sections)[PRIV (section_count)] == 0)
        return -1;
-      PRIV(section_count)++;
+      PRIV (section_count)++;
     }
 
   return 0;
 }
 
+/* tir_sta
 
-/*
- * tir_sta
- *
- * vax stack commands
- *
- * handle sta_xxx commands in tir section
- * ptr points to data area in record
- *
- * see table 7-3 of the VAX/VMS linker manual
- */
+   vax stack commands
+
+   Handle sta_xxx commands in tir section
+   ptr points to data area in record
+
+   See table 7-3 of the VAX/VMS linker manual.  */
 
 static unsigned char *
 tir_sta (bfd *abfd, unsigned char *ptr)
@@ -992,317 +1009,301 @@ tir_sta (bfd *abfd, unsigned char *ptr)
 
   switch (cmd)
     {
-  /* stack */
-      case TIR_S_C_STA_GBL:
-       /*
-        * stack global
-        * arg: cs      symbol name
-        *
-        * stack 32 bit value of symbol (high bits set to 0)
-        */
-       {
-         char *name;
-         vms_symbol_entry *entry;
+      /* stack */
+    case TIR_S_C_STA_GBL:
+      /* stack global
+        arg: cs        symbol name
+
+        stack 32 bit value of symbol (high bits set to 0).  */
+      {
+       char *name;
+       vms_symbol_entry *entry;
 
-         name = _bfd_vms_save_counted_string (ptr);
+       name = _bfd_vms_save_counted_string (ptr);
 
-          entry = _bfd_vms_enter_symbol (abfd, name);
-         if (entry == (vms_symbol_entry *)NULL)
-           return 0;
+       entry = _bfd_vms_enter_symbol (abfd, name);
+       if (entry == (vms_symbol_entry *) NULL)
+         return 0;
 
-         _bfd_vms_push (abfd, (unsigned long)(entry->symbol->value), -1);
-         ptr += *ptr + 1;
-       }
+       _bfd_vms_push (abfd, (uquad) (entry->symbol->value), -1);
+       ptr += *ptr + 1;
+      }
       break;
 
-      case TIR_S_C_STA_SB:
-       /*
-        * stack signed byte
-        * arg: by      value
-        *
-        * stack byte value, sign extend to 32 bit
-        */
-       _bfd_vms_push (abfd, (long)*ptr++, -1);
-      break;
-
-      case TIR_S_C_STA_SW:
-       /*
-        * stack signed short word
-        * arg: sh      value
-        *
-        * stack 16 bit value, sign extend to 32 bit
-        */
-       _bfd_vms_push (abfd, (long)bfd_getl16(ptr), -1);
-       ptr += 2;
+    case TIR_S_C_STA_SB:
+      /* stack signed byte
+        arg: by        value
+
+        stack byte value, sign extend to 32 bit.  */
+      _bfd_vms_push (abfd, (uquad) *ptr++, -1);
       break;
 
-      case TIR_S_C_STA_LW:
-       /*
-        * stack signed longword
-        * arg: lw      value
-        *
-        * stack 32 bit value
-        */
-       _bfd_vms_push (abfd, (long)bfd_getl32 (ptr), -1);
-       ptr += 4;
-      break;
-
-      case TIR_S_C_STA_PB:
-      case TIR_S_C_STA_WPB:
-       /*
-        * stack psect base plus byte offset (word index)
-        * arg: by      section index
-        *      (sh     section index)
-        *      by      signed byte offset
-        *
-        */
-       {
-         unsigned long dummy;
-         int psect;
-
-         if (cmd == TIR_S_C_STA_PB)
-           psect = *ptr++;
-         else
-           {
-             psect = bfd_getl16(ptr);
-             ptr += 2;
-           }
+    case TIR_S_C_STA_SW:
+      /* stack signed short word
+        arg: sh        value
 
-         if (psect >= PRIV(section_count))
-           {
-             alloc_section (abfd, psect);
-           }
+        stack 16 bit value, sign extend to 32 bit.  */
+      _bfd_vms_push (abfd, (uquad) bfd_getl16 (ptr), -1);
+      ptr += 2;
+      break;
 
-         dummy = (long)*ptr++;
-         dummy += (PRIV(sections)[psect])->vma;
-         _bfd_vms_push (abfd, dummy, psect);
-        }
-      break;
-
-      case TIR_S_C_STA_PW:
-      case TIR_S_C_STA_WPW:
-       /*
-        * stack psect base plus word offset (word index)
-        * arg: by      section index
-        *      (sh     section index)
-        *      sh      signed short offset
-        *
-        */
-       {
-         unsigned long dummy;
-         int psect;
-
-         if (cmd == TIR_S_C_STA_PW)
-           psect = *ptr++;
-         else
-           {
-             psect = bfd_getl16(ptr);
-             ptr += 2;
-           }
+    case TIR_S_C_STA_LW:
+      /* stack signed longword
+        arg: lw        value
 
-         if (psect >= PRIV(section_count))
-           {
-             alloc_section (abfd, psect);
-           }
+        stack 32 bit value.  */
+      _bfd_vms_push (abfd, (uquad) bfd_getl32 (ptr), -1);
+      ptr += 4;
+      break;
 
-         dummy = bfd_getl16(ptr); ptr+=2;
-         dummy += (PRIV(sections)[psect])->vma;
-         _bfd_vms_push (abfd, dummy, psect);
-        }
-      break;
-
-      case TIR_S_C_STA_PL:
-      case TIR_S_C_STA_WPL:
-       /*
-        * stack psect base plus long offset (word index)
-        * arg: by      section index
-        *      (sh     section index)
-        *      lw      signed longword offset
-        *
-        */
-       {
-         unsigned long dummy;
-         int psect;
-
-         if (cmd == TIR_S_C_STA_PL)
-           psect = *ptr++;
-         else
-           {
-             psect = bfd_getl16(ptr);
-             ptr += 2;
-           }
+    case TIR_S_C_STA_PB:
+    case TIR_S_C_STA_WPB:
+      /* stack psect base plus byte offset (word index)
+        arg: by        section index
+               (sh     section index)
+               by      signed byte offset.  */
+      {
+       unsigned long dummy;
+       unsigned int psect;
 
-         if (psect >= PRIV(section_count))
-           {
-             alloc_section (abfd, psect);
-           }
+       if (cmd == TIR_S_C_STA_PB)
+         psect = *ptr++;
+       else
+         {
+           psect = bfd_getl16 (ptr);
+           ptr += 2;
+         }
 
-         dummy = bfd_getl32 (ptr); ptr += 4;
-         dummy += (PRIV(sections)[psect])->vma;
-         _bfd_vms_push (abfd, dummy, psect);
-        }
-      break;
-
-      case TIR_S_C_STA_UB:
-       /*
-        * stack unsigned byte
-        * arg: by      value
-        *
-        * stack byte value
-        */
-       _bfd_vms_push (abfd, (unsigned long)*ptr++, -1);
-      break;
-
-      case TIR_S_C_STA_UW:
-       /*
-        * stack unsigned short word
-        * arg: sh      value
-        *
-        * stack 16 bit value
-        */
-       _bfd_vms_push (abfd, (unsigned long)bfd_getl16(ptr), -1);
-       ptr += 2;
+       if (psect >= PRIV (section_count))
+         alloc_section (abfd, psect);
+
+       dummy = (long) *ptr++;
+       dummy += (PRIV (sections)[psect])->vma;
+       _bfd_vms_push (abfd, (uquad) dummy, (int) psect);
+      }
       break;
 
-      case TIR_S_C_STA_BFI:
-       /*
-        * stack byte from image
-        * arg: -
-        *
-        */
-       /*FALLTHRU*/
-      case TIR_S_C_STA_WFI:
-       /*
-        * stack byte from image
-        * arg: -
-        *
-        */
-       /*FALLTHRU*/
-      case TIR_S_C_STA_LFI:
-       /*
-        * stack byte from image
-        * arg: -
-        *
-        */
-        (*_bfd_error_handler) (_("Stack-from-image not implemented"));
-       return NULL;
-
-      case TIR_S_C_STA_EPM:
-       /*
-        * stack entry point mask
-        * arg: cs      symbol name
-        *
-        * stack (unsigned) entry point mask of symbol
-        * err if symbol is no entry point
-        */
-       {
-         char *name;
-         vms_symbol_entry *entry;
+    case TIR_S_C_STA_PW:
+    case TIR_S_C_STA_WPW:
+      /* stack psect base plus word offset (word index)
+        arg: by        section index
+               (sh     section index)
+               sh      signed short offset.  */
+      {
+       unsigned long dummy;
+       unsigned int psect;
+
+       if (cmd == TIR_S_C_STA_PW)
+         psect = *ptr++;
+       else
+         {
+           psect = bfd_getl16 (ptr);
+           ptr += 2;
+         }
 
-         name = _bfd_vms_save_counted_string (ptr);
-         entry = _bfd_vms_enter_symbol (abfd, name);
-         if (entry == (vms_symbol_entry *)NULL)
-           return 0;
+       if (psect >= PRIV (section_count))
+         alloc_section (abfd, psect);
 
-          (*_bfd_error_handler) (_("Stack-entry-mask not fully implemented"));
-         _bfd_vms_push (abfd, 0L, -1);
-         ptr += *ptr + 1;
-       }
+       dummy = bfd_getl16 (ptr); ptr+=2;
+       dummy += (PRIV (sections)[psect])->vma;
+       _bfd_vms_push (abfd, (uquad) dummy, (int) psect);
+      }
       break;
 
-      case TIR_S_C_STA_CKARG:
-       /*
-        * compare procedure argument
-        * arg: cs      symbol name
-        *      by      argument index
-        *      da      argument descriptor
-        *
-        * compare argument descriptor with symbol argument (ARG$V_PASSMECH)
-        * and stack TRUE (args match) or FALSE (args dont match) value
-        */
-        (*_bfd_error_handler) (_("PASSMECH not fully implemented"));
-       _bfd_vms_push (abfd, 1L, -1);
-       break;
+    case TIR_S_C_STA_PL:
+    case TIR_S_C_STA_WPL:
+      /* stack psect base plus long offset (word index)
+        arg: by        section index
+               (sh     section index)
+               lw      signed longword offset.  */
+      {
+       unsigned long dummy;
+       unsigned int psect;
 
-      case TIR_S_C_STA_LSY:
-       /*
-        * stack local symbol value
-        * arg: sh      environment index
-        *      cs      symbol name
-        */
-       {
-         int envidx;
-         char *name;
-         vms_symbol_entry *entry;
-
-         envidx = bfd_getl16(ptr); ptr += 2;
-         name = _bfd_vms_save_counted_string (ptr);
-         entry = _bfd_vms_enter_symbol (abfd, name);
-         if (entry == (vms_symbol_entry *)NULL)
-           return 0;
-          (*_bfd_error_handler) (_("Stack-local-symbol not fully implemented"));
-         _bfd_vms_push (abfd, 0L, -1);
-         ptr += *ptr + 1;
-       }
+       if (cmd == TIR_S_C_STA_PL)
+         psect = *ptr++;
+       else
+         {
+           psect = bfd_getl16 (ptr);
+           ptr += 2;
+         }
+
+       if (psect >= PRIV (section_count))
+         alloc_section (abfd, psect);
+
+       dummy = bfd_getl32 (ptr); ptr += 4;
+       dummy += (PRIV (sections)[psect])->vma;
+       _bfd_vms_push (abfd, (uquad) dummy, (int) psect);
+      }
       break;
 
-      case TIR_S_C_STA_LIT:
-       /*
-        * stack literal
-        * arg: by      literal index
-        *
-        * stack literal
-        */
-       ptr++;
-       _bfd_vms_push (abfd, 0L, -1);
-       (*_bfd_error_handler) (_("Stack-literal not fully implemented"));
-       break;
+    case TIR_S_C_STA_UB:
+      /* stack unsigned byte
+        arg: by        value
 
-      case TIR_S_C_STA_LEPM:
-       /*
-        * stack local symbol entry point mask
-        * arg: sh      environment index
-        *      cs      symbol name
-        *
-        * stack (unsigned) entry point mask of symbol
-        * err if symbol is no entry point
-        */
-       {
-         int envidx;
-         char *name;
-         vms_symbol_entry *entry;
-
-         envidx = bfd_getl16(ptr); ptr += 2;
-         name = _bfd_vms_save_counted_string (ptr);
-         entry = _bfd_vms_enter_symbol (abfd, name);
-         if (entry == (vms_symbol_entry *)NULL)
-           return 0;
-         (*_bfd_error_handler) (_("Stack-local-symbol-entry-point-mask not fully implemented"));
-         _bfd_vms_push (abfd, 0L, -1);
-         ptr += *ptr + 1;
-       }
+        stack byte value.  */
+      _bfd_vms_push (abfd, (uquad) *ptr++, -1);
       break;
 
-      default:
-       (*_bfd_error_handler) (_("Reserved STA cmd %d"), ptr[-1]);
-       return NULL;
+    case TIR_S_C_STA_UW:
+      /* stack unsigned short word
+        arg: sh        value
+
+        stack 16 bit value.  */
+      _bfd_vms_push (abfd, (uquad) bfd_getl16 (ptr), -1);
+      ptr += 2;
+      break;
+
+    case TIR_S_C_STA_BFI:
+      /* stack byte from image
+        arg: none.  */
+      /* FALLTHRU  */
+    case TIR_S_C_STA_WFI:
+      /* stack byte from image
+        arg: none.  */
+      /* FALLTHRU */
+    case TIR_S_C_STA_LFI:
+      /* stack byte from image
+        arg: none.  */
+      (*_bfd_error_handler) (_("stack-from-image not implemented"));
+      return NULL;
+
+    case TIR_S_C_STA_EPM:
+      /* stack entry point mask
+        arg: cs        symbol name
+
+        stack (unsigned) entry point mask of symbol
+        err if symbol is no entry point.  */
+      {
+       char *name;
+       vms_symbol_entry *entry;
+
+       name = _bfd_vms_save_counted_string (ptr);
+       entry = _bfd_vms_enter_symbol (abfd, name);
+       if (entry == (vms_symbol_entry *) NULL)
+         return 0;
+
+       (*_bfd_error_handler) (_("stack-entry-mask not fully implemented"));
+       _bfd_vms_push (abfd, (uquad) 0, -1);
+       ptr += *ptr + 1;
+      }
+      break;
+
+    case TIR_S_C_STA_CKARG:
+      /* compare procedure argument
+        arg: cs        symbol name
+               by      argument index
+               da      argument descriptor
+
+        compare argument descriptor with symbol argument (ARG$V_PASSMECH)
+        and stack TRUE (args match) or FALSE (args dont match) value.  */
+      (*_bfd_error_handler) (_("PASSMECH not fully implemented"));
+      _bfd_vms_push (abfd, (uquad) 1, -1);
       break;
-  }
+
+    case TIR_S_C_STA_LSY:
+      /* stack local symbol value
+        arg:   sh      environment index
+               cs      symbol name.  */
+      {
+       int envidx;
+       char *name;
+       vms_symbol_entry *entry;
+
+       envidx = bfd_getl16 (ptr);
+       ptr += 2;
+       name = _bfd_vms_save_counted_string (ptr);
+       entry = _bfd_vms_enter_symbol (abfd, name);
+       if (entry == (vms_symbol_entry *) NULL)
+         return 0;
+       (*_bfd_error_handler) (_("stack-local-symbol not fully implemented"));
+       _bfd_vms_push (abfd, (uquad) 0, -1);
+       ptr += *ptr + 1;
+      }
+      break;
+
+    case TIR_S_C_STA_LIT:
+      /* stack literal
+        arg:   by      literal index
+
+        stack literal.  */
+      ptr++;
+      _bfd_vms_push (abfd, (uquad) 0, -1);
+      (*_bfd_error_handler) (_("stack-literal not fully implemented"));
+      break;
+
+    case TIR_S_C_STA_LEPM:
+      /* stack local symbol entry point mask
+        arg:   sh      environment index
+               cs      symbol name
+
+        stack (unsigned) entry point mask of symbol
+        err if symbol is no entry point.  */
+      {
+       int envidx;
+       char *name;
+       vms_symbol_entry *entry;
+
+       envidx = bfd_getl16 (ptr);
+       ptr += 2;
+       name = _bfd_vms_save_counted_string (ptr);
+       entry = _bfd_vms_enter_symbol (abfd, name);
+       if (entry == (vms_symbol_entry *) NULL)
+         return 0;
+       (*_bfd_error_handler) (_("stack-local-symbol-entry-point-mask not fully implemented"));
+       _bfd_vms_push (abfd, (uquad) 0, -1);
+       ptr += *ptr + 1;
+      }
+      break;
+
+    default:
+      (*_bfd_error_handler) (_("reserved STA cmd %d"), ptr[-1]);
+      return NULL;
+      break;
+    }
 
   return ptr;
 }
 
+static const char *
+tir_cmd_name (cmd)
+     int cmd;
+{
+  switch (cmd)
+    {
+    case TIR_S_C_STO_RSB: return "TIR_S_C_STO_RSB";
+    case TIR_S_C_STO_RSW: return "TIR_S_C_STO_RSW";
+    case TIR_S_C_STO_RL: return "TIR_S_C_STO_RL";
+    case TIR_S_C_STO_VPS: return "TIR_S_C_STO_VPS";
+    case TIR_S_C_STO_USB: return "TIR_S_C_STO_USB";
+    case TIR_S_C_STO_USW: return "TIR_S_C_STO_USW";
+    case TIR_S_C_STO_RUB: return "TIR_S_C_STO_RUB";
+    case TIR_S_C_STO_RUW: return "TIR_S_C_STO_RUW";
+    case TIR_S_C_STO_PIRR: return "TIR_S_C_STO_PIRR";
+    case TIR_S_C_OPR_INSV: return "TIR_S_C_OPR_INSV";
+    case TIR_S_C_OPR_DFLIT: return "TIR_S_C_OPR_DFLIT";
+    case TIR_S_C_OPR_REDEF: return "TIR_S_C_OPR_REDEF";
+    case TIR_S_C_OPR_ROT: return "TIR_S_C_OPR_ROT";
+    case TIR_S_C_OPR_USH: return "TIR_S_C_OPR_USH";
+    case TIR_S_C_OPR_ASH: return "TIR_S_C_OPR_ASH";
+    case TIR_S_C_CTL_DFLOC: return "TIR_S_C_CTL_DFLOC";
+    case TIR_S_C_CTL_STLOC: return "TIR_S_C_CTL_STLOC";
+    case TIR_S_C_CTL_STKDL: return "TIR_S_C_CTL_STKDL";
 
-/*
- * tir_sto
- *
- * vax store commands
- *
- * handle sto_xxx commands in tir section
- * ptr points to data area in record
- *
- * see table 7-4 of the VAX/VMS linker manual
- */
+    default:
+      /* These strings have not been added yet.  */
+      abort ();
+    }
+}
+
+/* tir_sto
+
+   vax store commands
+
+   handle sto_xxx commands in tir section
+   ptr points to data area in record
+
+   See table 7-4 of the VAX/VMS linker manual.  */
 
 static unsigned char *
 tir_sto (bfd *abfd, unsigned char *ptr)
@@ -1317,165 +1318,145 @@ tir_sto (bfd *abfd, unsigned char *ptr)
 
   switch (*ptr++)
     {
-      case TIR_S_C_STO_SB:
-       /*
-        * store signed byte: pop stack, write byte
-        * arg: -
-        */
-       dummy = _bfd_vms_pop (abfd, &psect);
-       image_write_b (abfd, dummy & 0xff);     /* FIXME: check top bits */
-      break;
-
-      case TIR_S_C_STO_SW:
-       /*
-        * store signed word: pop stack, write word
-        * arg: -
-        */
-       dummy = _bfd_vms_pop (abfd, &psect);
-       image_write_w (abfd, dummy & 0xffff);   /* FIXME: check top bits */
-      break;
-
-      case TIR_S_C_STO_LW:
-       /*
-        * store longword: pop stack, write longword
-        * arg: -
-        */
-       dummy = _bfd_vms_pop (abfd, &psect);
-       image_write_l (abfd, dummy & 0xffffffff);/* FIXME: check top bits */
-      break;
-
-      case TIR_S_C_STO_BD:
-       /*
-        * store byte displaced: pop stack, sub lc+1, write byte
-        * arg: -
-        */
-       dummy = _bfd_vms_pop (abfd, &psect);
-       dummy -= ((PRIV(sections)[psect])->vma + 1);
-       image_write_b (abfd, dummy & 0xff);/* FIXME: check top bits */
-      break;
-
-      case TIR_S_C_STO_WD:
-       /*
-        * store word displaced: pop stack, sub lc+2, write word
-        * arg: -
-        */
-       dummy = _bfd_vms_pop (abfd, &psect);
-       dummy -= ((PRIV(sections)[psect])->vma + 2);
-       image_write_w (abfd, dummy & 0xffff);/* FIXME: check top bits */
-      break;
-      case TIR_S_C_STO_LD:
-       /*
-        * store long displaced: pop stack, sub lc+4, write long
-        * arg: -
-        */
-       dummy = _bfd_vms_pop (abfd, &psect);
-       dummy -= ((PRIV(sections)[psect])->vma + 4);
-       image_write_l (abfd, dummy & 0xffffffff);/* FIXME: check top bits */
-      break;
-      case TIR_S_C_STO_LI:
-       /*
-        * store short literal: pop stack, write byte
-        * arg: -
-        */
-       dummy = _bfd_vms_pop (abfd, &psect);
-       image_write_b (abfd, dummy & 0xff);/* FIXME: check top bits */
-      break;
-      case TIR_S_C_STO_PIDR:
-       /*
-        * store position independent data reference: pop stack, write longword
-        * arg: -
-        * FIXME: incomplete !
-        */
-       dummy = _bfd_vms_pop (abfd, &psect);
-       image_write_l (abfd, dummy & 0xffffffff);
-      break;
-      case TIR_S_C_STO_PICR:
-       /*
-        * store position independent code reference: pop stack, write longword
-        * arg: -
-        * FIXME: incomplete !
-        */
-       dummy = _bfd_vms_pop (abfd, &psect);
-       image_write_b (abfd, 0x9f);
-       image_write_l (abfd, dummy & 0xffffffff);
-      break;
-      case TIR_S_C_STO_RIVB:
-       /*
-        * store repeated immediate variable bytes
-        * 1-byte count n field followed by n bytes of data
-        * pop stack, write n bytes <stack> times
-        */
-       size = *ptr++;
-       dummy = (unsigned long)_bfd_vms_pop (abfd, NULL);
-       while (dummy-- > 0L)
-         image_dump (abfd, ptr, size, 0);
-       ptr += size;
-       break;
-      case TIR_S_C_STO_B:
-       /*
-        * store byte from top longword
-        */
-       dummy = (unsigned long)_bfd_vms_pop (abfd, NULL);
+    case TIR_S_C_STO_SB:
+      /* store signed byte: pop stack, write byte
+        arg: none.  */
+      dummy = _bfd_vms_pop (abfd, &psect);
+      image_write_b (abfd, dummy & 0xff);      /* FIXME: check top bits */
+      break;
+
+    case TIR_S_C_STO_SW:
+      /* store signed word: pop stack, write word
+        arg: none.  */
+      dummy = _bfd_vms_pop (abfd, &psect);
+      image_write_w (abfd, dummy & 0xffff);    /* FIXME: check top bits */
+      break;
+
+    case TIR_S_C_STO_LW:
+      /* store longword: pop stack, write longword
+        arg: none.  */
+      dummy = _bfd_vms_pop (abfd, &psect);
+      image_write_l (abfd, dummy & 0xffffffff);        /* FIXME: check top bits */
+      break;
+
+    case TIR_S_C_STO_BD:
+      /* store byte displaced: pop stack, sub lc+1, write byte
+        arg: none.  */
+      dummy = _bfd_vms_pop (abfd, &psect);
+      dummy -= ((PRIV (sections)[psect])->vma + 1);
+      image_write_b (abfd, dummy & 0xff);/* FIXME: check top bits */
+      break;
+
+    case TIR_S_C_STO_WD:
+      /* store word displaced: pop stack, sub lc+2, write word
+        arg: none.  */
+      dummy = _bfd_vms_pop (abfd, &psect);
+      dummy -= ((PRIV (sections)[psect])->vma + 2);
+      image_write_w (abfd, dummy & 0xffff);/* FIXME: check top bits */
+      break;
+
+    case TIR_S_C_STO_LD:
+      /* store long displaced: pop stack, sub lc+4, write long
+        arg: none.  */
+      dummy = _bfd_vms_pop (abfd, &psect);
+      dummy -= ((PRIV (sections)[psect])->vma + 4);
+      image_write_l (abfd, dummy & 0xffffffff);/* FIXME: check top bits */
+      break;
+
+    case TIR_S_C_STO_LI:
+      /* store short literal: pop stack, write byte
+        arg: none.  */
+      dummy = _bfd_vms_pop (abfd, &psect);
+      image_write_b (abfd, dummy & 0xff);/* FIXME: check top bits */
+      break;
+
+    case TIR_S_C_STO_PIDR:
+      /* store position independent data reference: pop stack, write longword
+        arg: none.
+        FIXME: incomplete !  */
+      dummy = _bfd_vms_pop (abfd, &psect);
+      image_write_l (abfd, dummy & 0xffffffff);
+      break;
+
+    case TIR_S_C_STO_PICR:
+      /* store position independent code reference: pop stack, write longword
+        arg: none.
+        FIXME: incomplete !  */
+      dummy = _bfd_vms_pop (abfd, &psect);
+      image_write_b (abfd, 0x9f);
+      image_write_l (abfd, dummy & 0xffffffff);
+      break;
+
+    case TIR_S_C_STO_RIVB:
+      /* store repeated immediate variable bytes
+        1-byte count n field followed by n bytes of data
+        pop stack, write n bytes <stack> times.  */
+      size = *ptr++;
+      dummy = (unsigned long) _bfd_vms_pop (abfd, NULL);
+      while (dummy-- > 0L)
+       image_dump (abfd, ptr, size, 0);
+      ptr += size;
+      break;
+
+    case TIR_S_C_STO_B:
+      /* store byte from top longword.  */
+      dummy = (unsigned long) _bfd_vms_pop (abfd, NULL);
+      image_write_b (abfd, dummy & 0xff);
+      break;
+
+    case TIR_S_C_STO_W:
+      /* store word from top longword.  */
+      dummy = (unsigned long) _bfd_vms_pop (abfd, NULL);
+      image_write_w (abfd, dummy & 0xffff);
+      break;
+
+    case TIR_S_C_STO_RB:
+      /* store repeated byte from top longword.  */
+      size = (unsigned long) _bfd_vms_pop (abfd, NULL);
+      dummy = (unsigned long) _bfd_vms_pop (abfd, NULL);
+      while (size-- > 0)
        image_write_b (abfd, dummy & 0xff);
-       break;
-      case TIR_S_C_STO_W:
-       /*
-        * store word from top longword
-        */
-       dummy = (unsigned long)_bfd_vms_pop (abfd, NULL);
+      break;
+
+    case TIR_S_C_STO_RW:
+      /* store repeated word from top longword.  */
+      size = (unsigned long) _bfd_vms_pop (abfd, NULL);
+      dummy = (unsigned long) _bfd_vms_pop (abfd, NULL);
+      while (size-- > 0)
        image_write_w (abfd, dummy & 0xffff);
-       break;
-      case TIR_S_C_STO_RB:
-       /*
-        * store repeated byte from top longword
-        */
-       size = (unsigned long)_bfd_vms_pop (abfd, NULL);
-       dummy = (unsigned long)_bfd_vms_pop (abfd, NULL);
-       while (size-- > 0)
-         image_write_b (abfd, dummy & 0xff);
-       break;
-      case TIR_S_C_STO_RW:
-       /*
-        * store repeated word from top longword
-        */
-       size = (unsigned long)_bfd_vms_pop (abfd, NULL);
-       dummy = (unsigned long)_bfd_vms_pop (abfd, NULL);
-       while (size-- > 0)
-         image_write_w (abfd, dummy & 0xffff);
-       break;
+      break;
 
-      case TIR_S_C_STO_RSB:
-      case TIR_S_C_STO_RSW:
-      case TIR_S_C_STO_RL:
-      case TIR_S_C_STO_VPS:
-      case TIR_S_C_STO_USB:
-      case TIR_S_C_STO_USW:
-      case TIR_S_C_STO_RUB:
-      case TIR_S_C_STO_RUW:
-      case TIR_S_C_STO_PIRR:
-       (*_bfd_error_handler) (_("Unimplemented STO cmd %d"), ptr[-1]);
+    case TIR_S_C_STO_RSB:
+    case TIR_S_C_STO_RSW:
+    case TIR_S_C_STO_RL:
+    case TIR_S_C_STO_VPS:
+    case TIR_S_C_STO_USB:
+    case TIR_S_C_STO_USW:
+    case TIR_S_C_STO_RUB:
+    case TIR_S_C_STO_RUW:
+    case TIR_S_C_STO_PIRR:
+      (*_bfd_error_handler) (_("%s: not implemented"), tir_cmd_name (ptr[-1]));
       break;
 
-      default:
-       (*_bfd_error_handler) (_("Reserved STO cmd %d"), ptr[-1]);
+    default:
+      (*_bfd_error_handler) (_("reserved STO cmd %d"), ptr[-1]);
       break;
-  }
+    }
 
   return ptr;
 }
 
+/* stack operator commands
+   all 32 bit signed arithmetic
+   all word just like a stack calculator
+   arguments are popped from stack, results are pushed on stack
 
-/*
- * stack operator commands
- * all 32 bit signed arithmetic
- * all word just like a stack calculator
- * arguments are popped from stack, results are pushed on stack
- *
- * see table 7-5 of the VAX/VMS linker manual
- */
+   See table 7-5 of the VAX/VMS linker manual.  */
 
 static unsigned char *
-tir_opr (bfd *abfd, unsigned char *ptr)
+tir_opr (abfd, ptr)
+     bfd *abfd;
+     unsigned char *ptr;
 {
   long op1, op2;
 
@@ -1485,192 +1466,141 @@ tir_opr (bfd *abfd, unsigned char *ptr)
 
   switch (*ptr++)
     {
-  /* operation */
-      case TIR_S_C_OPR_NOP:
-       /*
-        * no-op
-        */
-      break;
-
-      case TIR_S_C_OPR_ADD:
-       /*
-        * add
-        */
-       op1 = (long)_bfd_vms_pop (abfd, NULL);
-       op2 = (long)_bfd_vms_pop (abfd, NULL);
-       _bfd_vms_push (abfd, (unsigned long)(op1 + op2), -1);
-      break;
-
-      case TIR_S_C_OPR_SUB:
-       /*
-        * subtract
-        */
-       op1 = (long)_bfd_vms_pop (abfd, NULL);
-       op2 = (long)_bfd_vms_pop (abfd, NULL);
-       _bfd_vms_push (abfd, (unsigned long)(op2 - op1), -1);
-      break;
-
-      case TIR_S_C_OPR_MUL:
-       /*
-        * multiply
-        */
-       op1 = (long)_bfd_vms_pop (abfd, NULL);
-       op2 = (long)_bfd_vms_pop (abfd, NULL);
-       _bfd_vms_push (abfd, (unsigned long)(op1 * op2), -1);
-      break;
-
-      case TIR_S_C_OPR_DIV:
-       /*
-        * divide
-        */
-       op1 = (long)_bfd_vms_pop (abfd, NULL);
-       op2 = (long)_bfd_vms_pop (abfd, NULL);
-       if (op2 == 0)
-         _bfd_vms_push (abfd, (unsigned long)0L, -1);
-       else
-         _bfd_vms_push (abfd, (unsigned long)(op2 / op1), -1);
-      break;
-
-      case TIR_S_C_OPR_AND:
-       /*
-        * logical and
-        */
-       op1 = (long)_bfd_vms_pop (abfd, NULL);
-       op2 = (long)_bfd_vms_pop (abfd, NULL);
-       _bfd_vms_push (abfd, (unsigned long)(op1 & op2), -1);
-      break;
-
-      case TIR_S_C_OPR_IOR:
-       op1 = (long)_bfd_vms_pop (abfd, NULL);
-       /*
-        * logical inclusive or
-        */
-       op2 = (long)_bfd_vms_pop (abfd, NULL);
-       _bfd_vms_push (abfd, (unsigned long)(op1 | op2), -1);
-      break;
-
-      case TIR_S_C_OPR_EOR:
-       /*
-        * logical exclusive or
-        */
-       op1 = (long)_bfd_vms_pop (abfd, NULL);
-       op2 = (long)_bfd_vms_pop (abfd, NULL);
-       _bfd_vms_push (abfd, (unsigned long)(op1 ^ op2), -1);
-      break;
-
-      case TIR_S_C_OPR_NEG:
-       /*
-        * negate
-        */
-       op1 = (long)_bfd_vms_pop (abfd, NULL);
-       _bfd_vms_push (abfd, (unsigned long)(-op1), -1);
-      break;
-
-      case TIR_S_C_OPR_COM:
-       /*
-        * complement
-        */
-       op1 = (long)_bfd_vms_pop (abfd, NULL);
-       _bfd_vms_push (abfd, (unsigned long)(op1 ^ -1L), -1);
-      break;
-
-      case TIR_S_C_OPR_INSV:
-       /*
-        * insert field
-        */
-       (void)_bfd_vms_pop (abfd, NULL);
-       (*_bfd_error_handler)  ("TIR_S_C_OPR_INSV incomplete");
-      break;
-
-      case TIR_S_C_OPR_ASH:
-       /*
-        * arithmetic shift
-        */
-       op1 = (long)_bfd_vms_pop (abfd, NULL);
-       op2 = (long)_bfd_vms_pop (abfd, NULL);
-       if (HIGHBIT(op1))               /* shift right */
-         op2 >>= op1;
-       else                    /* shift left */
-         op2 <<= op1;
-       _bfd_vms_push (abfd, (unsigned long)op2, -1);
-       (*_bfd_error_handler) (_("TIR_S_C_OPR_ASH incomplete"));
-      break;
-
-      case TIR_S_C_OPR_USH:
-       /*
-        * unsigned shift
-        */
-       op1 = (long)_bfd_vms_pop (abfd, NULL);
-       op2 = (long)_bfd_vms_pop (abfd, NULL);
-       if (HIGHBIT(op1))               /* shift right */
-         op2 >>= op1;
-       else                    /* shift left */
-         op2 <<= op1;
-       _bfd_vms_push (abfd, (unsigned long)op2, -1);
-       (*_bfd_error_handler) (_("TIR_S_C_OPR_USH incomplete"));
-      break;
-
-      case TIR_S_C_OPR_ROT:
-       /*
-        * rotate
-        */
-       op1 = (long)_bfd_vms_pop (abfd, NULL);
-       op2 = (long)_bfd_vms_pop (abfd, NULL);
-       if (HIGHBIT(0))         /* shift right */
-         op2 >>= op1;
-       else                    /* shift left */
-         op2 <<= op1;
-       _bfd_vms_push (abfd, (unsigned long)op2, -1);
-       (*_bfd_error_handler) (_("TIR_S_C_OPR_ROT incomplete"));
-      break;
-
-      case TIR_S_C_OPR_SEL:
-       /*
-        * select
-        */
-       if ((long)_bfd_vms_pop (abfd, NULL) & 0x01L)
-         (void)_bfd_vms_pop (abfd, NULL);
-       else
-         {
-           op1 = (long)_bfd_vms_pop (abfd, NULL);
-           (void)_bfd_vms_pop (abfd, NULL);
-           _bfd_vms_push (abfd, (unsigned long)op1, -1);
-         }
+      /* operation */
+    case TIR_S_C_OPR_NOP: /* no-op */
+      break;
+
+    case TIR_S_C_OPR_ADD: /* add */
+      op1 = (long) _bfd_vms_pop (abfd, NULL);
+      op2 = (long) _bfd_vms_pop (abfd, NULL);
+      _bfd_vms_push (abfd, (uquad) (op1 + op2), -1);
+      break;
+
+    case TIR_S_C_OPR_SUB: /* subtract */
+      op1 = (long) _bfd_vms_pop (abfd, NULL);
+      op2 = (long) _bfd_vms_pop (abfd, NULL);
+      _bfd_vms_push (abfd, (uquad) (op2 - op1), -1);
+      break;
+
+    case TIR_S_C_OPR_MUL: /* multiply */
+      op1 = (long) _bfd_vms_pop (abfd, NULL);
+      op2 = (long) _bfd_vms_pop (abfd, NULL);
+      _bfd_vms_push (abfd, (uquad) (op1 * op2), -1);
+      break;
+
+    case TIR_S_C_OPR_DIV: /* divide */
+      op1 = (long) _bfd_vms_pop (abfd, NULL);
+      op2 = (long) _bfd_vms_pop (abfd, NULL);
+      if (op2 == 0)
+       _bfd_vms_push (abfd, (uquad) 0, -1);
+      else
+       _bfd_vms_push (abfd, (uquad) (op2 / op1), -1);
+      break;
+
+    case TIR_S_C_OPR_AND: /* logical and */
+      op1 = (long) _bfd_vms_pop (abfd, NULL);
+      op2 = (long) _bfd_vms_pop (abfd, NULL);
+      _bfd_vms_push (abfd, (uquad) (op1 & op2), -1);
+      break;
+
+    case TIR_S_C_OPR_IOR: /* logical inclusive or */
+      op1 = (long) _bfd_vms_pop (abfd, NULL);
+      op2 = (long) _bfd_vms_pop (abfd, NULL);
+      _bfd_vms_push (abfd, (uquad) (op1 | op2), -1);
+      break;
+
+    case TIR_S_C_OPR_EOR: /* logical exclusive or */
+      op1 = (long) _bfd_vms_pop (abfd, NULL);
+      op2 = (long) _bfd_vms_pop (abfd, NULL);
+      _bfd_vms_push (abfd, (uquad) (op1 ^ op2), -1);
+      break;
+
+    case TIR_S_C_OPR_NEG: /* negate */
+      op1 = (long) _bfd_vms_pop (abfd, NULL);
+      _bfd_vms_push (abfd, (uquad) (-op1), -1);
+      break;
+
+    case TIR_S_C_OPR_COM: /* complement */
+      op1 = (long) _bfd_vms_pop (abfd, NULL);
+      _bfd_vms_push (abfd, (uquad) (op1 ^ -1L), -1);
+      break;
+
+    case TIR_S_C_OPR_INSV: /* insert field */
+      (void) _bfd_vms_pop (abfd, NULL);
+      (*_bfd_error_handler)  (_("%s: not fully implemented"),
+                             tir_cmd_name (ptr[-1]));
       break;
 
-      case TIR_S_C_OPR_REDEF:
-       /*
-        * redefine symbol to current location
-        */
-       (*_bfd_error_handler) (_("TIR_S_C_OPR_REDEF not supported"));
+    case TIR_S_C_OPR_ASH: /* arithmetic shift */
+      op1 = (long) _bfd_vms_pop (abfd, NULL);
+      op2 = (long) _bfd_vms_pop (abfd, NULL);
+      if (HIGHBIT (op1))       /* shift right */
+       op2 >>= op1;
+      else                     /* shift left */
+       op2 <<= op1;
+      _bfd_vms_push (abfd, (uquad) op2, -1);
+      (*_bfd_error_handler)  (_("%s: not fully implemented"),
+                             tir_cmd_name (ptr[-1]));
+      break;
+
+    case TIR_S_C_OPR_USH: /* unsigned shift */
+      op1 = (long) _bfd_vms_pop (abfd, NULL);
+      op2 = (long) _bfd_vms_pop (abfd, NULL);
+      if (HIGHBIT (op1))       /* shift right */
+       op2 >>= op1;
+      else                     /* shift left */
+       op2 <<= op1;
+      _bfd_vms_push (abfd, (uquad) op2, -1);
+      (*_bfd_error_handler)  (_("%s: not fully implemented"),
+                             tir_cmd_name (ptr[-1]));
+      break;
+
+    case TIR_S_C_OPR_ROT: /* rotate */
+      op1 = (long) _bfd_vms_pop (abfd, NULL);
+      op2 = (long) _bfd_vms_pop (abfd, NULL);
+      if (HIGHBIT (0)) /* shift right */
+       op2 >>= op1;
+      else             /* shift left */
+       op2 <<= op1;
+      _bfd_vms_push (abfd, (uquad) op2, -1);
+      (*_bfd_error_handler)  (_("%s: not fully implemented"),
+                             tir_cmd_name (ptr[-1]));
+      break;
+
+    case TIR_S_C_OPR_SEL: /* select */
+      if ((long) _bfd_vms_pop (abfd, NULL) & 0x01L)
+       (void) _bfd_vms_pop (abfd, NULL);
+      else
+       {
+         op1 = (long) _bfd_vms_pop (abfd, NULL);
+         (void) _bfd_vms_pop (abfd, NULL);
+         _bfd_vms_push (abfd, (uquad) op1, -1);
+       }
       break;
 
-      case TIR_S_C_OPR_DFLIT:
-       /*
-        * define a literal
-        */
-       (*_bfd_error_handler) (_("TIR_S_C_OPR_DFLIT not supported"));
+    case TIR_S_C_OPR_REDEF: /* Redefine symbol to current location.  */
+    case TIR_S_C_OPR_DFLIT: /* Define a literal.  */
+      (*_bfd_error_handler) (_("%s: not supported"),
+                            tir_cmd_name (ptr[-1]));
       break;
 
-      default:
-       (*_bfd_error_handler) (_("Reserved OPR cmd %d"), ptr[-1]);
+    default:
+      (*_bfd_error_handler) (_("reserved OPR cmd %d"), ptr[-1]);
       break;
     }
 
   return ptr;
 }
 
+/* control commands
+
+   See table 7-6 of the VAX/VMS linker manual.  */
 
 static unsigned char *
 tir_ctl (bfd *abfd, unsigned char *ptr)
-/*
- * control commands
- *
- * see table 7-6 of the VAX/VMS linker manual
- */
 {
   unsigned long dummy;
-  int psect;
+  unsigned int psect;
 
 #if VMS_DEBUG
   _bfd_vms_debug (5, "tir_ctl %d\n", *ptr);
@@ -1678,81 +1608,77 @@ tir_ctl (bfd *abfd, unsigned char *ptr)
 
   switch (*ptr++)
     {
-      case TIR_S_C_CTL_SETRB:
-       /*
-        * set relocation base: pop stack, set image location counter
-        * arg: -
-        */
-       dummy = _bfd_vms_pop (abfd, &psect);
-       if (psect >= PRIV(section_count))
-         {
-           alloc_section (abfd, psect);
-         }
-       image_set_ptr (abfd, psect, dummy);
-      break;
-      case TIR_S_C_CTL_AUGRB:
-       /*
-        * augment relocation base: increment image location counter by offset
-        * arg: lw      offset value
-        */
-       dummy = bfd_getl32 (ptr);
-       image_inc_ptr (abfd, dummy);
-      break;
-      case TIR_S_C_CTL_DFLOC:
-       /*
-        * define location: pop index, save location counter under index
-        * arg: -
-        */
-       dummy = _bfd_vms_pop (abfd, NULL);
-       (*_bfd_error_handler) (_("TIR_S_C_CTL_DFLOC not fully implemented"));
-      break;
-      case TIR_S_C_CTL_STLOC:
-       /*
-        * set location: pop index, restore location counter from index
-        * arg: -
-        */
-       dummy = _bfd_vms_pop (abfd, &psect);
-       (*_bfd_error_handler) (_("TIR_S_C_CTL_STLOC not fully implemented"));
+    case TIR_S_C_CTL_SETRB:
+      /* Set relocation base: pop stack, set image location counter
+        arg: none.  */
+      dummy = _bfd_vms_pop (abfd, &psect);
+      if (psect >= PRIV (section_count))
+       alloc_section (abfd, psect);
+      image_set_ptr (abfd, (int) psect, (uquad) dummy);
+      break;
+
+    case TIR_S_C_CTL_AUGRB:
+      /* Augment relocation base: increment image location counter by offset
+        arg: lw        offset value.  */
+      dummy = bfd_getl32 (ptr);
+      image_inc_ptr (abfd, (uquad) dummy);
+      break;
+
+    case TIR_S_C_CTL_DFLOC:
+      /* Define location: pop index, save location counter under index
+        arg: none.  */
+      dummy = _bfd_vms_pop (abfd, NULL);
+      (*_bfd_error_handler) (_("%s: not fully implemented"),
+                            tir_cmd_name (ptr[-1]));
+      break;
+
+    case TIR_S_C_CTL_STLOC:
+      /* Set location: pop index, restore location counter from index
+        arg: none.  */
+      dummy = _bfd_vms_pop (abfd, &psect);
+      (*_bfd_error_handler) (_("%s: not fully implemented"),
+                            tir_cmd_name (ptr[-1]));
       break;
+
     case TIR_S_C_CTL_STKDL:
-       /*
-        * stack defined location: pop index, push location counter from index
-        * arg: -
-        */
-       dummy = _bfd_vms_pop (abfd, &psect);
-       (*_bfd_error_handler) (_("TIR_S_C_CTL_STKDL not fully implemented"));
+      /* Stack defined location: pop index, push location counter from index
+        arg: none.  */
+      dummy = _bfd_vms_pop (abfd, &psect);
+      (*_bfd_error_handler) (_("%s: not fully implemented"),
+                            tir_cmd_name (ptr[-1]));
       break;
+
     default:
-        (*_bfd_error_handler) (_("Reserved CTL cmd %d"), ptr[-1]);
-       break;
-  }
+      (*_bfd_error_handler) (_("reserved CTL cmd %d"), ptr[-1]);
+      break;
+    }
   return ptr;
 }
 
-
-/*
- * handle command from TIR section
- */
+/* Handle command from TIR section.  */
 
 static unsigned char *
 tir_cmd (bfd *abfd, unsigned char *ptr)
 {
-  struct {
+  struct
+  {
     int mincod;
     int maxcod;
-    unsigned char * (*explain)(bfd *, unsigned char *);
-  } tir_table[] = {
-    { 0,                TIR_S_C_MAXSTACOD, tir_sta }
-   ,{ TIR_S_C_MINSTOCOD, TIR_S_C_MAXSTOCOD, tir_sto }
-   ,{ TIR_S_C_MINOPRCOD, TIR_S_C_MAXOPRCOD, tir_opr }
-   ,{ TIR_S_C_MINCTLCOD, TIR_S_C_MAXCTLCOD, tir_ctl }
-   ,{ -1, -1, NULL }
+    unsigned char * (*explain) (bfd *, unsigned char *);
+  }
+  tir_table[] =
+  {
+    { 0,                TIR_S_C_MAXSTACOD, tir_sta },
+    { TIR_S_C_MINSTOCOD, TIR_S_C_MAXSTOCOD, tir_sto },
+    { TIR_S_C_MINOPRCOD, TIR_S_C_MAXOPRCOD, tir_opr },
+    { TIR_S_C_MINCTLCOD, TIR_S_C_MAXCTLCOD, tir_ctl },
+    { -1, -1, NULL }
   };
   int i = 0;
 
 #if VMS_DEBUG
   _bfd_vms_debug (4, "tir_cmd %d/%x\n", *ptr, *ptr);
-  _bfd_hexdump (8, ptr, 16, (int)ptr);
+  _bfd_hexdump (8, ptr, 16, (int) ptr);
 #endif
 
   if (*ptr & 0x80)                             /* store immediate */
@@ -1765,8 +1691,8 @@ tir_cmd (bfd *abfd, unsigned char *ptr)
     {
       while (tir_table[i].mincod >= 0)
        {
-         if ( (tir_table[i].mincod <= *ptr) 
-           && (*ptr <= tir_table[i].maxcod))
+         if ( (tir_table[i].mincod <= *ptr)
+              && (*ptr <= tir_table[i].maxcod))
            {
              ptr = tir_table[i].explain (abfd, ptr);
              break;
@@ -1775,7 +1701,7 @@ tir_cmd (bfd *abfd, unsigned char *ptr)
        }
       if (tir_table[i].mincod < 0)
        {
-         (*_bfd_error_handler) (_("Obj code %d not found"), *ptr);
+         (*_bfd_error_handler) (_("obj code %d not found"), *ptr);
          ptr = 0;
        }
     }
@@ -1783,8 +1709,7 @@ tir_cmd (bfd *abfd, unsigned char *ptr)
   return ptr;
 }
 
-
-/* handle command from ETIR section  */
+/* Handle command from ETIR section.  */
 
 static int
 etir_cmd (abfd, cmd, ptr)
@@ -1792,11 +1717,14 @@ etir_cmd (abfd, cmd, ptr)
      int cmd;
      unsigned char *ptr;
 {
-  static struct {
+  static struct
+  {
     int mincod;
     int maxcod;
-    boolean (*explain) PARAMS((bfd *, int, unsigned char *));
-  } etir_table[] = {
+    bfd_boolean (*explain) PARAMS ((bfd *, int, unsigned char *));
+  }
+  etir_table[] =
+  {
     { ETIR_S_C_MINSTACOD, ETIR_S_C_MAXSTACOD, etir_sta },
     { ETIR_S_C_MINSTOCOD, ETIR_S_C_MAXSTOCOD, etir_sto },
     { ETIR_S_C_MINOPRCOD, ETIR_S_C_MAXOPRCOD, etir_opr },
@@ -1809,13 +1737,13 @@ etir_cmd (abfd, cmd, ptr)
 
 #if VMS_DEBUG
   _bfd_vms_debug (4, "etir_cmd %d/%x\n", cmd, cmd);
-  _bfd_hexdump (8, ptr, 16, (int)ptr);
+  _bfd_hexdump (8, ptr, 16, (int) ptr);
 #endif
 
   while (etir_table[i].mincod >= 0)
     {
-      if ( (etir_table[i].mincod <= cmd) 
-       && (cmd <= etir_table[i].maxcod))
+      if ( (etir_table[i].mincod <= cmd)
+          && (cmd <= etir_table[i].maxcod))
        {
          if (!etir_table[i].explain (abfd, cmd, ptr))
            return -1;
@@ -1830,9 +1758,8 @@ etir_cmd (abfd, cmd, ptr)
   return 0;
 }
 
-
 /* Text Information and Relocation Records (OBJ$C_TIR)
-   handle tir record  */
+   handle tir record.  */
 
 static int
 analyze_tir (abfd, ptr, length)
@@ -1858,9 +1785,8 @@ analyze_tir (abfd, ptr, length)
   return 0;
 }
 
-
 /* Text Information and Relocation Records (EOBJ$C_ETIR)
-   handle etir record  */
+   handle etir record.  */
 
 static int
 analyze_etir (abfd, ptr, length)
@@ -1895,10 +1821,8 @@ analyze_etir (abfd, ptr, length)
   return result;
 }
 
-
-/* process ETIR record
-  
-   return 0 on success, -1 on error  */
+/* Process ETIR record
+   Return 0 on success, -1 on error.  */
 
 int
 _bfd_vms_slurp_tir (abfd, objtype)
@@ -1913,34 +1837,33 @@ _bfd_vms_slurp_tir (abfd, objtype)
 
   switch (objtype)
     {
-      case EOBJ_S_C_ETIR:
-       PRIV(vms_rec) += 4;     /* skip type, size */
-       PRIV(rec_size) -= 4;
-       result = analyze_etir (abfd, PRIV(vms_rec), PRIV(rec_size));
-       break;
-      case OBJ_S_C_TIR:
-       PRIV(vms_rec) += 1;     /* skip type */
-       PRIV(rec_size) -= 1;
-       result = analyze_tir (abfd, PRIV(vms_rec), PRIV(rec_size));
-       break;
-      default:
-       result = -1;
-       break;
+    case EOBJ_S_C_ETIR:
+      PRIV (vms_rec) += 4;     /* skip type, size */
+      PRIV (rec_size) -= 4;
+      result = analyze_etir (abfd, PRIV (vms_rec), (unsigned) PRIV (rec_size));
+      break;
+    case OBJ_S_C_TIR:
+      PRIV (vms_rec) += 1;     /* skip type */
+      PRIV (rec_size) -= 1;
+      result = analyze_tir (abfd, PRIV (vms_rec), (unsigned) PRIV (rec_size));
+      break;
+    default:
+      result = -1;
+      break;
     }
 
   return result;
 }
 
+/* Process EDBG record
+   Return 0 on success, -1 on error
 
-/* process EDBG record
-   return 0 on success, -1 on error
-  
-   not implemented yet  */
+   Not implemented yet.  */
 
 int
 _bfd_vms_slurp_dbg (abfd, objtype)
      bfd *abfd;
-     int objtype;
+     int objtype ATTRIBUTE_UNUSED;
 {
 #if VMS_DEBUG
   _bfd_vms_debug (2, "DBG/EDBG\n");
@@ -1950,16 +1873,15 @@ _bfd_vms_slurp_dbg (abfd, objtype)
   return 0;
 }
 
+/* Process ETBT record
+   Return 0 on success, -1 on error
 
-/* process ETBT record
-   return 0 on success, -1 on error
-  
-   not implemented yet  */
+   Not implemented yet.  */
 
 int
 _bfd_vms_slurp_tbt (abfd, objtype)
-     bfd *abfd;
-     int objtype;
+     bfd *abfd ATTRIBUTE_UNUSED;
+     int objtype ATTRIBUTE_UNUSED;
 {
 #if VMS_DEBUG
   _bfd_vms_debug (2, "TBT/ETBT\n");
@@ -1968,16 +1890,15 @@ _bfd_vms_slurp_tbt (abfd, objtype)
   return 0;
 }
 
+/* Process LNK record
+   Return 0 on success, -1 on error
 
-/* process LNK record
-   return 0 on success, -1 on error
-  
-   not implemented yet  */
+   Not implemented yet.  */
 
 int
 _bfd_vms_slurp_lnk (abfd, objtype)
-     bfd *abfd;
-     int objtype;
+     bfd *abfd ATTRIBUTE_UNUSED;
+     int objtype ATTRIBUTE_UNUSED;
 {
 #if VMS_DEBUG
   _bfd_vms_debug (2, "LNK\n");
@@ -1986,17 +1907,16 @@ _bfd_vms_slurp_lnk (abfd, objtype)
   return 0;
 }
 \f
-/*----------------------------------------------------------------------*/
-/*                                                                     */
-/*     WRITE ETIR SECTION                                              */
-/*                                                                     */
-/*     this is still under construction and therefore not documented   */
-/*                                                                     */
-/*----------------------------------------------------------------------*/
-
-static void start_etir_record PARAMS ((bfd *abfd, int index, uquad offset, boolean justoffset));
-static void sto_imm PARAMS ((bfd *abfd, vms_section *sptr, bfd_vma vaddr, int index));
-static void end_etir_record PARAMS ((bfd *abfd));
+/* WRITE ETIR SECTION
+
+   This is still under construction and therefore not documented.  */
+
+static void start_etir_record
+  PARAMS ((bfd *abfd, int index, uquad offset, bfd_boolean justoffset));
+static void sto_imm
+  PARAMS ((bfd *abfd, vms_section *sptr, bfd_vma vaddr, int index));
+static void end_etir_record
+  PARAMS ((bfd *abfd));
 
 static void
 sto_imm (abfd, sptr, vaddr, index)
@@ -2011,7 +1931,7 @@ sto_imm (abfd, sptr, vaddr, index)
 
 #if VMS_DEBUG
   _bfd_vms_debug (8, "sto_imm %d bytes\n", sptr->size);
-  _bfd_hexdump (9, sptr->contents, (int)sptr->size, (int)vaddr);
+  _bfd_hexdump (9, sptr->contents, (int) sptr->size, (int) vaddr);
 #endif
 
   ssize = sptr->size;
@@ -2019,46 +1939,41 @@ sto_imm (abfd, sptr, vaddr, index)
 
   while (ssize > 0)
     {
-
       size = ssize;                            /* try all the rest */
 
       if (_bfd_vms_output_check (abfd, size) < 0)
        {                                       /* doesn't fit, split ! */
          end_etir_record (abfd);
-         start_etir_record (abfd, index, vaddr, false);
+         start_etir_record (abfd, index, vaddr, FALSE);
          size = _bfd_vms_output_check (abfd, 0);       /* get max size */
          if (size > ssize)                     /* more than what's left ? */
            size = ssize;
        }
 
       _bfd_vms_output_begin (abfd, ETIR_S_C_STO_IMM, -1);
-      _bfd_vms_output_long (abfd, (unsigned long)(size));
+      _bfd_vms_output_long (abfd, (unsigned long) (size));
       _bfd_vms_output_dump (abfd, cptr, size);
       _bfd_vms_output_flush (abfd);
 
 #if VMS_DEBUG
       _bfd_vms_debug (10, "dumped %d bytes\n", size);
-      _bfd_hexdump (10, cptr, (int)size, (int)vaddr);
+      _bfd_hexdump (10, cptr, (int) size, (int) vaddr);
 #endif
 
       vaddr += size;
       ssize -= size;
       cptr += size;
     }
-
-  return;
 }
 
-/*-------------------------------------------------------------------*/
-
-/* start ETIR record for section #index at virtual addr offset.  */
+/* Start ETIR record for section #index at virtual addr offset.  */
 
 static void
 start_etir_record (abfd, index, offset, justoffset)
     bfd *abfd;
     int index;
     uquad offset;
-    boolean justoffset;
+    bfd_boolean justoffset;
 {
   if (!justoffset)
     {
@@ -2067,32 +1982,30 @@ start_etir_record (abfd, index, offset, justoffset)
     }
 
   _bfd_vms_output_begin (abfd, ETIR_S_C_STA_PQ, -1);   /* push start offset */
-  _bfd_vms_output_long (abfd, (unsigned long)index);
-  _bfd_vms_output_quad (abfd, (uquad)offset);
+  _bfd_vms_output_long (abfd, (unsigned long) index);
+  _bfd_vms_output_quad (abfd, (uquad) offset);
   _bfd_vms_output_flush (abfd);
 
   _bfd_vms_output_begin (abfd, ETIR_S_C_CTL_SETRB, -1);        /* start = pop () */
   _bfd_vms_output_flush (abfd);
-
-  return;
 }
 
+/* End etir record.  */
 
-/* end etir record  */
 static void
 end_etir_record (abfd)
     bfd *abfd;
 {
   _bfd_vms_output_pop (abfd);
-  _bfd_vms_output_end (abfd); 
+  _bfd_vms_output_end (abfd);
 }
 
-/* write section contents for bfd abfd  */
+/* Write section contents for bfd abfd.  */
 
 int
 _bfd_vms_write_tir (abfd, objtype)
      bfd *abfd;
-     int objtype;
+     int objtype ATTRIBUTE_UNUSED;
 {
   asection *section;
   vms_section *sptr;
@@ -2105,9 +2018,9 @@ _bfd_vms_write_tir (abfd, objtype)
   _bfd_vms_output_alignment (abfd, 4);
 
   nextoffset = 0;
-  PRIV(vms_linkage_index) = 1;
+  PRIV (vms_linkage_index) = 1;
 
-  /* dump all other sections  */
+  /* Dump all other sections.  */
 
   section = abfd->sections;
 
@@ -2115,7 +2028,9 @@ _bfd_vms_write_tir (abfd, objtype)
     {
 
 #if VMS_DEBUG
-      _bfd_vms_debug (4, "writing %d. section '%s' (%d bytes)\n", section->index, section->name, (int)(section->_raw_size));\r
+      _bfd_vms_debug (4, "writing %d. section '%s' (%d bytes)\n",
+                     section->index, section->name,
+                     (int) (section->size));
 #endif
 
       if (section->flags & SEC_RELOC)
@@ -2136,12 +2051,12 @@ _bfd_vms_write_tir (abfd, objtype)
              while (i-- > 0)
                {
                  _bfd_vms_debug (4, "sym %s in sec %s, value %08lx, addr %08lx, off %08lx, len %d: %s\n",
-                             (*(*rptr)->sym_ptr_ptr)->name,
-                             (*(*rptr)->sym_ptr_ptr)->section->name,
-                             (long)(*(*rptr)->sym_ptr_ptr)->value,
-                             (*rptr)->address, (*rptr)->addend,
-                             bfd_get_reloc_size((*rptr)->howto),
-                             (*rptr)->howto->name);
+                                 (*(*rptr)->sym_ptr_ptr)->name,
+                                 (*(*rptr)->sym_ptr_ptr)->section->name,
+                                 (long) (*(*rptr)->sym_ptr_ptr)->value,
+                                 (*rptr)->address, (*rptr)->addend,
+                                 bfd_get_reloc_size ((*rptr)->howto),
+                                 (*rptr)->howto->name);
                  rptr++;
                }
            }
@@ -2149,9 +2064,9 @@ _bfd_vms_write_tir (abfd, objtype)
        }
 
       if ((section->flags & SEC_HAS_CONTENTS)
-       && (! bfd_is_com_section (section)))
+         && (! bfd_is_com_section (section)))
        {
-         bfd_vma vaddr;                /* virtual addr in section */
+         bfd_vma vaddr;                /* Virtual addr in section.  */
 
          sptr = _bfd_get_vms_section (abfd, section->index);
          if (sptr == NULL)
@@ -2160,26 +2075,27 @@ _bfd_vms_write_tir (abfd, objtype)
              return -1;
            }
 
-         vaddr = (bfd_vma)(sptr->offset);
+         vaddr = (bfd_vma) (sptr->offset);
 
          start_etir_record (abfd, section->index, (uquad) sptr->offset,
-                            false);
+                            FALSE);
 
-         while (sptr != NULL)                          /* one STA_PQ, CTL_SETRB per vms_section */
+         while (sptr != NULL)  /* one STA_PQ, CTL_SETRB per vms_section */
            {
 
-             if (section->flags & SEC_RELOC)                   /* check for relocs */
+             if (section->flags & SEC_RELOC)   /* check for relocs */
                {
                  arelent **rptr = section->orelocation;
                  int i = section->reloc_count;
+
                  for (;;)
                    {
                      bfd_size_type addr = (*rptr)->address;
-                     int len = bfd_get_reloc_size ((*rptr)->howto);
-                     if (sptr->offset < addr)          /* sptr starts before reloc */
+                     bfd_size_type len = bfd_get_reloc_size ((*rptr)->howto);
+                     if (sptr->offset < addr)  /* sptr starts before reloc */
                        {
-                         int before = addr - sptr->offset;
-                         if (sptr->size <= before)             /* complete before */
+                         bfd_size_type before = addr - sptr->offset;
+                         if (sptr->size <= before)     /* complete before */
                            {
                              sto_imm (abfd, sptr, vaddr, section->index);
                              vaddr += sptr->size;
@@ -2196,7 +2112,7 @@ _bfd_vms_write_tir (abfd, objtype)
                              sptr->size = after;
                            }
                        }
-                     else if (sptr->offset == addr)    /* sptr starts at reloc */
+                     else if (sptr->offset == addr) /* sptr starts at reloc */
                        {
                          asymbol *sym = *(*rptr)->sym_ptr_ptr;
                          asection *sec = sym->section;
@@ -2210,20 +2126,22 @@ _bfd_vms_write_tir (abfd, objtype)
                              {
                                if (bfd_is_und_section (sym->section))
                                  {
-                                   if (_bfd_vms_output_check (abfd,
-                                                               strlen((char *)sym->name))
-                                       < 0)
+                                   int slen = strlen ((char *) sym->name);
+                                   char *hash;
+
+                                   if (_bfd_vms_output_check (abfd, slen) < 0)
                                      {
                                        end_etir_record (abfd);
                                        start_etir_record (abfd,
                                                           section->index,
-                                                          vaddr, false);
+                                                          vaddr, FALSE);
                                      }
                                    _bfd_vms_output_begin (abfd,
-                                                           ETIR_S_C_STO_GBL_LW,
-                                                           -1);
-                                   _bfd_vms_output_counted (abfd,
-                                                             _bfd_vms_length_hash_symbol (abfd, sym->name, EOBJ_S_C_SYMSIZ));
+                                                          ETIR_S_C_STO_GBL_LW,
+                                                          -1);
+                                   hash = (_bfd_vms_length_hash_symbol
+                                           (abfd, sym->name, EOBJ_S_C_SYMSIZ));
+                                   _bfd_vms_output_counted (abfd, hash);
                                    _bfd_vms_output_flush (abfd);
                                  }
                                else if (bfd_is_abs_section (sym->section))
@@ -2233,17 +2151,17 @@ _bfd_vms_write_tir (abfd, objtype)
                                        end_etir_record (abfd);
                                        start_etir_record (abfd,
                                                           section->index,
-                                                          vaddr, false);
+                                                          vaddr, FALSE);
                                      }
                                    _bfd_vms_output_begin (abfd,
-                                                           ETIR_S_C_STA_LW,
-                                                           -1);
+                                                          ETIR_S_C_STA_LW,
+                                                          -1);
                                    _bfd_vms_output_quad (abfd,
-                                                          (uquad)sym->value);
+                                                         (uquad) sym->value);
                                    _bfd_vms_output_flush (abfd);
                                    _bfd_vms_output_begin (abfd,
-                                                           ETIR_S_C_STO_LW,
-                                                           -1);
+                                                          ETIR_S_C_STO_LW,
+                                                          -1);
                                    _bfd_vms_output_flush (abfd);
                                  }
                                else
@@ -2253,20 +2171,20 @@ _bfd_vms_write_tir (abfd, objtype)
                                        end_etir_record (abfd);
                                        start_etir_record (abfd,
                                                           section->index,
-                                                          vaddr, false);
+                                                          vaddr, FALSE);
                                      }
                                    _bfd_vms_output_begin (abfd,
-                                                           ETIR_S_C_STA_PQ,
-                                                           -1);
+                                                          ETIR_S_C_STA_PQ,
+                                                          -1);
                                    _bfd_vms_output_long (abfd,
-                                                          (unsigned long)(sec->index));
+                                                         (unsigned long) (sec->index));
                                    _bfd_vms_output_quad (abfd,
-                                                          ((uquad)(*rptr)->addend
-                                                           + (uquad)sym->value));
+                                                         ((uquad) (*rptr)->addend
+                                                          + (uquad) sym->value));
                                    _bfd_vms_output_flush (abfd);
                                    _bfd_vms_output_begin (abfd,
-                                                           ETIR_S_C_STO_LW,
-                                                           -1);
+                                                          ETIR_S_C_STO_LW,
+                                                          -1);
                                    _bfd_vms_output_flush (abfd);
                                  }
                              }
@@ -2276,20 +2194,21 @@ _bfd_vms_write_tir (abfd, objtype)
                              {
                                if (bfd_is_und_section (sym->section))
                                  {
-                                   if (_bfd_vms_output_check (abfd,
-                                                               strlen((char *)sym->name))
-                                       < 0)
+                                   int slen = strlen ((char *) sym->name);
+                                   char *hash;
+                                   if (_bfd_vms_output_check (abfd, slen) < 0)
                                      {
                                        end_etir_record (abfd);
                                        start_etir_record (abfd,
                                                           section->index,
-                                                          vaddr, false);
+                                                          vaddr, FALSE);
                                      }
                                    _bfd_vms_output_begin (abfd,
-                                                           ETIR_S_C_STO_GBL,
-                                                           -1);
-                                   _bfd_vms_output_counted (abfd,
-                                                             _bfd_vms_length_hash_symbol (abfd, sym->name, EOBJ_S_C_SYMSIZ));
+                                                          ETIR_S_C_STO_GBL,
+                                                          -1);
+                                   hash = (_bfd_vms_length_hash_symbol
+                                           (abfd, sym->name, EOBJ_S_C_SYMSIZ));
+                                   _bfd_vms_output_counted (abfd, hash);
                                    _bfd_vms_output_flush (abfd);
                                  }
                                else if (bfd_is_abs_section (sym->section))
@@ -2299,17 +2218,17 @@ _bfd_vms_write_tir (abfd, objtype)
                                        end_etir_record (abfd);
                                        start_etir_record (abfd,
                                                           section->index,
-                                                          vaddr, false);
+                                                          vaddr, FALSE);
                                      }
                                    _bfd_vms_output_begin (abfd,
-                                                           ETIR_S_C_STA_QW,
-                                                           -1);
+                                                          ETIR_S_C_STA_QW,
+                                                          -1);
                                    _bfd_vms_output_quad (abfd,
-                                                          (uquad)sym->value);
+                                                         (uquad) sym->value);
                                    _bfd_vms_output_flush (abfd);
                                    _bfd_vms_output_begin (abfd,
-                                                           ETIR_S_C_STO_QW,
-                                                           -1);
+                                                          ETIR_S_C_STO_QW,
+                                                          -1);
                                    _bfd_vms_output_flush (abfd);
                                  }
                                else
@@ -2319,20 +2238,20 @@ _bfd_vms_write_tir (abfd, objtype)
                                        end_etir_record (abfd);
                                        start_etir_record (abfd,
                                                           section->index,
-                                                          vaddr, false);
+                                                          vaddr, FALSE);
                                      }
                                    _bfd_vms_output_begin (abfd,
-                                                           ETIR_S_C_STA_PQ,
-                                                           -1);
+                                                          ETIR_S_C_STA_PQ,
+                                                          -1);
                                    _bfd_vms_output_long (abfd,
-                                                          (unsigned long)(sec->index));
+                                                         (unsigned long) (sec->index));
                                    _bfd_vms_output_quad (abfd,
-                                                          ((uquad)(*rptr)->addend
-                                                           + (uquad)sym->value));
+                                                         ((uquad) (*rptr)->addend
+                                                          + (uquad) sym->value));
                                    _bfd_vms_output_flush (abfd);
                                    _bfd_vms_output_begin (abfd,
-                                                           ETIR_S_C_STO_OFF,
-                                                           -1);
+                                                          ETIR_S_C_STO_OFF,
+                                                          -1);
                                    _bfd_vms_output_flush (abfd);
                                  }
                              }
@@ -2341,37 +2260,46 @@ _bfd_vms_write_tir (abfd, objtype)
                            case ALPHA_R_HINT:
                              {
                                int hint_size;
+                               char *hash ATTRIBUTE_UNUSED;
 
                                hint_size = sptr->size;
                                sptr->size = len;
                                sto_imm (abfd, sptr, vaddr, section->index);
                                sptr->size = hint_size;
 #if 0
-                               vms_output_begin(abfd, ETIR_S_C_STO_HINT_GBL, -1);
-                               vms_output_long(abfd, (unsigned long)(sec->index));
-                               vms_output_quad(abfd, (uquad)addr);
+                               vms_output_begin (abfd,
+                                                 ETIR_S_C_STO_HINT_GBL, -1);
+                               vms_output_long (abfd,
+                                                (unsigned long) (sec->index));
+                               vms_output_quad (abfd, (uquad) addr);
 
-                               vms_output_counted(abfd, _bfd_vms_length_hash_symbol (abfd, sym->name, EOBJ_S_C_SYMSIZ));
-                               vms_output_flush(abfd);
+                               hash = (_bfd_vms_length_hash_symbol
+                                       (abfd, sym->name, EOBJ_S_C_SYMSIZ));
+                               vms_output_counted (abfd, hash);
+
+                               vms_output_flush (abfd);
 #endif
                              }
                              break;
                            case ALPHA_R_LINKAGE:
                              {
+                               char *hash;
+
                                if (_bfd_vms_output_check (abfd, 64) < 0)
                                  {
                                    end_etir_record (abfd);
                                    start_etir_record (abfd, section->index,
-                                                      vaddr, false);
+                                                      vaddr, FALSE);
                                  }
                                _bfd_vms_output_begin (abfd,
-                                                       ETIR_S_C_STC_LP_PSB,
-                                                       -1);
+                                                      ETIR_S_C_STC_LP_PSB,
+                                                      -1);
                                _bfd_vms_output_long (abfd,
-                                                      (unsigned long)PRIV(vms_linkage_index));
-                               PRIV(vms_linkage_index) += 2;
-                               _bfd_vms_output_counted (abfd,
-                                                         _bfd_vms_length_hash_symbol (abfd, sym->name, EOBJ_S_C_SYMSIZ));
+                                                     (unsigned long) PRIV (vms_linkage_index));
+                               PRIV (vms_linkage_index) += 2;
+                               hash = (_bfd_vms_length_hash_symbol
+                                       (abfd, sym->name, EOBJ_S_C_SYMSIZ));
+                               _bfd_vms_output_counted (abfd, hash);
                                _bfd_vms_output_byte (abfd, 0);
                                _bfd_vms_output_flush (abfd);
                              }
@@ -2379,20 +2307,21 @@ _bfd_vms_write_tir (abfd, objtype)
 
                            case ALPHA_R_CODEADDR:
                              {
-                               if (_bfd_vms_output_check (abfd,
-                                                           strlen((char *)sym->name))
-                                   < 0)
+                               int slen = strlen ((char *) sym->name);
+                               char *hash;
+                               if (_bfd_vms_output_check (abfd, slen) < 0)
                                  {
                                    end_etir_record (abfd);
                                    start_etir_record (abfd,
                                                       section->index,
-                                                      vaddr, false);
+                                                      vaddr, FALSE);
                                  }
                                _bfd_vms_output_begin (abfd,
-                                                       ETIR_S_C_STO_CA,
-                                                       -1);
-                               _bfd_vms_output_counted (abfd,
-                                                         _bfd_vms_length_hash_symbol (abfd, sym->name, EOBJ_S_C_SYMSIZ));
+                                                      ETIR_S_C_STO_CA,
+                                                      -1);
+                               hash = (_bfd_vms_length_hash_symbol
+                                       (abfd, sym->name, EOBJ_S_C_SYMSIZ));
+                               _bfd_vms_output_counted (abfd, hash);
                                _bfd_vms_output_flush (abfd);
                              }
                              break;
@@ -2418,24 +2347,25 @@ _bfd_vms_write_tir (abfd, objtype)
                              rptr++;
                            }
                        }
-                     else                                      /* sptr starts after reloc */
+                     else                      /* sptr starts after reloc */
                        {
-                         i--;                          /* check next reloc */
+                         i--;                  /* check next reloc */
                          rptr++;
                        }
 
-                     if (i==0)                         /* all reloc checked */
+                     if (i==0)                 /* all reloc checked */
                        {
                          if (sptr->size > 0)
                            {
-                             sto_imm (abfd, sptr, vaddr, section->index);      /* dump rest */
+                             /* dump rest */
+                             sto_imm (abfd, sptr, vaddr, section->index);
                              vaddr += sptr->size;
                            }
                          break;
                        }
                    } /* for (;;) */
                } /* if SEC_RELOC */
-             else                                              /* no relocs, just dump */
+             else                              /* no relocs, just dump */
                {
                  sto_imm (abfd, sptr, vaddr, section->index);
                  vaddr += sptr->size;
@@ -2452,17 +2382,16 @@ _bfd_vms_write_tir (abfd, objtype)
       section = section->next;
     }
 
-  _bfd_vms_output_alignment(abfd, 2);
+  _bfd_vms_output_alignment (abfd, 2);
   return 0;
 }
 
-
-/* write traceback data for bfd abfd  */
+/* Write traceback data for bfd abfd.  */
 
 int
 _bfd_vms_write_tbt (abfd, objtype)
-     bfd *abfd;
-     int objtype;
+     bfd *abfd ATTRIBUTE_UNUSED;
+     int objtype ATTRIBUTE_UNUSED;
 {
 #if VMS_DEBUG
   _bfd_vms_debug (2, "vms_write_tbt (%p, %d)\n", abfd, objtype);
@@ -2471,13 +2400,12 @@ _bfd_vms_write_tbt (abfd, objtype)
   return 0;
 }
 
-
-/* write debug info for bfd abfd  */
+/* Write debug info for bfd abfd.  */
 
 int
 _bfd_vms_write_dbg (abfd, objtype)
-     bfd *abfd;
-     int objtype;
+     bfd *abfd ATTRIBUTE_UNUSED;
+     int objtype ATTRIBUTE_UNUSED;
 {
 #if VMS_DEBUG
   _bfd_vms_debug (2, "vms_write_dbg (%p, objtype)\n", abfd, objtype);