Major cleanup; mostly reformatting.

Include expr.h.
Undefine inline ifndef __GNUC__; never define to include static.
Add "static" to header of all inlined functions.
Add declarations for all static functions, with prototypes.
(addr_const_to_string): Use HOST_WIDE_INT_PRINT_* macros.
(add_AT_*, new_{die,loc_descr,cfi): Don't check for xmalloc returning zero.
(modified_type_die): Add missing parm on recursive call.
({reg,based}_loc_descriptor): Add missing arg to call to new_loc_descr.
(add_const_value_attribute): Use REAL_VALUE_TYPE for fp calculations.
(output_call_frame_info): Add missing arg to output_cfi call.
(dwarf2out_def_cfa): Local variable OLD_REG must be unsigned long.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@13940 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 4cff7c3..d388a15 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -35,6 +35,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "reload.h"
 #include "output.h"
 #include "defaults.h"
 #include "reload.h"
 #include "output.h"
 #include "defaults.h"

+#include "expr.h"

 
 /* #define NDEBUG 1 */
 #include "assert.h"
 
 /* #define NDEBUG 1 */
 #include "assert.h"


@@ -45,13 +46,10 @@ extern char *getpwd ();
    "Debugging Information Entries".  This term is abbreviated as `DIE'
    throughout the remainder of this file.  */
 
    "Debugging Information Entries".  This term is abbreviated as `DIE'
    throughout the remainder of this file.  */
 

-#if defined(__GNUC__) && (NDEBUG == 1)
-#define inline static inline
-#else
-#define inline static
+#ifndef __GNUC__
+#define inline

 #endif
 
 #endif
 

-

 /* An internal representation of the DWARF output is built, and then
    walked to generate the DWARF debugging info.  The walk of the internal
    representation is done after the entire program has been compiled.
 /* An internal representation of the DWARF output is built, and then
    walked to generate the DWARF debugging info.  The walk of the internal
    representation is done after the entire program has been compiled.


@@ -59,29 +57,32 @@ extern char *getpwd ();
 
 /* Each DIE may have a series of attribute/value pairs.  Values
    can take on several forms.  The forms that are used in this
 
 /* Each DIE may have a series of attribute/value pairs.  Values
    can take on several forms.  The forms that are used in this

-   impelementation are listed below.  */
+   implementation are listed below.  */
+

 typedef enum
 typedef enum

-  {
-    dw_val_class_addr,
-    dw_val_class_loc,
-    dw_val_class_const,
-    dw_val_class_unsigned_const,
-    dw_val_class_long_long,
-    dw_val_class_float,
-    dw_val_class_flag,
-    dw_val_class_die_ref,
-    dw_val_class_fde_ref,
-    dw_val_class_lbl_id,
-    dw_val_class_section_offset,
-    dw_val_class_str
-  }
+{
+  dw_val_class_addr,
+  dw_val_class_loc,
+  dw_val_class_const,
+  dw_val_class_unsigned_const,
+  dw_val_class_long_long,
+  dw_val_class_float,
+  dw_val_class_flag,
+  dw_val_class_die_ref,
+  dw_val_class_fde_ref,
+  dw_val_class_lbl_id,
+  dw_val_class_section_offset,
+  dw_val_class_str
+}

 dw_val_class;
 
 /* Various DIE's use offsets relative to the beginning of the
    .debug_info section to refer to each other.  */
 dw_val_class;
 
 /* Various DIE's use offsets relative to the beginning of the
    .debug_info section to refer to each other.  */

+

 typedef long int dw_offset;
 
 /* Define typedefs here to avoid circular dependencies.  */
 typedef long int dw_offset;
 
 /* Define typedefs here to avoid circular dependencies.  */

+

 typedef struct die_struct *dw_die_ref;
 typedef struct dw_attr_struct *dw_attr_ref;
 typedef struct dw_val_struct *dw_val_ref;
 typedef struct die_struct *dw_die_ref;
 typedef struct dw_attr_struct *dw_attr_ref;
 typedef struct dw_val_struct *dw_val_ref;


@@ -95,107 +96,114 @@ typedef struct pubname_struct *pubname_ref;
 typedef dw_die_ref *arange_ref;
 
 /* Describe a double word constant value.  */
 typedef dw_die_ref *arange_ref;
 
 /* Describe a double word constant value.  */

+

 typedef struct dw_long_long_struct
 typedef struct dw_long_long_struct

-  {
-    unsigned long hi;
-    unsigned long low;
-  }
+{
+  unsigned long hi;
+  unsigned long low;
+}

 dw_long_long_const;
 
 /* Describe a floating point constant value.  */
 dw_long_long_const;
 
 /* Describe a floating point constant value.  */

+

 typedef struct dw_fp_struct
 typedef struct dw_fp_struct

-  {
-    long *array;
-    unsigned length;
-  }
+{
+  long *array;
+  unsigned length;
+}

 dw_float_const;
 
 /* Each entry in the line_info_table maintains the file and
    line nuber associated with the label generated for that
    entry.  The label gives the PC value associated with
    the line number entry.  */
 dw_float_const;
 
 /* Each entry in the line_info_table maintains the file and
    line nuber associated with the label generated for that
    entry.  The label gives the PC value associated with
    the line number entry.  */

+

 typedef struct dw_line_info_struct
 typedef struct dw_line_info_struct

-  {
-    unsigned long dw_file_num;
-    unsigned long dw_line_num;
-  }
+{
+  unsigned long dw_file_num;
+  unsigned long dw_line_num;
+}

 dw_line_info_entry;
 
 /* Line information for functions in separate sections; each one gets its
    own sequence.  */
 typedef struct dw_separate_line_info_struct
 dw_line_info_entry;
 
 /* Line information for functions in separate sections; each one gets its
    own sequence.  */
 typedef struct dw_separate_line_info_struct

-  {
-    unsigned long dw_file_num;
-    unsigned long dw_line_num;
-    unsigned long function;
-  }
+{
+  unsigned long dw_file_num;
+  unsigned long dw_line_num;
+  unsigned long function;
+}

 dw_separate_line_info_entry;
 
 /* The dw_val_node describes an attibute's value, as it is
    represented internally.  */
 dw_separate_line_info_entry;
 
 /* The dw_val_node describes an attibute's value, as it is
    represented internally.  */

+

 typedef struct dw_val_struct
 typedef struct dw_val_struct

-  {
-    dw_val_class val_class;
-    union
-      {
-       char *val_addr;
-       dw_loc_descr_ref val_loc;
-       long int val_int;
-       long unsigned val_unsigned;
-       dw_long_long_const val_long_long;
-       dw_float_const val_float;
-       dw_die_ref val_die_ref;
-       unsigned val_fde_index;
-       char *val_str;
-       char *val_lbl_id;
-       char *val_section;
-       unsigned char val_flag;
-      }
-    v;
-  }
+{
+  dw_val_class val_class;
+  union
+    {
+      char *val_addr;
+      dw_loc_descr_ref val_loc;
+      long int val_int;
+      long unsigned val_unsigned;
+      dw_long_long_const val_long_long;
+      dw_float_const val_float;
+      dw_die_ref val_die_ref;
+      unsigned val_fde_index;
+      char *val_str;
+      char *val_lbl_id;
+      char *val_section;
+      unsigned char val_flag;
+    }
+  v;
+}

 dw_val_node;
 
 /* Locations in memory are described using a sequence of stack machine
    operations.  */
 dw_val_node;
 
 /* Locations in memory are described using a sequence of stack machine
    operations.  */

+

 typedef struct dw_loc_descr_struct
 typedef struct dw_loc_descr_struct

-  {
-    dw_loc_descr_ref dw_loc_next;
-    enum dwarf_location_atom dw_loc_opc;
-    dw_val_node dw_loc_oprnd1;
-    dw_val_node dw_loc_oprnd2;
-  }
+{
+  dw_loc_descr_ref dw_loc_next;
+  enum dwarf_location_atom dw_loc_opc;
+  dw_val_node dw_loc_oprnd1;
+  dw_val_node dw_loc_oprnd2;
+}

 dw_loc_descr_node;
 
 /* Each DIE attribute has a field specifying the attribute kind,
    a link to the next attribute in the chain, and an attribute value.
    Attributes are typically linked below the DIE they modify.  */
 dw_loc_descr_node;
 
 /* Each DIE attribute has a field specifying the attribute kind,
    a link to the next attribute in the chain, and an attribute value.
    Attributes are typically linked below the DIE they modify.  */

+

 typedef struct dw_attr_struct
 typedef struct dw_attr_struct

-  {
-    enum dwarf_attribute dw_attr;
-    dw_attr_ref dw_attr_next;
-    dw_val_node dw_attr_val;
-  }
+{
+  enum dwarf_attribute dw_attr;
+  dw_attr_ref dw_attr_next;
+  dw_val_node dw_attr_val;
+}

 dw_attr_node;
 
 /* Call frames are described using a sequence of Call Frame
    Information instructions.  The register number, offset
    and address fields are provided as possible operands;
    their use is selected by the opcode field.  */
 dw_attr_node;
 
 /* Call frames are described using a sequence of Call Frame
    Information instructions.  The register number, offset
    and address fields are provided as possible operands;
    their use is selected by the opcode field.  */

+

 typedef union dw_cfi_oprnd_struct
 typedef union dw_cfi_oprnd_struct

-  {
-    unsigned long dw_cfi_reg_num;
-    long int dw_cfi_offset;
-    char *dw_cfi_addr;
-  }
+{
+  unsigned long dw_cfi_reg_num;
+  long int dw_cfi_offset;
+  char *dw_cfi_addr;
+}

 dw_cfi_oprnd;
 
 typedef struct dw_cfi_struct
 dw_cfi_oprnd;
 
 typedef struct dw_cfi_struct

-  {
-    dw_cfi_ref dw_cfi_next;
-    enum dwarf_call_frame_info dw_cfi_opc;
-    dw_cfi_oprnd dw_cfi_oprnd1;
-    dw_cfi_oprnd dw_cfi_oprnd2;
-  }
+{
+  dw_cfi_ref dw_cfi_next;
+  enum dwarf_call_frame_info dw_cfi_opc;
+  dw_cfi_oprnd dw_cfi_oprnd1;
+  dw_cfi_oprnd dw_cfi_oprnd2;
+}

 dw_cfi_node;
 
 /* All call frame descriptions (FDE's) in the GCC generated DWARF
 dw_cfi_node;
 
 /* All call frame descriptions (FDE's) in the GCC generated DWARF


@@ -203,32 +211,35 @@ dw_cfi_node;
    the beginning of the .debug_frame section.  This used of a single
    CIE obviates the need to keep track of multiple CIE's
    in the DWARF generation routines below.  */
    the beginning of the .debug_frame section.  This used of a single
    CIE obviates the need to keep track of multiple CIE's
    in the DWARF generation routines below.  */

+

 typedef struct dw_fde_struct
 typedef struct dw_fde_struct

-  {
-    unsigned long dw_fde_offset;
-    char *dw_fde_begin;
-    char *dw_fde_current_label;
-    char *dw_fde_end;
-    dw_cfi_ref dw_fde_cfi;
-  }
+{
+  unsigned long dw_fde_offset;
+  char *dw_fde_begin;
+  char *dw_fde_current_label;
+  char *dw_fde_end;
+  dw_cfi_ref dw_fde_cfi;
+}

 dw_fde_node;
 
 /* The Debugging Information Entry (DIE) structure */
 dw_fde_node;
 
 /* The Debugging Information Entry (DIE) structure */

+

 typedef struct die_struct
 typedef struct die_struct

-  {
-    enum dwarf_tag die_tag;
-    dw_attr_ref die_attr;
-    dw_attr_ref die_attr_last;
-    dw_die_ref die_parent;
-    dw_die_ref die_child;
-    dw_die_ref die_child_last;
-    dw_die_ref die_sib;
-    dw_offset die_offset;
-    unsigned long die_abbrev;
-  }
+{
+  enum dwarf_tag die_tag;
+  dw_attr_ref die_attr;
+  dw_attr_ref die_attr_last;
+  dw_die_ref die_parent;
+  dw_die_ref die_child;
+  dw_die_ref die_child_last;
+  dw_die_ref die_sib;
+  dw_offset die_offset;
+  unsigned long die_abbrev;
+}

 die_node;
 
 /* The pubname structure */
 die_node;
 
 /* The pubname structure */

+

 typedef struct pubname_struct
 {
   dw_die_ref die;
 typedef struct pubname_struct
 {
   dw_die_ref die;


@@ -250,14 +261,16 @@ pubname_entry;
    _named_ TYPE_DECL node for each tagged type node created.
    These TYPE_DECLs have DECL_ARTIFICIAL set, so we know not to
    generate a DW_TAG_typedef DIE for them.  */
    _named_ TYPE_DECL node for each tagged type node created.
    These TYPE_DECLs have DECL_ARTIFICIAL set, so we know not to
    generate a DW_TAG_typedef DIE for them.  */

+

 #define TYPE_DECL_IS_STUB(decl)                                \
 #define TYPE_DECL_IS_STUB(decl)                                \

-  (DECL_NAME (decl) == NULL                            \
+  (DECL_NAME (decl) == NULL_TREE                       \

    || (DECL_ARTIFICIAL (decl)                          \
        && is_tagged_type (TREE_TYPE (decl))            \
        && decl == TYPE_STUB_DECL (TREE_TYPE (decl))))
 
 /* Information concerning the compilation unit's programming
    language, and compiler version.  */
    || (DECL_ARTIFICIAL (decl)                          \
        && is_tagged_type (TREE_TYPE (decl))            \
        && decl == TYPE_STUB_DECL (TREE_TYPE (decl))))
 
 /* Information concerning the compilation unit's programming
    language, and compiler version.  */

+

 extern int flag_traditional;
 extern char *version_string;
 extern char *language_string;
 extern int flag_traditional;
 extern char *version_string;
 extern char *language_string;


@@ -269,6 +282,7 @@ extern char *language_string;
    are only defaults.  If the sizes are different for your target, you should
    override these values by defining the appropriate symbols in your tm.h
    file.  */
    are only defaults.  If the sizes are different for your target, you should
    override these values by defining the appropriate symbols in your tm.h
    file.  */

+

 #ifndef CHAR_TYPE_SIZE
 #define CHAR_TYPE_SIZE BITS_PER_UNIT
 #endif
 #ifndef CHAR_TYPE_SIZE
 #define CHAR_TYPE_SIZE BITS_PER_UNIT
 #endif


@@ -279,6 +293,7 @@ extern char *language_string;
 /* The size in bytes of a DWARF field indicating an offset or length
    relative to a debug info section, specified to be 4 bytes in the DWARF-2
    specification.  The SGI/MIPS ABI defines it to be the same as PTR_SIZE.  */
 /* The size in bytes of a DWARF field indicating an offset or length
    relative to a debug info section, specified to be 4 bytes in the DWARF-2
    specification.  The SGI/MIPS ABI defines it to be the same as PTR_SIZE.  */

+

 #ifndef DWARF_OFFSET_SIZE
 #define DWARF_OFFSET_SIZE 4
 #endif
 #ifndef DWARF_OFFSET_SIZE
 #define DWARF_OFFSET_SIZE 4
 #endif


@@ -325,6 +340,7 @@ static unsigned cie_size;
    no a priori knowledge of how many instruction bytes are generated
    for each source line, and therefore can use only the  DW_LNE_set_address
    and DW_LNS_fixed_advance_pc line information commands.  */
    no a priori knowledge of how many instruction bytes are generated
    for each source line, and therefore can use only the  DW_LNE_set_address
    and DW_LNS_fixed_advance_pc line information commands.  */

+

 #ifndef DWARF_LINE_MIN_INSTR_LENGTH
 #define DWARF_LINE_MIN_INSTR_LENGTH 4
 #endif
 #ifndef DWARF_LINE_MIN_INSTR_LENGTH
 #define DWARF_LINE_MIN_INSTR_LENGTH 4
 #endif


@@ -354,7 +370,7 @@ static unsigned long next_die_offset;
 static unsigned long next_fde_offset;
 
 /* Record the root of the DIE's built for the current compilation unit.  */
 static unsigned long next_fde_offset;
 
 /* Record the root of the DIE's built for the current compilation unit.  */

-dw_die_ref comp_unit_die;
+static dw_die_ref comp_unit_die;

 
 /* The number of DIEs with a NULL parent waiting to be relocated.  */
 static int limbo_die_count;
 
 /* The number of DIEs with a NULL parent waiting to be relocated.  */
 static int limbo_die_count;


@@ -508,17 +524,14 @@ static unsigned arange_table_in_use;
 static tree *pending_types_list;
 
 /* Number of elements currently allocated for the pending_types_list.  */
 static tree *pending_types_list;
 
 /* Number of elements currently allocated for the pending_types_list.  */

-

 static unsigned pending_types_allocated;
 
 /* Number of elements of pending_types_list currently in use.  */
 static unsigned pending_types_allocated;
 
 /* Number of elements of pending_types_list currently in use.  */

-

 static unsigned pending_types;
 
 /* Size (in elements) of increments by which we may expand the pending
    types list.  Actually, a single hunk of space of this size should
    be enough for most typical programs.         */
 static unsigned pending_types;
 
 /* Size (in elements) of increments by which we may expand the pending
    types list.  Actually, a single hunk of space of this size should
    be enough for most typical programs.         */

-

 #define PENDING_TYPES_INCREMENT 64
 
 /* The number of the current function definition for which debugging
 #define PENDING_TYPES_INCREMENT 64
 
 /* The number of the current function definition for which debugging


@@ -545,19 +558,207 @@ static int comp_unit_has_inlines;
 static tree dwarf_last_decl;
 
 /* Forward declarations for functions defined in this file.  */
 static tree dwarf_last_decl;
 
 /* Forward declarations for functions defined in this file.  */

-static void gen_type_die ();
-static void add_type_attribute ();
-static void decls_for_scope ();
-static void gen_decl_die ();
-static unsigned lookup_filename ();
-static int constant_size PROTO((long unsigned));
-static enum dwarf_form value_format PROTO((dw_val_ref));
-static unsigned reg_number ();
+
+static char *stripattributes           PROTO((char *));
+static void addr_const_to_string       PROTO((char *, rtx));
+static char *addr_to_string            PROTO((rtx));
+static int is_pseudo_reg               PROTO((rtx));
+static tree type_main_variant          PROTO((tree));
+static int is_tagged_type              PROTO((tree));
+static char *dwarf_tag_name            PROTO((unsigned));
+static char *dwarf_attr_name           PROTO((unsigned));
+static char *dwarf_form_name           PROTO((unsigned));
+static char *dwarf_stack_op_name       PROTO((unsigned));
+static char *dwarf_type_encoding_name  PROTO((unsigned));
+static char *dward_cfi_name            PROTO((unsigned));
+static tree decl_ultimate_origin       PROTO((tree));
+static tree block_ultimate_origin      PROTO((tree));
+static tree decl_class_context         PROTO((tree));
+static void add_dwarf_attr             PROTO((dw_die_ref, dw_attr_ref));
+static void add_AT_flag                        PROTO((dw_die_ref,
+                                              enum dwarf_attribute,
+                                              unsigned));
+static void add_AT_int                 PROTO((dw_die_ref,
+                                              enum dwarf_attribute, long));
+static void add_AT_unsigned            PROTO((dw_die_ref,
+                                              enum dwarf_attribute,
+                                              unsigned long));
+static void add_AT_long_long           PROTO((dw_die_ref,
+                                              enum dwarf_attribute,
+                                              unsigned long, unsigned long));
+static void add_AT_float               PROTO((dw_die_ref,
+                                              enum dwarf_attribute,
+                                              unsigned, long *));
+static void add_AT_string              PROTO((dw_die_ref,
+                                              enum dwarf_attribute, char *));
+static void add_AT_die_ref             PROTO((dw_die_ref,
+                                              enum dwarf_attribute,
+                                              dw_die_ref));
+static void add_AT_fde_ref             PROTO((dw_die_ref,
+                                              enum dwarf_attribute,
+                                              unsigned));
+static void add_AT_loc                 PROTO((dw_die_ref,
+                                              enum dwarf_attribute,
+                                              dw_loc_descr_ref));
+static void add_AT_addr                        PROTO((dw_die_ref,
+                                              enum dwarf_attribute, char *));
+static void add_AT_lbl_id              PROTO((dw_die_ref,
+                                              enum dwarf_attribute, char *));
+static void add_AT_setion_offset       PROTO((dw_die_ref,
+                                              enum dwarf_attribute, char *));
+static int is_extern_subr_die          PROTO((dw_die_ref));
+static dw_attr_ref get_AT              PROTO((dw_die_ref,
+                                              enum dwarf_attribute));
+static char *get_AT_low_pc             PROTO((dw_die_ref));
+static char *get_AT_hi_pc              PROTO((dw_die_ref));
+static char *get_AT_string             PROTO((dw_die_ref,
+                                              enum dwarf_attribute));
+static int get_AT_flag                 PROTO((dw_die_ref,
+                                              enum dwarf_attribute));
+static unsigned get_AT_unsigned                PROTO((dw_die_ref,
+                                              enum dwarf_attribute));
+static int is_c_family                 PROTO((void));
+static int is_fortran                  PROTO((void));
+static void remove_AT                  PROTO((dw_die_ref,
+                                              enum dwarf_attribute));
+static void remove_children            PROTO((dw_die_ref));
+static void add_child_die              PROTO((dw_die_ref, dw_die_ref));
+static dw_die_ref new_die              PROTO((enum dwarf_tag, dw_die_ref));
+static dw_die_ref lookup_type_die      PROTO((tree));
+static void equate_type_number_to_die  PROTO((tree, dw_die_ref));
+static dw_die_ref lookup_decl_die      PROTO((tree));
+static void equate_decl_number_to_die  PROTO((tree, dw_die_ref));
+static dw_loc_descr_ref new_loc_descr  PROTO((enum dwarf_location_atom,
+                                              unsigned long, unsigned long));
+static void add_loc_descr              PROTO((dw_loc_descr_ref *,
+                                              dw_loc_descr_ref));
+static dw_cfi_ref new_cfe              PROTO((void));
+static void add_cfe                    PROTO((dw_cfi_ref *, dw_cfi_ref));
+static void print_spaces               PROTO((FILE *));
+static void print_die                  PROTO((dw_die_ref, FILE *));
+static void print_dwarf_line_table     PROTO((FILE *));
+static void add_sibling_atttributes    PROTO((dw_die_ref));
+static void build_abbrev_table         PROTO((dw_die_ref));
+static unsigned long size_of_uleb128   PROTO((unsigned long));
+static unsigned long size_of_sleb128   PROTO((long));
+static unsigned long size_of_string    PROTO((char *));
+static unsigned long size_of_loc_descr PROTO((dw_loc_descr_ref));
+static unsigned long size_of_locs      PROTO((dw_loc_descr_ref));
+static int constant_size               PROTO((long unsigned));
+static unsigned long size_of_die       PROTO((dw_die_ref));
+static void calc_die_sizes             PROTO((dw_die_ref));
+static unsigned long size_of_prolog    PROTO((void));
+static unsigned long size_of_line_info PROTO((void));
+static unsigned long size_of_pubnames  PROTO((void));
+static unsigned long size_of_aranges   PROTO((void));
+static void output_uleb128             PROTO((unsigned long));
+static void output_sleb128             PROTO((long));
+static enum dwarf_form value_format    PROTO((dw_val_ref));
+static void output_value_format                PROTO((dw_val_ref));
+static void output_abbrev_section      PROTO((void));
+static void output_loc_operands                PROTO((dw_loc_descr_ref));
+static unsigned long sibling_offset    PROTO((dw_die_ref));
+static void output_die                 PROTO((dw_die_ref));
+static void output_compilation_unit_header PROTO((void));
+static char *dwarf2out_cfi_label       PROTO((void));
+static void add_fde_cfi                        PROTO((char *, dw_cfi_ref));
+static void lookup_cfa_1               PROTO((dw_cfi_ref, unsigned long *,
+                                              long *));
+static void lookup_cfa                 PROTO((unsigned long *, long *));
+static void reg_save                   PROTO((char *, unsigned, unsigned,
+                                              long));
+static void initial_return_save                PROTO((rtx));
+static unsigned long size_of_cfi       PROTO((dw_cfi_ref));
+static unsigned long size_of_fde       PROTO((dw_fde_ref, unsigned long *));
+static void calc_fde_sizes             PROTO((void));
+static void output_cfi                 PROTO((dw_cfi_ref, dw_fde_ref));
+static void output_call_frame_info     PROTO((void));
+static char *dwarf2_name               PROTO((tree, int));
+static void add_pubname                        PROTO((tree, dw_die_ref));
+static void output_pubnames            PROTO((void));
+static void add_arrange                        PROTO((tree, dw_die_ref));
+static void output_arranges            PROTO((void));
+static void output_line_info           PROTO((void));
+static int is_body_block               PROTO((tree));
+static dw_die_ref base_type_die                PROTO((tree));
+static tree root_type                  PROTO((tree));
+static int is_base_type                        PROTO((tree));
+static dw_die_ref modified_type_die    PROTO((tree, int, int, dw_die_ref));
+static int type_is_enum                        PROTO((tree));
+static unsigned reg_number             PROTO((rtx));
+static dw_loc_descr_ref reg_loc_descr_ref PROTO((rtx));
+static dw_loc_descr_ref based_loc_descr        PROTO((unsigned, long));
+static int is_based_loc                        PROTO((rtx));
+static dw_loc_descr_ref mem_loc_descriptor PROTO((rtx));
+static dw_loc_descr_ref loc_descriptor PROTO((rtx));
+static unsigned ceiling                        PROTO((unsigned, unsigned));
+static tree field_type                 PROTO((tree));
+static unsigned simple_type_align_in_bits PROTO((tree));
+static unsigned simple_type_size_in_bits PROTO((tree));
+static unsigned field_byte_offset              PROTO((tree));
+static void add_location_attribute     PROTO((dw_die_ref, rtx));
+static void add_data_member_location_attribute PROTO((dw_die_ref, tree));
+static void add_const_value_attribute  PROTO((dw_die_ref, rtx));
+static void add_location_or_const_value_attribute PROTO((dw_die_ref, tree));
+static void add_name_attribute         PROTO((dw_die_ref, char *));
+static void add_bound_info             PROTO((dw_die_ref,
+                                              enum dwarf_attribute, tree));
+static void add_subscript_info         PROTO((dw_die_ref, tree));
+static void add_byte_size_attribute    PROTO((dw_die_ref, tree));
+static void add_bit_offset_attribute   PROTO((dw_die_ref, tree));
+static void add_bit_size_attribute     PROTO((dw_die_ref, tree));
+static void add_prototyped_attribute   PROTO((dw_die_ref, tree));
+static void add_abstract_origin_attribute PROTO((dw_die_ref, tree));
+static void add_pure_or_virtual_attribute PROTO((dw_die_ref, tree));
+static void add_src_coords_attributes  PROTO((dw_die_ref, tree));
+static void ad_name_and_src_coords_attributes PROTO((dw_die_ref, tree));
+static void push_decl_scope            PROTO((tree));
+static dw_die_ref scope_die_for                PROTO((tree, dw_die_ref));
+static void pop_decl_scope             PROTO((void));
+static void add_type_attribute         PROTO((dw_die_ref, tree, int, int,
+                                              dw_die_ref));
+static char *type_tag                  PROTO((tree));
+static tree member_declared_type       PROTO((tree));
+static char *decl_start_label          PROTO((tree));
+static void gen_arrqay_type_die                PROTO((tree, dw_die_ref));
+static void gen_set_type_die           PROTO((tree, dw_die_ref));
+static void gen_entry_point_die                PROTO((tree, dw_die_ref));
+static void pend_type                  PROTO((tree));
+static void output_pending_types_for_scope PROTO((dw_die_ref));
+static void gen_inlined_enumeration_type_die PROTO((tree, dw_die_ref));
+static void gen_inlined_structure_type_die PROTO((tree, dw_die_ref));
+static void gen_inlined_union_type_die PROTO((tree, dw_die_ref));
+static void gen_enumeration_type_die   PROTO((tree, dw_die_ref));
+static dw_die_ref gen_formal_parameter_die PROTO((tree, dw_die_ref));
+static void gen_unspecified_parameters_die PROTO((tree, dw_die_ref));
+static void gen_formal_types_die       PROTO((tree, dw_die_ref));
+static void gen_subprogram_die         PROTO((tree, dw_die_ref));
+static void gen_variable_die           PROTO((tree, dw_die_ref));
+static void gen_labeld_die             PROTO((tree, dw_die_ref));
+static void gen_lexical_block_die      PROTO((tree, dw_die_ref, int));
+static void gen_inlined_subprogram_die PROTO((tree, dw_die_ref, int));
+static void gen_field_die              PROTO((tree, dw_die_ref));
+static void gen_ptr_to_mbr_type_die    PROTO((tree, dw_die_ref));
+static void gen_compile_unit_die       PROTO((char *));
+static void gen_string_type_die                PROTO((tree, dw_die_ref));
+static void gen_inheritance_die                PROTO((tree, dw_die_ref));
+static void gen_member_die             PROTO((tree, dw_die_ref));
+static void gen_struct_or_union_type_die PROTO((tree, dw_die_ref));
+static void gen_subroutine_type_die    PROTO((tree, dw_die_ref));
+static void gen_typedef_die            PROTO((tree, dw_die_ref));
+static void gen_type_die               PROTO((tree, dw_die_ref));
+static void gen_tagged_type_instantiation_die PROTO((tree, dw_die_ref));
+static void gen_block_die              PROTO((tree, dw_die_ref, int));
+static void decls_for_scope            PROTO((tree, dw_die_ref, int));
+static int is_redundant_typedef                PROTO((tree));
+static void gen_decl_die               PROTO((tree, dw_die_ref));
+static unsigned lookup_filename                PROTO((char *));

 
 /* Definitions of defaults for assembler-dependent names of various
    pseudo-ops and section names.
    Theses may be overridden in the tm.h file (if necessary) for a particular
    assembler.  */
 
 /* Definitions of defaults for assembler-dependent names of various
    pseudo-ops and section names.
    Theses may be overridden in the tm.h file (if necessary) for a particular
    assembler.  */

+

 #ifndef UNALIGNED_SHORT_ASM_OP
 #define UNALIGNED_SHORT_ASM_OP ".2byte"
 #endif
 #ifndef UNALIGNED_SHORT_ASM_OP
 #define UNALIGNED_SHORT_ASM_OP ".2byte"
 #endif


@@ -687,6 +888,7 @@ char text_end_label[MAX_ARTIFICIAL_LABEL_BYTES];
 /* Definitions of defaults for various types of primitive assembly language
    output operations.  These may be overridden from within the tm.h file,
    but typically, that is unecessary.  */
 /* Definitions of defaults for various types of primitive assembly language
    output operations.  These may be overridden from within the tm.h file,
    but typically, that is unecessary.  */

+

 #ifndef ASM_OUTPUT_SECTION
 #define ASM_OUTPUT_SECTION(FILE, SECTION) \
   fprintf ((FILE), SECTION_FORMAT, SECTION_ASM_OP, SECTION)
 #ifndef ASM_OUTPUT_SECTION
 #define ASM_OUTPUT_SECTION(FILE, SECTION) \
   fprintf ((FILE), SECTION_FORMAT, SECTION_ASM_OP, SECTION)


@@ -848,29 +1050,29 @@ char text_end_label[MAX_ARTIFICIAL_LABEL_BYTES];
 #define DWARF_FRAME_REGNUM(REG) DBX_REGISTER_NUMBER (REG)
 #endif
 \f
 #define DWARF_FRAME_REGNUM(REG) DBX_REGISTER_NUMBER (REG)
 #endif
 \f

-/************************ general utility functions **************************/
-
-/* Return a pointer to a copy of the section string name 's' with all
+/* Return a pointer to a copy of the section string name S with all

    attributes stripped off.  */
    attributes stripped off.  */

-inline char *
+
+static inline char *

 stripattributes (s)
 stripattributes (s)

-     register char *s;
+     char *s;

 {
 {

-  register char *stripped, *p;
-  stripped = xstrdup (s);
-  p = stripped;
+  char *stripped = xstrdup (s);
+  char *p = stripped;
+

   while (*p && *p != ',')
     p++;
   while (*p && *p != ',')
     p++;

+

   *p = '\0';
   return stripped;
 }
 
   *p = '\0';
   return stripped;
 }
 

-/* Convert an integer constant expression into assembler syntax.
-   Addition and subtraction are the only arithmetic
-   that may appear in these expressions.   This is an adaptation
-   of output_addr_const() in final.c.   Here, the target of the
-   conversion is a string buffer.  We can't use output_addr_const
-   directly, because it writes to a file.  */
+/* Convert an integer constant expression into assembler syntax.  Addition
+   and subtraction are the only arithmetic that may appear in these
+   expressions.   This is an adaptation of output_addr_const in final.c.
+   Here, the target of the conversion is a string buffer.  We can't use
+   output_addr_const directly, because it writes to a file.  */
+

 static void
 addr_const_to_string (str, x)
      char *str;
 static void
 addr_const_to_string (str, x)
      char *str;


@@ -908,13 +1110,7 @@ restart:
       break;
 
     case CONST_INT:
       break;
 
     case CONST_INT:

-      sprintf (buf1,
-#if HOST_BITS_PER_WIDE_INT == HOST_BITS_PER_INT
-              "%d",
-#else
-              "%ld",
-#endif
-              INTVAL (x));
+      sprintf (buf1, HOST_WIDE_INT_PRINT_DEC, INTVAL (x));

       strcat (str, buf1);
       break;
 
       strcat (str, buf1);
       break;
 


@@ -930,36 +1126,12 @@ restart:
        {
          /* We can use %d if the number is one word and positive.  */
          if (CONST_DOUBLE_HIGH (x))
        {
          /* We can use %d if the number is one word and positive.  */
          if (CONST_DOUBLE_HIGH (x))

-           sprintf (buf1,
-#if HOST_BITS_PER_WIDE_INT == 64
-#if HOST_BITS_PER_WIDE_INT != HOST_BITS_PER_INT
-                    "0x%lx%016lx",
-#else
-                    "0x%x%016x",
-#endif
-#else
-#if HOST_BITS_PER_WIDE_INT != HOST_BITS_PER_INT
-                    "0x%lx%08lx",
-#else
-                    "0x%x%08x",
-#endif
-#endif
+           sprintf (buf1, HOST_WIDE_INT_PRINT_DOUBLE_HEX,

                     CONST_DOUBLE_HIGH (x), CONST_DOUBLE_LOW (x));
          else if (CONST_DOUBLE_LOW (x) < 0)
                     CONST_DOUBLE_HIGH (x), CONST_DOUBLE_LOW (x));
          else if (CONST_DOUBLE_LOW (x) < 0)

-           sprintf (buf1,
-#if HOST_BITS_PER_WIDE_INT == HOST_BITS_PER_INT
-                    "0x%x",
-#else
-                    "0x%lx",
-#endif
-                    CONST_DOUBLE_LOW (x));
+           sprintf (buf1, HOST_WIDE_INT_PRINT_HEX, CONST_DOUBLE_LOW (x));

          else
          else

-           sprintf (buf1,
-#if HOST_BITS_PER_WIDE_INT == HOST_BITS_PER_INT
-                    "%d",
-#else
-                    "%ld",
-#endif
+           sprintf (buf1, HOST_WIDE_INT_PRINT_DEC,

                     CONST_DOUBLE_LOW (x));
          strcat (str, buf1);
        }
                     CONST_DOUBLE_LOW (x));
          strcat (str, buf1);
        }


@@ -977,6 +1149,7 @@ restart:
          strcat (str, buf1);
          if (INTVAL (XEXP (x, 0)) >= 0)
            strcat (str, "+");
          strcat (str, buf1);
          if (INTVAL (XEXP (x, 0)) >= 0)
            strcat (str, "+");

+

          addr_const_to_string (buf1, XEXP (x, 0));
          strcat (str, buf1);
        }
          addr_const_to_string (buf1, XEXP (x, 0));
          strcat (str, buf1);
        }


@@ -986,6 +1159,7 @@ restart:
          strcat (str, buf1);
          if (INTVAL (XEXP (x, 1)) >= 0)
            strcat (str, "+");
          strcat (str, buf1);
          if (INTVAL (XEXP (x, 1)) >= 0)
            strcat (str, "+");

+

          addr_const_to_string (buf1, XEXP (x, 1));
          strcat (str, buf1);
        }
          addr_const_to_string (buf1, XEXP (x, 1));
          strcat (str, buf1);
        }


@@ -1029,6 +1203,7 @@ restart:
 
 /* Convert an address constant to a string, and return a pointer to
    a copy of the result, located on the heap.  */
 
 /* Convert an address constant to a string, and return a pointer to
    a copy of the result, located on the heap.  */

+

 static char *
 addr_to_string (x)
      rtx x;
 static char *
 addr_to_string (x)
      rtx x;


@@ -1039,7 +1214,8 @@ addr_to_string (x)
 }
 
 /* Test if rtl node points to a psuedo register.  */
 }
 
 /* Test if rtl node points to a psuedo register.  */

-inline int
+
+static inline int

 is_pseudo_reg (rtl)
      register rtx rtl;
 {
 is_pseudo_reg (rtl)
      register rtx rtl;
 {


@@ -1048,10 +1224,10 @@ is_pseudo_reg (rtl)
              && (REGNO (XEXP (rtl, 0)) >= FIRST_PSEUDO_REGISTER)));
 }
 
              && (REGNO (XEXP (rtl, 0)) >= FIRST_PSEUDO_REGISTER)));
 }
 

-

 /* Return a reference to a type, with its const and volatile qualifiers
    removed.  */
 /* Return a reference to a type, with its const and volatile qualifiers
    removed.  */

-inline tree
+
+static inline tree

 type_main_variant (type)
      register tree type;
 {
 type_main_variant (type)
      register tree type;
 {


@@ -1061,16 +1237,17 @@ type_main_variant (type)
      of a given type (and all of the MAIN_VARIANT values for all members of
      the group should point to that one type) but sometimes the C front-end
      messes this up for array types, so we work around that bug here.  */
      of a given type (and all of the MAIN_VARIANT values for all members of
      the group should point to that one type) but sometimes the C front-end
      messes this up for array types, so we work around that bug here.  */

+

   if (TREE_CODE (type) == ARRAY_TYPE)
   if (TREE_CODE (type) == ARRAY_TYPE)

-    {
-      while (type != TYPE_MAIN_VARIANT (type))
-       type = TYPE_MAIN_VARIANT (type);
-    }
+    while (type != TYPE_MAIN_VARIANT (type))
+      type = TYPE_MAIN_VARIANT (type);
+

   return type;
 }
 
 /* Return non-zero if the given type node represents a tagged type.  */
   return type;
 }
 
 /* Return non-zero if the given type node represents a tagged type.  */

-inline int
+
+static inline int

 is_tagged_type (type)
      register tree type;
 {
 is_tagged_type (type)
      register tree type;
 {


@@ -1081,6 +1258,7 @@ is_tagged_type (type)
 }
 
 /* Convert a DIE tag into its string name.  */
 }
 
 /* Convert a DIE tag into its string name.  */

+

 static char *
 dwarf_tag_name (tag)
      register unsigned tag;
 static char *
 dwarf_tag_name (tag)
      register unsigned tag;


@@ -1197,6 +1375,7 @@ dwarf_tag_name (tag)
 }
 
 /* Convert a DWARF attribute code into its string name.  */
 }
 
 /* Convert a DWARF attribute code into its string name.  */

+

 static char *
 dwarf_attr_name (attr)
      register unsigned attr;
 static char *
 dwarf_attr_name (attr)
      register unsigned attr;


@@ -1369,6 +1548,7 @@ dwarf_attr_name (attr)
 }
 
 /* Convert a DWARF value form code into its string name.  */
 }
 
 /* Convert a DWARF value form code into its string name.  */

+

 static char *
 dwarf_form_name (form)
      register unsigned form;
 static char *
 dwarf_form_name (form)
      register unsigned form;


@@ -1423,6 +1603,7 @@ dwarf_form_name (form)
 }
 
 /* Convert a DWARF stack opcode into its string name.  */
 }
 
 /* Convert a DWARF stack opcode into its string name.  */

+

 static char *
 dwarf_stack_op_name (op)
      register unsigned op;
 static char *
 dwarf_stack_op_name (op)
      register unsigned op;


@@ -1725,6 +1906,7 @@ dwarf_stack_op_name (op)
 }
 
 /* Convert a DWARF type code into its string name.  */
 }
 
 /* Convert a DWARF type code into its string name.  */

+

 static char *
 dwarf_type_encoding_name (enc)
      register unsigned enc;
 static char *
 dwarf_type_encoding_name (enc)
      register unsigned enc;


@@ -1753,6 +1935,7 @@ dwarf_type_encoding_name (enc)
 }
 
 /* Convert a DWARF call frame info. operation to its string name */
 }
 
 /* Convert a DWARF call frame info. operation to its string name */

+

 static char *
 dwarf_cfi_name (cfi_opc)
      register unsigned cfi_opc;
 static char *
 dwarf_cfi_name (cfi_opc)
      register unsigned cfi_opc;


@@ -1808,14 +1991,15 @@ dwarf_cfi_name (cfi_opc)
    function, so we have to trace all of the way back through the origin chain
    to find out what sort of node actually served as the original seed for the
    given block.  */
    function, so we have to trace all of the way back through the origin chain
    to find out what sort of node actually served as the original seed for the
    given block.  */

+

 static tree
 decl_ultimate_origin (decl)
      register tree decl;
 {
   register tree immediate_origin = DECL_ABSTRACT_ORIGIN (decl);
 
 static tree
 decl_ultimate_origin (decl)
      register tree decl;
 {
   register tree immediate_origin = DECL_ABSTRACT_ORIGIN (decl);
 

-  if (immediate_origin == NULL || immediate_origin == decl)
-    return NULL;
+  if (immediate_origin == NULL_TREE || immediate_origin == decl)
+    return NULL_TREE;

   else
     {
       register tree ret_val;
   else
     {
       register tree ret_val;


@@ -1827,6 +2011,7 @@ decl_ultimate_origin (decl)
          lookahead = DECL_ABSTRACT_ORIGIN (ret_val);
        }
       while (lookahead != NULL && lookahead != ret_val);
          lookahead = DECL_ABSTRACT_ORIGIN (ret_val);
        }
       while (lookahead != NULL && lookahead != ret_val);

+

       return ret_val;
     }
 }
       return ret_val;
     }
 }


@@ -1836,14 +2021,15 @@ decl_ultimate_origin (decl)
    function, so we have to trace all of the way back through the origin chain
    to find out what sort of node actually served as the original seed for the
    given block.  */
    function, so we have to trace all of the way back through the origin chain
    to find out what sort of node actually served as the original seed for the
    given block.  */

+

 static tree
 block_ultimate_origin (block)
      register tree block;
 {
   register tree immediate_origin = BLOCK_ABSTRACT_ORIGIN (block);
 
 static tree
 block_ultimate_origin (block)
      register tree block;
 {
   register tree immediate_origin = BLOCK_ABSTRACT_ORIGIN (block);
 

-  if (immediate_origin == NULL)
-    return NULL;
+  if (immediate_origin == NULL_TREE)
+    return NULL_TREE;

   else
     {
       register tree ret_val;
   else
     {
       register tree ret_val;


@@ -1857,6 +2043,7 @@ block_ultimate_origin (block)
            : NULL;
        }
       while (lookahead != NULL && lookahead != ret_val);
            : NULL;
        }
       while (lookahead != NULL && lookahead != ret_val);

+

       return ret_val;
     }
 }
       return ret_val;
     }
 }


@@ -1870,6 +2057,7 @@ decl_class_context (decl)
      tree decl;
 {
   tree context = NULL_TREE;
      tree decl;
 {
   tree context = NULL_TREE;

+

   if (TREE_CODE (decl) != FUNCTION_DECL || ! DECL_VINDEX (decl))
     context = DECL_CONTEXT (decl);
   else
   if (TREE_CODE (decl) != FUNCTION_DECL || ! DECL_VINDEX (decl))
     context = DECL_CONTEXT (decl);
   else


@@ -1882,10 +2070,9 @@ decl_class_context (decl)
   return context;
 }
 \f
   return context;
 }
 \f

-/**************** DIE internal representation constturction *******************/
-

 /* Add an attribute/value pair to a DIE */
 /* Add an attribute/value pair to a DIE */

-inline void
+
+static inline void

 add_dwarf_attr (die, attr)
      register dw_die_ref die;
      register dw_attr_ref attr;
 add_dwarf_attr (die, attr)
      register dw_die_ref die;
      register dw_attr_ref attr;


@@ -1906,61 +2093,59 @@ add_dwarf_attr (die, attr)
 }
 
 /* Add a flag value attribute to a DIE.  */
 }
 
 /* Add a flag value attribute to a DIE.  */

-inline void
+
+static inline void

 add_AT_flag (die, attr_kind, flag)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
      register unsigned flag;
 {
   register dw_attr_ref attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));
 add_AT_flag (die, attr_kind, flag)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
      register unsigned flag;
 {
   register dw_attr_ref attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));

-  if (attr != NULL)
-    {
-      attr->dw_attr_next = NULL;
-      attr->dw_attr = attr_kind;
-      attr->dw_attr_val.val_class = dw_val_class_flag;
-      attr->dw_attr_val.v.val_flag = flag;
-      add_dwarf_attr (die, attr);
-    }
+
+  attr->dw_attr_next = NULL;
+  attr->dw_attr = attr_kind;
+  attr->dw_attr_val.val_class = dw_val_class_flag;
+  attr->dw_attr_val.v.val_flag = flag;
+  add_dwarf_attr (die, attr);

 }
 
 /* Add a signed integer attribute value to a DIE.  */
 }
 
 /* Add a signed integer attribute value to a DIE.  */

-inline void
+
+static inline void

 add_AT_int (die, attr_kind, int_val)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
      register long int int_val;
 {
   register dw_attr_ref attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));
 add_AT_int (die, attr_kind, int_val)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
      register long int int_val;
 {
   register dw_attr_ref attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));

-  if (attr != NULL)
-    {
-      attr->dw_attr_next = NULL;
-      attr->dw_attr = attr_kind;
-      attr->dw_attr_val.val_class = dw_val_class_const;
-      attr->dw_attr_val.v.val_int = int_val;
-      add_dwarf_attr (die, attr);
-    }
+
+  attr->dw_attr_next = NULL;
+  attr->dw_attr = attr_kind;
+  attr->dw_attr_val.val_class = dw_val_class_const;
+  attr->dw_attr_val.v.val_int = int_val;
+  add_dwarf_attr (die, attr);

 }
 
 /* Add an unsigned integer attribute value to a DIE.  */
 }
 
 /* Add an unsigned integer attribute value to a DIE.  */

-inline void
+
+static inline void

 add_AT_unsigned (die, attr_kind, unsigned_val)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
      register unsigned long unsigned_val;
 {
   register dw_attr_ref attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));
 add_AT_unsigned (die, attr_kind, unsigned_val)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
      register unsigned long unsigned_val;
 {
   register dw_attr_ref attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));

-  if (attr != NULL)
-    {
-      attr->dw_attr_next = NULL;
-      attr->dw_attr = attr_kind;
-      attr->dw_attr_val.val_class = dw_val_class_unsigned_const;
-      attr->dw_attr_val.v.val_unsigned = unsigned_val;
-      add_dwarf_attr (die, attr);
-    }
+
+  attr->dw_attr_next = NULL;
+  attr->dw_attr = attr_kind;
+  attr->dw_attr_val.val_class = dw_val_class_unsigned_const;
+  attr->dw_attr_val.v.val_unsigned = unsigned_val;
+  add_dwarf_attr (die, attr);

 }
 
 /* Add an unsigned double integer attribute value to a DIE.  */
 }
 
 /* Add an unsigned double integer attribute value to a DIE.  */

-inline void
+
+static inline void

 add_AT_long_long (die, attr_kind, val_hi, val_low)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
 add_AT_long_long (die, attr_kind, val_hi, val_low)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;


@@ -1968,19 +2153,18 @@ add_AT_long_long (die, attr_kind, val_hi, val_low)
      register unsigned long val_low;
 {
   register dw_attr_ref attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));
      register unsigned long val_low;
 {
   register dw_attr_ref attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));

-  if (attr != NULL)
-    {
-      attr->dw_attr_next = NULL;
-      attr->dw_attr = attr_kind;
-      attr->dw_attr_val.val_class = dw_val_class_long_long;
-      attr->dw_attr_val.v.val_long_long.hi = val_hi;
-      attr->dw_attr_val.v.val_long_long.low = val_low;
-      add_dwarf_attr (die, attr);
-    }
+
+  attr->dw_attr_next = NULL;
+  attr->dw_attr = attr_kind;
+  attr->dw_attr_val.val_class = dw_val_class_long_long;
+  attr->dw_attr_val.v.val_long_long.hi = val_hi;
+  attr->dw_attr_val.v.val_long_long.low = val_low;
+  add_dwarf_attr (die, attr);

 }
 
 /* Add a floating point attribute value to a DIE and return it.  */
 }
 
 /* Add a floating point attribute value to a DIE and return it.  */

-inline void
+
+static inline void

 add_AT_float (die, attr_kind, length, array)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
 add_AT_float (die, attr_kind, length, array)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;


@@ -1988,153 +2172,145 @@ add_AT_float (die, attr_kind, length, array)
      register long *array;
 {
   register dw_attr_ref attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));
      register long *array;
 {
   register dw_attr_ref attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));

-  if (attr != NULL)
-    {
-      attr->dw_attr_next = NULL;
-      attr->dw_attr = attr_kind;
-      attr->dw_attr_val.val_class = dw_val_class_float;
-      attr->dw_attr_val.v.val_float.length = length;
-      attr->dw_attr_val.v.val_float.array = array;
-      add_dwarf_attr (die, attr);
-    }
+
+  attr->dw_attr_next = NULL;
+  attr->dw_attr = attr_kind;
+  attr->dw_attr_val.val_class = dw_val_class_float;
+  attr->dw_attr_val.v.val_float.length = length;
+  attr->dw_attr_val.v.val_float.array = array;
+  add_dwarf_attr (die, attr);

 }
 
 /* Add a string attribute value to a DIE.  */
 }
 
 /* Add a string attribute value to a DIE.  */

-inline void
+
+static inline void

 add_AT_string (die, attr_kind, str)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
      register char *str;
 {
   register dw_attr_ref attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));
 add_AT_string (die, attr_kind, str)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
      register char *str;
 {
   register dw_attr_ref attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));

-  if (attr != NULL)
-    {
-      attr->dw_attr_next = NULL;
-      attr->dw_attr = attr_kind;
-      attr->dw_attr_val.val_class = dw_val_class_str;
-      attr->dw_attr_val.v.val_str = xstrdup (str);
-      add_dwarf_attr (die, attr);
-    }
+
+  attr->dw_attr_next = NULL;
+  attr->dw_attr = attr_kind;
+  attr->dw_attr_val.val_class = dw_val_class_str;
+  attr->dw_attr_val.v.val_str = xstrdup (str);
+  add_dwarf_attr (die, attr);

 }
 
 /* Add a DIE reference attribute value to a DIE.  */
 }
 
 /* Add a DIE reference attribute value to a DIE.  */

-inline void
+
+static inline void

 add_AT_die_ref (die, attr_kind, targ_die)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
      register dw_die_ref targ_die;
 {
   register dw_attr_ref attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));
 add_AT_die_ref (die, attr_kind, targ_die)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
      register dw_die_ref targ_die;
 {
   register dw_attr_ref attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));

-  if (attr != NULL)
-    {
-      attr->dw_attr_next = NULL;
-      attr->dw_attr = attr_kind;
-      attr->dw_attr_val.val_class = dw_val_class_die_ref;
-      attr->dw_attr_val.v.val_die_ref = targ_die;
-      add_dwarf_attr (die, attr);
-    }
+
+  attr->dw_attr_next = NULL;
+  attr->dw_attr = attr_kind;
+  attr->dw_attr_val.val_class = dw_val_class_die_ref;
+  attr->dw_attr_val.v.val_die_ref = targ_die;
+  add_dwarf_attr (die, attr);

 }
 
 /* Add an FDE reference attribute value to a DIE.  */
 }
 
 /* Add an FDE reference attribute value to a DIE.  */

-inline void
+
+static inline void

 add_AT_fde_ref (die, attr_kind, targ_fde)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
      register unsigned targ_fde;
 {
 add_AT_fde_ref (die, attr_kind, targ_fde)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
      register unsigned targ_fde;
 {

-  register dw_attr_ref attr;
+  register dw_attr_ref attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));

 
 

-  attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));
-  if (attr != NULL)
-    {
-      attr->dw_attr_next = NULL;
-      attr->dw_attr = attr_kind;
-      attr->dw_attr_val.val_class = dw_val_class_fde_ref;
-      attr->dw_attr_val.v.val_fde_index = targ_fde;
-      add_dwarf_attr (die, attr);
-    }
+  attr->dw_attr_next = NULL;
+  attr->dw_attr = attr_kind;
+  attr->dw_attr_val.val_class = dw_val_class_fde_ref;
+  attr->dw_attr_val.v.val_fde_index = targ_fde;
+  add_dwarf_attr (die, attr);

 }
 
 /* Add a location description attribute value to a DIE.  */
 }
 
 /* Add a location description attribute value to a DIE.  */

-inline void
+
+static inline void

 add_AT_loc (die, attr_kind, loc)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
      register dw_loc_descr_ref loc;
 {
   register dw_attr_ref attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));
 add_AT_loc (die, attr_kind, loc)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
      register dw_loc_descr_ref loc;
 {
   register dw_attr_ref attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));

-  if (attr != NULL)
-    {
-      attr->dw_attr_next = NULL;
-      attr->dw_attr = attr_kind;
-      attr->dw_attr_val.val_class = dw_val_class_loc;
-      attr->dw_attr_val.v.val_loc = loc;
-      add_dwarf_attr (die, attr);
-    }
+
+  attr->dw_attr_next = NULL;
+  attr->dw_attr = attr_kind;
+  attr->dw_attr_val.val_class = dw_val_class_loc;
+  attr->dw_attr_val.v.val_loc = loc;
+  add_dwarf_attr (die, attr);

 }
 
 /* Add an address constant attribute value to a DIE.  */
 }
 
 /* Add an address constant attribute value to a DIE.  */

-inline void
+
+static inline void

 add_AT_addr (die, attr_kind, addr)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
      char *addr;
 {
   register dw_attr_ref attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));
 add_AT_addr (die, attr_kind, addr)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
      char *addr;
 {
   register dw_attr_ref attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));

-  if (attr != NULL)
-    {
-      attr->dw_attr_next = NULL;
-      attr->dw_attr = attr_kind;
-      attr->dw_attr_val.val_class = dw_val_class_addr;
-      attr->dw_attr_val.v.val_addr = addr;
-      add_dwarf_attr (die, attr);
-    }
+
+  attr->dw_attr_next = NULL;
+  attr->dw_attr = attr_kind;
+  attr->dw_attr_val.val_class = dw_val_class_addr;
+  attr->dw_attr_val.v.val_addr = addr;
+  add_dwarf_attr (die, attr);

 }
 
 /* Add a label identifier attribute value to a DIE.  */
 }
 
 /* Add a label identifier attribute value to a DIE.  */

-inline void
+
+static inline void

 add_AT_lbl_id (die, attr_kind, lbl_id)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
      register char *lbl_id;
 {
   register dw_attr_ref attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));
 add_AT_lbl_id (die, attr_kind, lbl_id)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
      register char *lbl_id;
 {
   register dw_attr_ref attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));

-  if (attr != NULL)
-    {
-      attr->dw_attr_next = NULL;
-      attr->dw_attr = attr_kind;
-      attr->dw_attr_val.val_class = dw_val_class_lbl_id;
-      attr->dw_attr_val.v.val_lbl_id = xstrdup (lbl_id);
-      add_dwarf_attr (die, attr);
-    }
+
+  attr->dw_attr_next = NULL;
+  attr->dw_attr = attr_kind;
+  attr->dw_attr_val.val_class = dw_val_class_lbl_id;
+  attr->dw_attr_val.v.val_lbl_id = xstrdup (lbl_id);
+  add_dwarf_attr (die, attr);

 }
 
 /* Add a section offset attribute value to a DIE.  */
 }
 
 /* Add a section offset attribute value to a DIE.  */

-inline void
+
+static inline void

 add_AT_section_offset (die, attr_kind, section)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
      register char *section;
 {
   register dw_attr_ref attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));
 add_AT_section_offset (die, attr_kind, section)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
      register char *section;
 {
   register dw_attr_ref attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));

-  if (attr != NULL)
-    {
-      attr->dw_attr_next = NULL;
-      attr->dw_attr = attr_kind;
-      attr->dw_attr_val.val_class = dw_val_class_section_offset;
-      attr->dw_attr_val.v.val_section = section;
-      add_dwarf_attr (die, attr);
-    }
+
+  attr->dw_attr_next = NULL;
+  attr->dw_attr = attr_kind;
+  attr->dw_attr_val.val_class = dw_val_class_section_offset;
+  attr->dw_attr_val.v.val_section = section;
+  add_dwarf_attr (die, attr);
+  

 }
 
 /* Test if die refers to an external subroutine.  */
 }
 
 /* Test if die refers to an external subroutine.  */

-inline int
+
+static inline int

 is_extern_subr_die (die)
      register dw_die_ref die;
 {
   register dw_attr_ref a;
   register int is_subr = FALSE;
   register int is_extern = FALSE;
 is_extern_subr_die (die)
      register dw_die_ref die;
 {
   register dw_attr_ref a;
   register int is_subr = FALSE;
   register int is_extern = FALSE;

+

   if (die != NULL && die->die_tag == DW_TAG_subprogram)
     {
       is_subr = TRUE;
   if (die != NULL && die->die_tag == DW_TAG_subprogram)
     {
       is_subr = TRUE;


@@ -2149,11 +2325,13 @@ is_extern_subr_die (die)
            }
        }
     }
            }
        }
     }

+

   return is_subr && is_extern;
 }
 
 /* Get the attribute of type attr_kind.  */
   return is_subr && is_extern;
 }
 
 /* Get the attribute of type attr_kind.  */

-inline dw_attr_ref
+
+static inline dw_attr_ref

 get_AT (die, attr_kind)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
 get_AT (die, attr_kind)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;


@@ -2167,13 +2345,16 @@ get_AT (die, attr_kind)
        {
          if (a->dw_attr == attr_kind)
            return a;
        {
          if (a->dw_attr == attr_kind)
            return a;

+

          if (a->dw_attr == DW_AT_specification
              || a->dw_attr == DW_AT_abstract_origin)
            spec = a->dw_attr_val.v.val_die_ref;
        }
          if (a->dw_attr == DW_AT_specification
              || a->dw_attr == DW_AT_abstract_origin)
            spec = a->dw_attr_val.v.val_die_ref;
        }

+

       if (spec)
        return get_AT (spec, attr_kind);
     }
       if (spec)
        return get_AT (spec, attr_kind);
     }

+

   return NULL;
 }
 
   return NULL;
 }
 


@@ -2181,13 +2362,16 @@ get_AT (die, attr_kind)
    a subprogram DIE.  Return null if the "low pc" attribute is
    either not prsent, or if it cannot be represented as an
    assembler label identifier.  */
    a subprogram DIE.  Return null if the "low pc" attribute is
    either not prsent, or if it cannot be represented as an
    assembler label identifier.  */

-inline char *
+
+static inline char *

 get_AT_low_pc (die)
      register dw_die_ref die;
 {
   register dw_attr_ref a = get_AT (die, DW_AT_low_pc);
 get_AT_low_pc (die)
      register dw_die_ref die;
 {
   register dw_attr_ref a = get_AT (die, DW_AT_low_pc);

+

   if (a && a->dw_attr_val.val_class == dw_val_class_lbl_id)
     return a->dw_attr_val.v.val_lbl_id;
   if (a && a->dw_attr_val.val_class == dw_val_class_lbl_id)
     return a->dw_attr_val.v.val_lbl_id;

+

   return NULL;
 }
 
   return NULL;
 }
 


@@ -2195,78 +2379,94 @@ get_AT_low_pc (die)
    a subprogram DIE.  Return null if the "high pc" attribute is
    either not prsent, or if it cannot be represented as an
    assembler label identifier.  */
    a subprogram DIE.  Return null if the "high pc" attribute is
    either not prsent, or if it cannot be represented as an
    assembler label identifier.  */

-inline char *
+
+static inline char *

 get_AT_hi_pc (die)
      register dw_die_ref die;
 {
   register dw_attr_ref a = get_AT (die, DW_AT_high_pc);
 get_AT_hi_pc (die)
      register dw_die_ref die;
 {
   register dw_attr_ref a = get_AT (die, DW_AT_high_pc);

+

   if (a && a->dw_attr_val.val_class == dw_val_class_lbl_id)
     return a->dw_attr_val.v.val_lbl_id;
   if (a && a->dw_attr_val.val_class == dw_val_class_lbl_id)
     return a->dw_attr_val.v.val_lbl_id;

+

   return NULL;
 }
 
 /* Return the value of the string attribute designated by ATTR_KIND, or
    NULL if it is not present.  */
   return NULL;
 }
 
 /* Return the value of the string attribute designated by ATTR_KIND, or
    NULL if it is not present.  */

-inline char *
+
+static inline char *

 get_AT_string (die, attr_kind)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
 {
   register dw_attr_ref a = get_AT (die, attr_kind);
 get_AT_string (die, attr_kind)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
 {
   register dw_attr_ref a = get_AT (die, attr_kind);

+

   if (a && a->dw_attr_val.val_class == dw_val_class_str)
     return a->dw_attr_val.v.val_str;
   if (a && a->dw_attr_val.val_class == dw_val_class_str)
     return a->dw_attr_val.v.val_str;

+

   return NULL;
 }
 
 /* Return the value of the flag attribute designated by ATTR_KIND, or -1
    if it is not present.  */
   return NULL;
 }
 
 /* Return the value of the flag attribute designated by ATTR_KIND, or -1
    if it is not present.  */

-inline int
+
+static inline int

 get_AT_flag (die, attr_kind)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
 {
   register dw_attr_ref a = get_AT (die, attr_kind);
 get_AT_flag (die, attr_kind)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
 {
   register dw_attr_ref a = get_AT (die, attr_kind);

+

   if (a && a->dw_attr_val.val_class == dw_val_class_flag)
     return a->dw_attr_val.v.val_flag;
   if (a && a->dw_attr_val.val_class == dw_val_class_flag)
     return a->dw_attr_val.v.val_flag;

+

   return -1;
 }
 
 /* Return the value of the unsigned attribute designated by ATTR_KIND, or 0
    if it is not present.  */
   return -1;
 }
 
 /* Return the value of the unsigned attribute designated by ATTR_KIND, or 0
    if it is not present.  */

-inline unsigned
+
+static inline unsigned

 get_AT_unsigned (die, attr_kind)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
 {
   register dw_attr_ref a = get_AT (die, attr_kind);
 get_AT_unsigned (die, attr_kind)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
 {
   register dw_attr_ref a = get_AT (die, attr_kind);

+

   if (a && a->dw_attr_val.val_class == dw_val_class_unsigned_const)
     return a->dw_attr_val.v.val_unsigned;
   if (a && a->dw_attr_val.val_class == dw_val_class_unsigned_const)
     return a->dw_attr_val.v.val_unsigned;

+

   return 0;
 }
 
   return 0;
 }
 

-inline int
+static inline int

 is_c_family ()
 {
   register unsigned lang = get_AT_unsigned (comp_unit_die, DW_AT_language);
 is_c_family ()
 {
   register unsigned lang = get_AT_unsigned (comp_unit_die, DW_AT_language);

+

   return (lang == DW_LANG_C || lang == DW_LANG_C89
          || lang == DW_LANG_C_plus_plus);
 } 
 
   return (lang == DW_LANG_C || lang == DW_LANG_C89
          || lang == DW_LANG_C_plus_plus);
 } 
 

-inline int
+static inline int

 is_fortran ()
 {
   register unsigned lang = get_AT_unsigned (comp_unit_die, DW_AT_language);
 is_fortran ()
 {
   register unsigned lang = get_AT_unsigned (comp_unit_die, DW_AT_language);

+

   return (lang == DW_LANG_Fortran77 || lang == DW_LANG_Fortran90);
 } 
 
 /* Remove the specified attribute if present.  */
   return (lang == DW_LANG_Fortran77 || lang == DW_LANG_Fortran90);
 } 
 
 /* Remove the specified attribute if present.  */

-inline void
+
+static inline void

 remove_AT (die, attr_kind)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
 {
   register dw_attr_ref a;
   register dw_attr_ref removed = NULL;;
 remove_AT (die, attr_kind)
      register dw_die_ref die;
      register enum dwarf_attribute attr_kind;
 {
   register dw_attr_ref a;
   register dw_attr_ref removed = NULL;;

+

   if (die != NULL)
     {
       if (die->die_attr->dw_attr == attr_kind)
   if (die != NULL)
     {
       if (die->die_attr->dw_attr == attr_kind)


@@ -2274,49 +2474,61 @@ remove_AT (die, attr_kind)
          removed = die->die_attr;
          if (die->die_attr_last == die->die_attr)
            die->die_attr_last = NULL;
          removed = die->die_attr;
          if (die->die_attr_last == die->die_attr)
            die->die_attr_last = NULL;

+

          die->die_attr = die->die_attr->dw_attr_next;
        }
          die->die_attr = die->die_attr->dw_attr_next;
        }

-      else for (a = die->die_attr; a->dw_attr_next != NULL;
-               a = a->dw_attr_next)
-       if (a->dw_attr_next->dw_attr == attr_kind)
-         {
-           removed = a->dw_attr_next;
-           if (die->die_attr_last == a->dw_attr_next)
-             die->die_attr_last = a;
-           a->dw_attr_next = a->dw_attr_next->dw_attr_next;
-           break;
-         }
-      if (removed)
+
+      else
+       for (a = die->die_attr; a->dw_attr_next != NULL;
+            a = a->dw_attr_next)
+         if (a->dw_attr_next->dw_attr == attr_kind)
+           {
+             removed = a->dw_attr_next;
+             if (die->die_attr_last == a->dw_attr_next)
+               die->die_attr_last = a;
+
+             a->dw_attr_next = a->dw_attr_next->dw_attr_next;
+             break;
+           }
+
+      if (removed != 0)

        free (removed);
     }
 }
 
 /* Discard the children of this DIE.  */
        free (removed);
     }
 }
 
 /* Discard the children of this DIE.  */

-inline void
+
+static inline void

 remove_children (die)
      register dw_die_ref die;
 {
   register dw_die_ref child_die = die->die_child;
 remove_children (die)
      register dw_die_ref die;
 {
   register dw_die_ref child_die = die->die_child;

+

   die->die_child = NULL;
   die->die_child_last = NULL;
   die->die_child = NULL;
   die->die_child_last = NULL;

+

   while (child_die != NULL)
     {
       register dw_die_ref tmp_die = child_die;
       register dw_attr_ref a;
   while (child_die != NULL)
     {
       register dw_die_ref tmp_die = child_die;
       register dw_attr_ref a;

+

       child_die = child_die->die_sib;
       
       for (a = tmp_die->die_attr; a != NULL; )
        {
          register dw_attr_ref tmp_a = a;
       child_die = child_die->die_sib;
       
       for (a = tmp_die->die_attr; a != NULL; )
        {
          register dw_attr_ref tmp_a = a;

+

          a = a->dw_attr_next;
          free (tmp_a);
        }
          a = a->dw_attr_next;
          free (tmp_a);
        }

+

       free (tmp_die);
     }
 }
 
 /* Add a child DIE below its parent.  */
       free (tmp_die);
     }
 }
 
 /* Add a child DIE below its parent.  */

-inline void
+
+static inline void

 add_child_die (die, child_die)
      register dw_die_ref die;
      register dw_die_ref child_die;
 add_child_die (die, child_die)
      register dw_die_ref die;
      register dw_die_ref child_die;


@@ -2326,6 +2538,7 @@ add_child_die (die, child_die)
       assert (die != child_die);
       child_die->die_parent = die;
       child_die->die_sib = NULL;
       assert (die != child_die);
       child_die->die_parent = die;
       child_die->die_sib = NULL;

+

       if (die->die_child == NULL)
        {
          die->die_child = child_die;
       if (die->die_child == NULL)
        {
          die->die_child = child_die;


@@ -2340,33 +2553,35 @@ add_child_die (die, child_die)
 }
 
 /* Return a pointer to a newly created DIE node.  */
 }
 
 /* Return a pointer to a newly created DIE node.  */

-inline dw_die_ref
+
+static inline dw_die_ref

 new_die (tag_value, parent_die)
      register enum dwarf_tag tag_value;
      register dw_die_ref parent_die;
 {
   register dw_die_ref die = (dw_die_ref) xmalloc (sizeof (die_node));
 new_die (tag_value, parent_die)
      register enum dwarf_tag tag_value;
      register dw_die_ref parent_die;
 {
   register dw_die_ref die = (dw_die_ref) xmalloc (sizeof (die_node));

-  if (die != NULL)
-    {
-      die->die_tag = tag_value;
-      die->die_abbrev = 0;
-      die->die_offset = 0;
-      die->die_child = NULL;
-      die->die_parent = NULL;
-      die->die_sib = NULL;
-      die->die_child_last = NULL;
-      die->die_attr = NULL;
-      die->die_attr_last = NULL;
-      if (parent_die != NULL)
-       add_child_die (parent_die, die);
-      else
-       ++limbo_die_count;
-    }
+
+  die->die_tag = tag_value;
+  die->die_abbrev = 0;
+  die->die_offset = 0;
+  die->die_child = NULL;
+  die->die_parent = NULL;
+  die->die_sib = NULL;
+  die->die_child_last = NULL;
+  die->die_attr = NULL;
+  die->die_attr_last = NULL;
+
+  if (parent_die != NULL)
+    add_child_die (parent_die, die);
+  else
+    ++limbo_die_count;
+

   return die;
 }
 
 /* Return the DIE associated with the given type specifier.  */
   return die;
 }
 
 /* Return the DIE associated with the given type specifier.  */

-inline dw_die_ref
+
+static inline dw_die_ref

 lookup_type_die (type)
      register tree type;
 {
 lookup_type_die (type)
      register tree type;
 {


@@ -2374,6 +2589,7 @@ lookup_type_die (type)
 }
 
 /* Equate a DIE to a given type specifier.  */
 }
 
 /* Equate a DIE to a given type specifier.  */

+

 static void
 equate_type_number_to_die (type, type_die)
      register tree type;
 static void
 equate_type_number_to_die (type, type_die)
      register tree type;


@@ -2383,16 +2599,19 @@ equate_type_number_to_die (type, type_die)
 }
 
 /* Return the DIE associated with a given declaration.  */
 }
 
 /* Return the DIE associated with a given declaration.  */

-inline dw_die_ref
+
+static inline dw_die_ref

 lookup_decl_die (decl)
      register tree decl;
 {
   register unsigned decl_id = DECL_UID (decl);
 lookup_decl_die (decl)
      register tree decl;
 {
   register unsigned decl_id = DECL_UID (decl);

-  return (decl_id < decl_die_table_in_use)
-    ? decl_die_table[decl_id] : NULL;
+
+  return (decl_id < decl_die_table_in_use
+         ? decl_die_table[decl_id] : NULL);

 }
 
 /* Equate a DIE to a particular declaration.  */
 }
 
 /* Equate a DIE to a particular declaration.  */

+

 static void
 equate_decl_number_to_die (decl, decl_die)
      register tree decl;
 static void
 equate_decl_number_to_die (decl, decl_die)
      register tree decl;


@@ -2401,6 +2620,7 @@ equate_decl_number_to_die (decl, decl_die)
   register unsigned decl_id = DECL_UID (decl);
   register unsigned i;
   register unsigned num_allocated;
   register unsigned decl_id = DECL_UID (decl);
   register unsigned i;
   register unsigned num_allocated;

+

   if (decl_id >= decl_die_table_allocated)
     {
       num_allocated
   if (decl_id >= decl_die_table_allocated)
     {
       num_allocated


@@ -2426,79 +2646,80 @@ equate_decl_number_to_die (decl, decl_die)
 /* Return a pointer to a newly allocated location description.  Location
    descriptions are simple expression terms that can be strung
    together to form more complicated location (address) descriptions.  */
 /* Return a pointer to a newly allocated location description.  Location
    descriptions are simple expression terms that can be strung
    together to form more complicated location (address) descriptions.  */

-inline dw_loc_descr_ref
+
+static inline dw_loc_descr_ref

 new_loc_descr (op, oprnd1, oprnd2)
      register enum dwarf_location_atom op;
      register unsigned long oprnd1;
      register unsigned long oprnd2;
 {
 new_loc_descr (op, oprnd1, oprnd2)
      register enum dwarf_location_atom op;
      register unsigned long oprnd1;
      register unsigned long oprnd2;
 {

-  register dw_loc_descr_ref descr =
-  (dw_loc_descr_ref) xmalloc (sizeof (dw_loc_descr_node));
-  if (descr != NULL)
-    {
-      descr->dw_loc_next = NULL;
-      descr->dw_loc_opc = op;
-      descr->dw_loc_oprnd1.val_class = dw_val_class_unsigned_const;
-      descr->dw_loc_oprnd1.v.val_unsigned = oprnd1;
-      descr->dw_loc_oprnd2.val_class = dw_val_class_unsigned_const;
-      descr->dw_loc_oprnd2.v.val_unsigned = oprnd2;
-    }
+  register dw_loc_descr_ref descr
+    = (dw_loc_descr_ref) xmalloc (sizeof (dw_loc_descr_node));
+
+  descr->dw_loc_next = NULL;
+  descr->dw_loc_opc = op;
+  descr->dw_loc_oprnd1.val_class = dw_val_class_unsigned_const;
+  descr->dw_loc_oprnd1.v.val_unsigned = oprnd1;
+  descr->dw_loc_oprnd2.val_class = dw_val_class_unsigned_const;
+  descr->dw_loc_oprnd2.v.val_unsigned = oprnd2;
+

   return descr;
 }
 
 /* Add a location description term to a location description expression.  */
   return descr;
 }
 
 /* Add a location description term to a location description expression.  */

-inline void
+
+static inline void

 add_loc_descr (list_head, descr)
      register dw_loc_descr_ref *list_head;
      register dw_loc_descr_ref descr;
 {
   register dw_loc_descr_ref *d;
 add_loc_descr (list_head, descr)
      register dw_loc_descr_ref *list_head;
      register dw_loc_descr_ref descr;
 {
   register dw_loc_descr_ref *d;

-  /* find the end of the chain.  */
+
+  /* Find the end of the chain.  */

   for (d = list_head; (*d) != NULL; d = &(*d)->dw_loc_next)
   for (d = list_head; (*d) != NULL; d = &(*d)->dw_loc_next)

-    {
-      /* nothing */ ;
-    }
+    ;
+

   *d = descr;
 }
 
 /* Return a pointer to a newly allocated Call Frame Instruction.  */
   *d = descr;
 }
 
 /* Return a pointer to a newly allocated Call Frame Instruction.  */

-inline dw_cfi_ref
+
+static inline dw_cfi_ref

 new_cfi ()
 {
   register dw_cfi_ref cfi = (dw_cfi_ref) xmalloc (sizeof (dw_cfi_node));
 new_cfi ()
 {
   register dw_cfi_ref cfi = (dw_cfi_ref) xmalloc (sizeof (dw_cfi_node));

-  if (cfi != NULL)
-    {
-      cfi->dw_cfi_next = NULL;
-      cfi->dw_cfi_oprnd1.dw_cfi_reg_num = 0;
-      cfi->dw_cfi_oprnd2.dw_cfi_reg_num = 0;
-    }
+
+  cfi->dw_cfi_next = NULL;
+  cfi->dw_cfi_oprnd1.dw_cfi_reg_num = 0;
+  cfi->dw_cfi_oprnd2.dw_cfi_reg_num = 0;
+

   return cfi;
 }
 
 /* Add a Call Frame Instruction to list of instructions.  */
   return cfi;
 }
 
 /* Add a Call Frame Instruction to list of instructions.  */

-inline void
+
+static inline void

 add_cfi (list_head, cfi)
      register dw_cfi_ref *list_head;
      register dw_cfi_ref cfi;
 {
   register dw_cfi_ref *p;
 add_cfi (list_head, cfi)
      register dw_cfi_ref *list_head;
      register dw_cfi_ref cfi;
 {
   register dw_cfi_ref *p;

-  /* find the end of the chain.  */
+
+  /* Find the end of the chain.  */

   for (p = list_head; (*p) != NULL; p = &(*p)->dw_cfi_next)
   for (p = list_head; (*p) != NULL; p = &(*p)->dw_cfi_next)

-    {
-      /* nothing */ ;
-    }
+    ;
+

   *p = cfi;
 }
 \f
   *p = cfi;
 }
 \f

-/********* Print DWARF Internal Representation (debugging aids) ***************/
-

 /* Keep track of the number of spaces used to indent the
    output of the debugging routines that print the structure of
    the DIE internal representation.  */
 static int print_indent;
 
 /* Indent the line the number of spaces given by print_indent.  */
 /* Keep track of the number of spaces used to indent the
    output of the debugging routines that print the structure of
    the DIE internal representation.  */
 static int print_indent;
 
 /* Indent the line the number of spaces given by print_indent.  */

-inline void
+
+static inline void

 print_spaces (outfile)
      FILE *outfile;
 {
 print_spaces (outfile)
      FILE *outfile;
 {


@@ -2507,6 +2728,7 @@ print_spaces (outfile)
 
 /* Print the information assoaciated with a given DIE, and its children.
    This routine is a debugging aid only.  */
 
 /* Print the information assoaciated with a given DIE, and its children.
    This routine is a debugging aid only.  */

+

 static void
 print_die (die, outfile)
      dw_die_ref die;
 static void
 print_die (die, outfile)
      dw_die_ref die;


@@ -2514,16 +2736,19 @@ print_die (die, outfile)
 {
   register dw_attr_ref a;
   register dw_die_ref c;
 {
   register dw_attr_ref a;
   register dw_die_ref c;

+

   print_spaces (outfile);
   fprintf (outfile, "DIE %4u: %s\n",
           die->die_offset, dwarf_tag_name (die->die_tag));
   print_spaces (outfile);
   fprintf (outfile, "  abbrev id: %u", die->die_abbrev);
   fprintf (outfile, " offset: %u\n", die->die_offset);
   print_spaces (outfile);
   fprintf (outfile, "DIE %4u: %s\n",
           die->die_offset, dwarf_tag_name (die->die_tag));
   print_spaces (outfile);
   fprintf (outfile, "  abbrev id: %u", die->die_abbrev);
   fprintf (outfile, " offset: %u\n", die->die_offset);

+

   for (a = die->die_attr; a != NULL; a = a->dw_attr_next)
     {
       print_spaces (outfile);
       fprintf (outfile, "  %s: ", dwarf_attr_name (a->dw_attr));
   for (a = die->die_attr; a != NULL; a = a->dw_attr_next)
     {
       print_spaces (outfile);
       fprintf (outfile, "  %s: ", dwarf_attr_name (a->dw_attr));

+

       switch (a->dw_attr_val.val_class)
        {
        case dw_val_class_addr:
       switch (a->dw_attr_val.val_class)
        {
        case dw_val_class_addr:


@@ -2551,14 +2776,10 @@ print_die (die, outfile)
          break;
        case dw_val_class_die_ref:
          if (a->dw_attr_val.v.val_die_ref != NULL)
          break;
        case dw_val_class_die_ref:
          if (a->dw_attr_val.v.val_die_ref != NULL)

-           {
-             fprintf (outfile, "die -> %u",
-                      a->dw_attr_val.v.val_die_ref->die_offset);
-           }
+           fprintf (outfile, "die -> %u",
+                    a->dw_attr_val.v.val_die_ref->die_offset);

          else
          else

-           {
-             fprintf (outfile, "die -> <null>");
-           }
+           fprintf (outfile, "die -> <null>");

          break;
        case dw_val_class_lbl_id:
          fprintf (outfile, "label: %s", a->dw_attr_val.v.val_lbl_id);
          break;
        case dw_val_class_lbl_id:
          fprintf (outfile, "label: %s", a->dw_attr_val.v.val_lbl_id);


@@ -2568,36 +2789,35 @@ print_die (die, outfile)
          break;
        case dw_val_class_str:
          if (a->dw_attr_val.v.val_str != NULL)
          break;
        case dw_val_class_str:
          if (a->dw_attr_val.v.val_str != NULL)

-           {
-             fprintf (outfile, "\"%s\"", a->dw_attr_val.v.val_str);
-           }
+           fprintf (outfile, "\"%s\"", a->dw_attr_val.v.val_str);

          else
          else

-           {
-             fprintf (outfile, "<null>");
-           }
+           fprintf (outfile, "<null>");

          break;
        }
          break;
        }

+

       fprintf (outfile, "\n");
     }
       fprintf (outfile, "\n");
     }

+

   if (die->die_child != NULL)
     {
       print_indent += 4;
       for (c = die->die_child; c != NULL; c = c->die_sib)
   if (die->die_child != NULL)
     {
       print_indent += 4;
       for (c = die->die_child; c != NULL; c = c->die_sib)

-       {
-         print_die (c, outfile);
-       }
+       print_die (c, outfile);
+

       print_indent -= 4;
     }
 }
 
 /* Print the contents of the source code line number correspondence table.
    This routine is a debugging aid only.  */
       print_indent -= 4;
     }
 }
 
 /* Print the contents of the source code line number correspondence table.
    This routine is a debugging aid only.  */

+

 static void
 print_dwarf_line_table (outfile)
      FILE *outfile;
 {
   register unsigned i;
   register dw_line_info_ref line_info;
 static void
 print_dwarf_line_table (outfile)
      FILE *outfile;
 {
   register unsigned i;
   register dw_line_info_ref line_info;

+

   fprintf (outfile, "\n\nDWARF source line information\n");
   for (i = 1; i < line_info_table_in_use; ++i)
     {
   fprintf (outfile, "\n\nDWARF source line information\n");
   for (i = 1; i < line_info_table_in_use; ++i)
     {


@@ -2607,10 +2827,12 @@ print_dwarf_line_table (outfile)
       fprintf (outfile, "%6d", line_info->dw_line_num);
       fprintf (outfile, "\n");
     }
       fprintf (outfile, "%6d", line_info->dw_line_num);
       fprintf (outfile, "\n");
     }

+

   fprintf (outfile, "\n\n");
 }
 
 /* Print the information collected for a given DIE.  */
   fprintf (outfile, "\n\n");
 }
 
 /* Print the information collected for a given DIE.  */

+

 void
 debug_dwarf_die (die)
      dw_die_ref die;
 void
 debug_dwarf_die (die)
      dw_die_ref die;


@@ -2618,8 +2840,9 @@ debug_dwarf_die (die)
   print_die (die, stderr);
 }
 
   print_die (die, stderr);
 }
 

-/* Print all DWARF informaiton collected for the compilation unit.
+/* Print all DWARF information collected for the compilation unit.

    This routine is a debugging aid only.  */
    This routine is a debugging aid only.  */

+

 void
 debug_dwarf ()
 {
 void
 debug_dwarf ()
 {


@@ -2627,13 +2850,11 @@ debug_dwarf ()
   print_die (comp_unit_die, stderr);
   print_dwarf_line_table (stderr);
 }
   print_die (comp_unit_die, stderr);
   print_dwarf_line_table (stderr);
 }

-

 \f
 \f

-/***************** DWARF Information Construction Support *********************/
-

 /* Traverse the DIE, and add a sibling attribute if it may have the
    effect of speeding up access to siblings.  To save some space,
    avoid generating sibling attributes for DIE's without children.  */
 /* Traverse the DIE, and add a sibling attribute if it may have the
    effect of speeding up access to siblings.  To save some space,
    avoid generating sibling attributes for DIE's without children.  */

+

 static void
 add_sibling_attributes(die)
      register dw_die_ref die;
 static void
 add_sibling_attributes(die)
      register dw_die_ref die;


@@ -2643,25 +2864,21 @@ add_sibling_attributes(die)
   if (die != comp_unit_die && die->die_child != NULL)
     {
       attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));
   if (die != comp_unit_die && die->die_child != NULL)
     {
       attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));

-      if (attr != NULL)
-       {
-         attr->dw_attr_next = NULL;
-         attr->dw_attr = DW_AT_sibling;
-         attr->dw_attr_val.val_class = dw_val_class_die_ref;
-         attr->dw_attr_val.v.val_die_ref = die->die_sib;
-       }
-      /* add the sibling link to the front of the attribute list.  */
+      attr->dw_attr_next = NULL;
+      attr->dw_attr = DW_AT_sibling;
+      attr->dw_attr_val.val_class = dw_val_class_die_ref;
+      attr->dw_attr_val.v.val_die_ref = die->die_sib;
+
+      /* Add the sibling link to the front of the attribute list.  */

       attr->dw_attr_next = die->die_attr;
       if (die->die_attr == NULL)
       attr->dw_attr_next = die->die_attr;
       if (die->die_attr == NULL)

-       {
-         die->die_attr_last = attr;
-       }
+       die->die_attr_last = attr;
+

       die->die_attr = attr;
     }
       die->die_attr = attr;
     }

+

   for (c = die->die_child; c != NULL; c = c->die_sib)
   for (c = die->die_child; c != NULL; c = c->die_sib)

-    {
-      add_sibling_attributes (c);
-    }
+    add_sibling_attributes (c);

 }
 
 /* The format of each DIE (and its attribute value pairs)
 }
 
 /* The format of each DIE (and its attribute value pairs)


@@ -2669,6 +2886,7 @@ add_sibling_attributes(die)
    abbreviation table and assigns a unique abbreviation id for
    each abbreviation entry.  The children of each die are visited
    recursively.  */
    abbreviation table and assigns a unique abbreviation id for
    each abbreviation entry.  The children of each die are visited
    recursively.  */

+

 static void
 build_abbrev_table (die)
      register dw_die_ref die;
 static void
 build_abbrev_table (die)
      register dw_die_ref die;


@@ -2680,30 +2898,31 @@ build_abbrev_table (die)
   for (abbrev_id = 1; abbrev_id < abbrev_die_table_in_use; ++abbrev_id)
     {
       register dw_die_ref abbrev = abbrev_die_table[abbrev_id];
   for (abbrev_id = 1; abbrev_id < abbrev_die_table_in_use; ++abbrev_id)
     {
       register dw_die_ref abbrev = abbrev_die_table[abbrev_id];

+

       if (abbrev->die_tag == die->die_tag)
        {
          if ((abbrev->die_child != NULL) == (die->die_child != NULL))
            {
              a_attr = abbrev->die_attr;
              d_attr = die->die_attr;
       if (abbrev->die_tag == die->die_tag)
        {
          if ((abbrev->die_child != NULL) == (die->die_child != NULL))
            {
              a_attr = abbrev->die_attr;
              d_attr = die->die_attr;

+

              while (a_attr != NULL && d_attr != NULL)
                {
                  if ((a_attr->dw_attr != d_attr->dw_attr)
                      || (value_format (&a_attr->dw_attr_val)
                          != value_format (&d_attr->dw_attr_val)))
              while (a_attr != NULL && d_attr != NULL)
                {
                  if ((a_attr->dw_attr != d_attr->dw_attr)
                      || (value_format (&a_attr->dw_attr_val)
                          != value_format (&d_attr->dw_attr_val)))

-                   {
-                     break;
-                   }
+                   break;
+

                  a_attr = a_attr->dw_attr_next;
                  d_attr = d_attr->dw_attr_next;
                }
                  a_attr = a_attr->dw_attr_next;
                  d_attr = d_attr->dw_attr_next;
                }

+

              if (a_attr == NULL && d_attr == NULL)
              if (a_attr == NULL && d_attr == NULL)

-               {
-                 break;
-               }
+               break;

            }
        }
     }
            }
        }
     }

+

   if (abbrev_id >= abbrev_die_table_in_use)
     {
       if (abbrev_die_table_in_use >= abbrev_die_table_allocated)
   if (abbrev_id >= abbrev_die_table_in_use)
     {
       if (abbrev_die_table_in_use >= abbrev_die_table_allocated)


@@ -2727,15 +2946,15 @@ build_abbrev_table (die)
     build_abbrev_table (c);
 }
 \f
     build_abbrev_table (c);
 }
 \f

-/**********************  DWARF Information Sizing ****************************/
-

 /* Return the size of an unsigned LEB128 quantity.  */
 /* Return the size of an unsigned LEB128 quantity.  */

-inline unsigned long
+
+static inline unsigned long

 size_of_uleb128 (value)
      register unsigned long value;
 {
   register unsigned long size = 0;
   register unsigned byte;
 size_of_uleb128 (value)
      register unsigned long value;
 {
   register unsigned long size = 0;
   register unsigned byte;

+

   do
     {
       byte = (value & 0x7f);
   do
     {
       byte = (value & 0x7f);


@@ -2743,16 +2962,19 @@ size_of_uleb128 (value)
       size += 1;
     }
   while (value != 0);
       size += 1;
     }
   while (value != 0);

+

   return size;
 }
 
 /* Return the size of a signed LEB128 quantity.  */
   return size;
 }
 
 /* Return the size of a signed LEB128 quantity.  */

-inline unsigned long
+
+static inline unsigned long

 size_of_sleb128 (value)
      register long value;
 {
   register unsigned long size = 0;
   register unsigned byte;
 size_of_sleb128 (value)
      register long value;
 {
   register unsigned long size = 0;
   register unsigned byte;

+

   do
     {
       byte = (value & 0x7f);
   do
     {
       byte = (value & 0x7f);


@@ -2761,10 +2983,12 @@ size_of_sleb128 (value)
     }
   while (!(((value == 0) && ((byte & 0x40) == 0))
           || ((value == -1) && ((byte & 0x40) != 0))));
     }
   while (!(((value == 0) && ((byte & 0x40) == 0))
           || ((value == -1) && ((byte & 0x40) != 0))));

+

   return size;
 }
 
 /* Return the size of a string, including the null byte.  */
   return size;
 }
 
 /* Return the size of a string, including the null byte.  */

+

 static unsigned long
 size_of_string (str)
      register char *str;
 static unsigned long
 size_of_string (str)
      register char *str;


@@ -2773,26 +2997,29 @@ size_of_string (str)
   register unsigned long slen = strlen (str);
   register unsigned long i;
   register unsigned c;
   register unsigned long slen = strlen (str);
   register unsigned long i;
   register unsigned c;

+

   for (i = 0; i < slen; ++i)
     {
       c = str[i];
       if (c == '\\')
   for (i = 0; i < slen; ++i)
     {
       c = str[i];
       if (c == '\\')

-       {
-         ++i;
-       }
+       ++i;
+

       size += 1;
     }
       size += 1;
     }

+

   /* Null terminator.  */
   size += 1;
   return size;
 }
 
 /* Return the size of a location descriptor.  */
   /* Null terminator.  */
   size += 1;
   return size;
 }
 
 /* Return the size of a location descriptor.  */

+

 static unsigned long
 size_of_loc_descr (loc)
      register dw_loc_descr_ref loc;
 {
   register unsigned long size = 1;
 static unsigned long
 size_of_loc_descr (loc)
      register dw_loc_descr_ref loc;
 {
   register unsigned long size = 1;

+

   switch (loc->dw_loc_opc)
     {
     case DW_OP_addr:
   switch (loc->dw_loc_opc)
     {
     case DW_OP_addr:


@@ -2884,21 +3111,26 @@ size_of_loc_descr (loc)
     default:
       break;
     }
     default:
       break;
     }

+

   return size;
 }
 
 /* Return the size of a series of location descriptors.  */
   return size;
 }
 
 /* Return the size of a series of location descriptors.  */

+

 static unsigned long
 size_of_locs (loc)
      register dw_loc_descr_ref loc;
 {
   register unsigned long size = 0;
 static unsigned long
 size_of_locs (loc)
      register dw_loc_descr_ref loc;
 {
   register unsigned long size = 0;

+

   for (; loc != NULL; loc = loc->dw_loc_next)
     size += size_of_loc_descr (loc);
   for (; loc != NULL; loc = loc->dw_loc_next)
     size += size_of_loc_descr (loc);

+

   return size;
 }
 
 /* Return the power-of-two number of bytes necessary to represent VALUE.  */
   return size;
 }
 
 /* Return the power-of-two number of bytes necessary to represent VALUE.  */

+

 static int
 constant_size (value)
      long unsigned value;
 static int
 constant_size (value)
      long unsigned value;


@@ -2918,12 +3150,14 @@ constant_size (value)
 
 /* Return the size of a DIE, as it is represented in the
    .debug_info section.  */
 
 /* Return the size of a DIE, as it is represented in the
    .debug_info section.  */

+

 static unsigned long
 size_of_die (die)
      register dw_die_ref die;
 {
   register unsigned long size = 0;
   register dw_attr_ref a;
 static unsigned long
 size_of_die (die)
      register dw_die_ref die;
 {
   register unsigned long size = 0;
   register dw_attr_ref a;

+

   size += size_of_uleb128 (die->die_abbrev);
   for (a = die->die_attr; a != NULL; a = a->dw_attr_next)
     {
   size += size_of_uleb128 (die->die_abbrev);
   for (a = die->die_attr; a != NULL; a = a->dw_attr_next)
     {


@@ -2976,6 +3210,7 @@ size_of_die (die)
          abort ();
        }
     }
          abort ();
        }
     }

+

   return size;
 }
 
   return size;
 }
 


@@ -2984,6 +3219,7 @@ size_of_die (die)
    variable next_die_offset, on each time through.  Uses the
    current value of next_die_offset to updete the die_offset
    field in each DIE.  */
    variable next_die_offset, on each time through.  Uses the
    current value of next_die_offset to updete the die_offset
    field in each DIE.  */

+

 static void
 calc_die_sizes (die)
      dw_die_ref die;
 static void
 calc_die_sizes (die)
      dw_die_ref die;


@@ -2991,42 +3227,49 @@ calc_die_sizes (die)
   register dw_die_ref c;
   die->die_offset = next_die_offset;
   next_die_offset += size_of_die (die);
   register dw_die_ref c;
   die->die_offset = next_die_offset;
   next_die_offset += size_of_die (die);

+

   for (c = die->die_child; c != NULL; c = c->die_sib)
   for (c = die->die_child; c != NULL; c = c->die_sib)

-    {
-      calc_die_sizes (c);
-    }
+    calc_die_sizes (c);
+

   if (die->die_child != NULL)
   if (die->die_child != NULL)

-    {
-      /* Count the null byte used to terminate sibling lists.  */
-      next_die_offset += 1;
-    }
+    /* Count the null byte used to terminate sibling lists.  */
+    next_die_offset += 1;

 }
 
 /* Return the size of the line information prolog generated for the
    compilation unit.  */
 }
 
 /* Return the size of the line information prolog generated for the
    compilation unit.  */

+

 static unsigned long
 size_of_line_prolog ()
 {
   register unsigned long size;
   register unsigned long ft_index;
 static unsigned long
 size_of_line_prolog ()
 {
   register unsigned long size;
   register unsigned long ft_index;

+

   size = DWARF_LINE_PROLOG_HEADER_SIZE;
   size = DWARF_LINE_PROLOG_HEADER_SIZE;

+

   /* Count the size of the table giving number of args for each
      standard opcode.  */
   size += DWARF_LINE_OPCODE_BASE - 1;
   /* Count the size of the table giving number of args for each
      standard opcode.  */
   size += DWARF_LINE_OPCODE_BASE - 1;

+

   /* Include directory table is empty (at present).  Count only the
      the null byte used to terminate the table.  */
   size += 1;
   /* Include directory table is empty (at present).  Count only the
      the null byte used to terminate the table.  */
   size += 1;

+

   for (ft_index = 1; ft_index < file_table_in_use; ++ft_index)
     {
       /* File name entry.  */
       size += size_of_string (file_table[ft_index]);
   for (ft_index = 1; ft_index < file_table_in_use; ++ft_index)
     {
       /* File name entry.  */
       size += size_of_string (file_table[ft_index]);

+

       /* Include directory index.  */
       size += size_of_uleb128 (0);
       /* Include directory index.  */
       size += size_of_uleb128 (0);

+

       /* Modification time.  */
       size += size_of_uleb128 (0);
       /* Modification time.  */
       size += size_of_uleb128 (0);

+

       /* File length in bytes.  */
       size += size_of_uleb128 (0);
     }
       /* File length in bytes.  */
       size += size_of_uleb128 (0);
     }

+

   /* Count the file table terminator.  */
   size += 1;
   return size;
   /* Count the file table terminator.  */
   size += 1;
   return size;


@@ -3034,6 +3277,7 @@ size_of_line_prolog ()
 
 /* Return the size of the line information generated for this
    compilation unit.  */
 
 /* Return the size of the line information generated for this
    compilation unit.  */

+

 static unsigned long
 size_of_line_info ()
 {
 static unsigned long
 size_of_line_info ()
 {


@@ -3044,20 +3288,25 @@ size_of_line_info ()
   register long line_delta;
   register unsigned long current_file;
   register unsigned long function;
   register long line_delta;
   register unsigned long current_file;
   register unsigned long function;

+

   /* Version number.  */
   size = 2;
   /* Version number.  */
   size = 2;

+

   /* Prolog length specifier.  */
   size += DWARF_OFFSET_SIZE;
   /* Prolog length specifier.  */
   size += DWARF_OFFSET_SIZE;

+

   /* Prolog.  */
   size += size_of_line_prolog ();
   /* Prolog.  */
   size += size_of_line_prolog ();

+

   /* Set address register instruction.  */
   /* Set address register instruction.  */

-  size += 1 + size_of_uleb128 (1 + PTR_SIZE)
-    + 1 + PTR_SIZE;
+  size += 1 + size_of_uleb128 (1 + PTR_SIZE) + 1 + PTR_SIZE;
+

   current_file = 1;
   current_line = 1;
   for (lt_index = 1; lt_index < line_info_table_in_use; ++lt_index)
     {
       register dw_line_info_ref line_info;
   current_file = 1;
   current_line = 1;
   for (lt_index = 1; lt_index < line_info_table_in_use; ++lt_index)
     {
       register dw_line_info_ref line_info;

+

       /* Advance pc instruction.  */
       size += 1 + 2;
       line_info = &line_info_table[lt_index];
       /* Advance pc instruction.  */
       size += 1 + 2;
       line_info = &line_info_table[lt_index];


@@ -3068,16 +3317,15 @@ size_of_line_info ()
          current_file = line_info->dw_file_num;
          size += size_of_uleb128 (current_file);
        }
          current_file = line_info->dw_file_num;
          size += size_of_uleb128 (current_file);
        }

+

       if (line_info->dw_line_num != current_line)
        {
          line_offset = line_info->dw_line_num - current_line;
          line_delta = line_offset - DWARF_LINE_BASE;
          current_line = line_info->dw_line_num;
          if (line_delta >= 0 && line_delta < (DWARF_LINE_RANGE - 1))
       if (line_info->dw_line_num != current_line)
        {
          line_offset = line_info->dw_line_num - current_line;
          line_delta = line_offset - DWARF_LINE_BASE;
          current_line = line_info->dw_line_num;
          if (line_delta >= 0 && line_delta < (DWARF_LINE_RANGE - 1))

-           {
-             /* 1-byte special line number instruction.  */
-             size += 1;
-           }
+           /* 1-byte special line number instruction.  */
+           size += 1;

          else
            {
              /* Advance line instruction.  */
          else
            {
              /* Advance line instruction.  */


@@ -3088,10 +3336,13 @@ size_of_line_info ()
            }
        }
     }
            }
        }
     }

+

   /* Advance pc instruction.  */
   size += 1 + 2;
   /* Advance pc instruction.  */
   size += 1 + 2;

+

   /* End of line number info. marker.  */
   size += 1 + size_of_uleb128 (1) + 1;
   /* End of line number info. marker.  */
   size += 1 + size_of_uleb128 (1) + 1;

+

   function = 0;
   current_file = 1;
   current_line = 1;
   function = 0;
   current_file = 1;
   current_line = 1;


@@ -3103,14 +3354,12 @@ size_of_line_info ()
        {
          function = line_info->function;
          /* Set address register instruction.  */
        {
          function = line_info->function;
          /* Set address register instruction.  */

-         size += 1 + size_of_uleb128 (1 + PTR_SIZE)
-           + 1 + PTR_SIZE;
+         size += 1 + size_of_uleb128 (1 + PTR_SIZE) + 1 + PTR_SIZE;

        }
       else
        }
       else

-       {
-         /* Advance pc instruction.  */
-         size += 1 + 2;
-       }
+       /* Advance pc instruction.  */
+       size += 1 + 2;
+

       if (line_info->dw_file_num != current_file)
        {
          /* Set file number instruction.  */
       if (line_info->dw_file_num != current_file)
        {
          /* Set file number instruction.  */


@@ -3118,25 +3367,26 @@ size_of_line_info ()
          current_file = line_info->dw_file_num;
          size += size_of_uleb128 (current_file);
        }
          current_file = line_info->dw_file_num;
          size += size_of_uleb128 (current_file);
        }

+

       if (line_info->dw_line_num != current_line)
        {
          line_offset = line_info->dw_line_num - current_line;
          line_delta = line_offset - DWARF_LINE_BASE;
          current_line = line_info->dw_line_num;
          if (line_delta >= 0 && line_delta < (DWARF_LINE_RANGE - 1))
       if (line_info->dw_line_num != current_line)
        {
          line_offset = line_info->dw_line_num - current_line;
          line_delta = line_offset - DWARF_LINE_BASE;
          current_line = line_info->dw_line_num;
          if (line_delta >= 0 && line_delta < (DWARF_LINE_RANGE - 1))

-           {
-             /* 1-byte special line number instruction.  */
-             size += 1;
-           }
+           /* 1-byte special line number instruction.  */
+           size += 1;

          else
            {
              /* Advance line instruction.  */
              size += 1;
              size += size_of_sleb128 (line_offset);
          else
            {
              /* Advance line instruction.  */
              size += 1;
              size += size_of_sleb128 (line_offset);

+

              /* Generate line entry instruction.  */
              size += 1;
            }
        }
              /* Generate line entry instruction.  */
              size += 1;
            }
        }

+

       ++lt_index;
 
       /* If we're done with a function, end its sequence.  */
       ++lt_index;
 
       /* If we're done with a function, end its sequence.  */


@@ -3145,17 +3395,21 @@ size_of_line_info ()
        {
          current_file = 1;
          current_line = 1;
        {
          current_file = 1;
          current_line = 1;

+

          /* Advance pc instruction.  */
          size += 1 + 2;
          /* Advance pc instruction.  */
          size += 1 + 2;

+

          /* End of line number info. marker.  */
          size += 1 + size_of_uleb128 (1) + 1;
        }
     }
          /* End of line number info. marker.  */
          size += 1 + size_of_uleb128 (1) + 1;
        }
     }

+

   return size;
 }
 
 /* Return the size of the .debug_pubnames table  generated for the
    compilation unit.  */
   return size;
 }
 
 /* Return the size of the .debug_pubnames table  generated for the
    compilation unit.  */

+

 static unsigned long
 size_of_pubnames ()
 {
 static unsigned long
 size_of_pubnames ()
 {


@@ -3168,54 +3422,58 @@ size_of_pubnames ()
       register pubname_ref p = &pubname_table[i];
       size += DWARF_OFFSET_SIZE + size_of_string (p->name);
     }
       register pubname_ref p = &pubname_table[i];
       size += DWARF_OFFSET_SIZE + size_of_string (p->name);
     }

+

   size += DWARF_OFFSET_SIZE;
   return size;
 }
 
 /* Return the size of the information in the .debug_aranges seciton.  */
   size += DWARF_OFFSET_SIZE;
   return size;
 }
 
 /* Return the size of the information in the .debug_aranges seciton.  */

+

 static unsigned long
 size_of_aranges ()
 {
   register unsigned long size;
 static unsigned long
 size_of_aranges ()
 {
   register unsigned long size;

+

   size = DWARF_ARANGES_HEADER_SIZE;
   size = DWARF_ARANGES_HEADER_SIZE;

+

   /* Count the address/length pair for this compilation unit.  */
   size += 2 * PTR_SIZE;
   size += 2 * PTR_SIZE * arange_table_in_use;
   /* Count the address/length pair for this compilation unit.  */
   size += 2 * PTR_SIZE;
   size += 2 * PTR_SIZE * arange_table_in_use;

+

   /* Count the two zero words used to terminated the address range table.  */
   size += 2 * PTR_SIZE;
   return size;
 }
 \f
   /* Count the two zero words used to terminated the address range table.  */
   size += 2 * PTR_SIZE;
   return size;
 }
 \f

-/**************** DWARF Debug Information Output *****************************/
-

 /* Output an unsigned LEB128 quantity.  */
 /* Output an unsigned LEB128 quantity.  */

+

 static void
 output_uleb128 (value)
      register unsigned long value;
 {
   unsigned long save_value = value;
 static void
 output_uleb128 (value)
      register unsigned long value;
 {
   unsigned long save_value = value;

+

   fprintf (asm_out_file, "\t%s\t", ASM_BYTE_OP);
   do
     {
       register unsigned byte = (value & 0x7f);
       value >>= 7;
       if (value != 0)
   fprintf (asm_out_file, "\t%s\t", ASM_BYTE_OP);
   do
     {
       register unsigned byte = (value & 0x7f);
       value >>= 7;
       if (value != 0)

-       {
-         /* More bytes to follow.  */
-         byte |= 0x80;
-       }
+       /* More bytes to follow.  */
+       byte |= 0x80;
+

       fprintf (asm_out_file, "0x%x", byte);
       if (value != 0)
       fprintf (asm_out_file, "0x%x", byte);
       if (value != 0)

-       {
-         fprintf (asm_out_file, ",");
-       }
+       fprintf (asm_out_file, ",");

     }
   while (value != 0);
     }
   while (value != 0);

+

   if (flag_verbose_asm)
     fprintf (asm_out_file, "\t%s ULEB128 0x%x", ASM_COMMENT_START, save_value);
 }
 
 /* Output an signed LEB128 quantity.  */
   if (flag_verbose_asm)
     fprintf (asm_out_file, "\t%s ULEB128 0x%x", ASM_COMMENT_START, save_value);
 }
 
 /* Output an signed LEB128 quantity.  */

+

 static void
 output_sleb128 (value)
      register long value;
 static void
 output_sleb128 (value)
      register long value;


@@ -3223,6 +3481,7 @@ output_sleb128 (value)
   register int more;
   register unsigned byte;
   long save_value = value;
   register int more;
   register unsigned byte;
   long save_value = value;

+

   fprintf (asm_out_file, "\t%s\t", ASM_BYTE_OP);
   do
     {
   fprintf (asm_out_file, "\t%s\t", ASM_BYTE_OP);
   do
     {


@@ -3232,21 +3491,20 @@ output_sleb128 (value)
       more = !((((value == 0) && ((byte & 0x40) == 0))
                || ((value == -1) && ((byte & 0x40) != 0))));
       if (more)
       more = !((((value == 0) && ((byte & 0x40) == 0))
                || ((value == -1) && ((byte & 0x40) != 0))));
       if (more)

-       {
-         byte |= 0x80;
-       }
+       byte |= 0x80;
+

       fprintf (asm_out_file, "0x%x", byte);
       if (more)
       fprintf (asm_out_file, "0x%x", byte);
       if (more)

-       {
-         fprintf (asm_out_file, ",");
-       }
+       fprintf (asm_out_file, ",");

     }
     }

+

   while (more);
   if (flag_verbose_asm)
     fprintf (asm_out_file, "\t%s SLEB128 %d", ASM_COMMENT_START, save_value);
 }
 
 /* Select the encoding of an attribute value.  */
   while (more);
   if (flag_verbose_asm)
     fprintf (asm_out_file, "\t%s SLEB128 %d", ASM_COMMENT_START, save_value);
 }
 
 /* Select the encoding of an attribute value.  */

+

 static enum dwarf_form
 value_format (v)
      dw_val_ref v;
 static enum dwarf_form
 value_format (v)
      dw_val_ref v;


@@ -3303,47 +3561,55 @@ value_format (v)
 }
 
 /* Output the encoding of an attribute value.  */
 }
 
 /* Output the encoding of an attribute value.  */

+

 static void
 output_value_format (v)
      dw_val_ref v;
 {
   enum dwarf_form form = value_format (v);
 static void
 output_value_format (v)
      dw_val_ref v;
 {
   enum dwarf_form form = value_format (v);

+

   output_uleb128 (form);
   if (flag_verbose_asm)
     fprintf (asm_out_file, " (%s)", dwarf_form_name (form));
   output_uleb128 (form);
   if (flag_verbose_asm)
     fprintf (asm_out_file, " (%s)", dwarf_form_name (form));

+

   fputc ('\n', asm_out_file);
 }
 
 /* Output the .debug_abbrev section which defines the DIE abbreviation
    table.  */
   fputc ('\n', asm_out_file);
 }
 
 /* Output the .debug_abbrev section which defines the DIE abbreviation
    table.  */

+

 static void
 output_abbrev_section ()
 {
   unsigned long abbrev_id;
 static void
 output_abbrev_section ()
 {
   unsigned long abbrev_id;

+

   dw_attr_ref a_attr;
   for (abbrev_id = 1; abbrev_id < abbrev_die_table_in_use; ++abbrev_id)
     {
       register dw_die_ref abbrev = abbrev_die_table[abbrev_id];
   dw_attr_ref a_attr;
   for (abbrev_id = 1; abbrev_id < abbrev_die_table_in_use; ++abbrev_id)
     {
       register dw_die_ref abbrev = abbrev_die_table[abbrev_id];

+

       output_uleb128 (abbrev_id);
       if (flag_verbose_asm)
        fprintf (asm_out_file, " (abbrev code)");
       output_uleb128 (abbrev_id);
       if (flag_verbose_asm)
        fprintf (asm_out_file, " (abbrev code)");

+

       fputc ('\n', asm_out_file);
       output_uleb128 (abbrev->die_tag);
       if (flag_verbose_asm)
        fprintf (asm_out_file, " (TAG: %s)",
                 dwarf_tag_name (abbrev->die_tag));
       fputc ('\n', asm_out_file);
       output_uleb128 (abbrev->die_tag);
       if (flag_verbose_asm)
        fprintf (asm_out_file, " (TAG: %s)",
                 dwarf_tag_name (abbrev->die_tag));

+

       fputc ('\n', asm_out_file);
       fprintf (asm_out_file, "\t%s\t0x%x", ASM_BYTE_OP,
       fputc ('\n', asm_out_file);
       fprintf (asm_out_file, "\t%s\t0x%x", ASM_BYTE_OP,

-              (abbrev->die_child != NULL)
-              ? DW_children_yes : DW_children_no);
+              abbrev->die_child != NULL ? DW_children_yes : DW_children_no);
+

       if (flag_verbose_asm)
       if (flag_verbose_asm)

-       {
-         fprintf (asm_out_file, "\t%s %s",
-                  ASM_COMMENT_START,
-                  (abbrev->die_child != NULL)
-                  ? "DW_children_yes" : "DW_children_no");
-       }
+       fprintf (asm_out_file, "\t%s %s",
+                ASM_COMMENT_START,
+                (abbrev->die_child != NULL
+                 ? "DW_children_yes" : "DW_children_no"));
+

       fputc ('\n', asm_out_file);
       fputc ('\n', asm_out_file);

+

       for (a_attr = abbrev->die_attr; a_attr != NULL;
           a_attr = a_attr->dw_attr_next)
        {
       for (a_attr = abbrev->die_attr; a_attr != NULL;
           a_attr = a_attr->dw_attr_next)
        {


@@ -3351,20 +3617,24 @@ output_abbrev_section ()
          if (flag_verbose_asm)
            fprintf (asm_out_file, " (%s)",
                     dwarf_attr_name (a_attr->dw_attr));
          if (flag_verbose_asm)
            fprintf (asm_out_file, " (%s)",
                     dwarf_attr_name (a_attr->dw_attr));

+

          fputc ('\n', asm_out_file);
          output_value_format (&a_attr->dw_attr_val);
        }
          fputc ('\n', asm_out_file);
          output_value_format (&a_attr->dw_attr_val);
        }

+

       fprintf (asm_out_file, "\t%s\t0,0\n", ASM_BYTE_OP);
     }
 }
 
 /* Output location description stack opcode's operands (if any).  */
       fprintf (asm_out_file, "\t%s\t0,0\n", ASM_BYTE_OP);
     }
 }
 
 /* Output location description stack opcode's operands (if any).  */

+

 static void
 output_loc_operands (loc)
      register dw_loc_descr_ref loc;
 {
   register dw_val_ref val1 = &loc->dw_loc_oprnd1;
   register dw_val_ref val2 = &loc->dw_loc_oprnd2;
 static void
 output_loc_operands (loc)
      register dw_loc_descr_ref loc;
 {
   register dw_val_ref val1 = &loc->dw_loc_oprnd1;
   register dw_val_ref val2 = &loc->dw_loc_oprnd2;

+

   switch (loc->dw_loc_opc)
     {
     case DW_OP_addr:
   switch (loc->dw_loc_opc)
     {
     case DW_OP_addr:


@@ -3476,24 +3746,24 @@ output_loc_operands (loc)
 }
 
 /* Compute the offset of a sibling.  */
 }
 
 /* Compute the offset of a sibling.  */

+

 static unsigned long
 sibling_offset (die)
      dw_die_ref die;
 {
   unsigned long offset;
 static unsigned long
 sibling_offset (die)
      dw_die_ref die;
 {
   unsigned long offset;

+

   if (die->die_child_last == NULL)
   if (die->die_child_last == NULL)

-    {
-      offset = die->die_offset + size_of_die (die);
-    }
+    offset = die->die_offset + size_of_die (die);

   else
   else

-    {
-      offset = sibling_offset (die->die_child_last) + 1;
-    }
+    offset = sibling_offset (die->die_child_last) + 1;
+

   return offset;
 }
 
 /* Output the DIE and its attributes.  Called recursively to generate
    the definitions of each child DIE.  */
   return offset;
 }
 
 /* Output the DIE and its attributes.  Called recursively to generate
    the definitions of each child DIE.  */

+

 static void
 output_die (die)
      register dw_die_ref die;
 static void
 output_die (die)
      register dw_die_ref die;


@@ -3509,7 +3779,9 @@ output_die (die)
   if (flag_verbose_asm)
     fprintf (asm_out_file, " (DIE (0x%x) %s)",
             die->die_offset, dwarf_tag_name (die->die_tag));
   if (flag_verbose_asm)
     fprintf (asm_out_file, " (DIE (0x%x) %s)",
             die->die_offset, dwarf_tag_name (die->die_tag));

+

   fputc ('\n', asm_out_file);
   fputc ('\n', asm_out_file);

+

   for (a = die->die_attr; a != NULL; a = a->dw_attr_next)
     {
       switch (a->dw_attr_val.val_class)
   for (a = die->die_attr; a != NULL; a = a->dw_attr_next)
     {
       switch (a->dw_attr_val.val_class)


@@ -3518,8 +3790,10 @@ output_die (die)
          ASM_OUTPUT_DWARF_ADDR_CONST (asm_out_file,
                                       a->dw_attr_val.v.val_addr);
          break;
          ASM_OUTPUT_DWARF_ADDR_CONST (asm_out_file,
                                       a->dw_attr_val.v.val_addr);
          break;

+

        case dw_val_class_loc:
          size = size_of_locs (a->dw_attr_val.v.val_loc);
        case dw_val_class_loc:
          size = size_of_locs (a->dw_attr_val.v.val_loc);

+

          /* Output the block length for this list of location operations.  */
          switch (constant_size (size))
            {
          /* Output the block length for this list of location operations.  */
          switch (constant_size (size))
            {


@@ -3532,11 +3806,11 @@ output_die (die)
            default:
              abort ();
            }
            default:
              abort ();
            }

+

          if (flag_verbose_asm)
          if (flag_verbose_asm)

-           {
-             fprintf (asm_out_file, "\t%s %s",
-                      ASM_COMMENT_START, dwarf_attr_name (a->dw_attr));
-           }
+           fprintf (asm_out_file, "\t%s %s",
+                    ASM_COMMENT_START, dwarf_attr_name (a->dw_attr));
+

          fputc ('\n', asm_out_file);
          for (loc = a->dw_attr_val.v.val_loc; loc != NULL;
               loc = loc->dw_loc_next)
          fputc ('\n', asm_out_file);
          for (loc = a->dw_attr_val.v.val_loc; loc != NULL;
               loc = loc->dw_loc_next)


@@ -3544,58 +3818,65 @@ output_die (die)
              /* Output the opcode.  */
              ASM_OUTPUT_DWARF_DATA1 (asm_out_file, loc->dw_loc_opc);
              if (flag_verbose_asm)
              /* Output the opcode.  */
              ASM_OUTPUT_DWARF_DATA1 (asm_out_file, loc->dw_loc_opc);
              if (flag_verbose_asm)

-               {
-                 fprintf (asm_out_file, "\t%s %s",
-                          ASM_COMMENT_START,
-                          dwarf_stack_op_name (loc->dw_loc_opc));
-               }
+               fprintf (asm_out_file, "\t%s %s", ASM_COMMENT_START,
+                        dwarf_stack_op_name (loc->dw_loc_opc));
+

              fputc ('\n', asm_out_file);
              fputc ('\n', asm_out_file);

+

              /* Output the operand(s) (if any).  */
              output_loc_operands (loc);
            }
          break;
              /* Output the operand(s) (if any).  */
              output_loc_operands (loc);
            }
          break;

+

        case dw_val_class_const:
          ASM_OUTPUT_DWARF_DATA4 (asm_out_file, a->dw_attr_val.v.val_int);
          break;
        case dw_val_class_const:
          ASM_OUTPUT_DWARF_DATA4 (asm_out_file, a->dw_attr_val.v.val_int);
          break;

+

        case dw_val_class_unsigned_const:
          switch (constant_size (a->dw_attr_val.v.val_unsigned))
            {
            case 1:
        case dw_val_class_unsigned_const:
          switch (constant_size (a->dw_attr_val.v.val_unsigned))
            {
            case 1:

-             ASM_OUTPUT_DWARF_DATA1
-               (asm_out_file, a->dw_attr_val.v.val_unsigned);
+             ASM_OUTPUT_DWARF_DATA1 (asm_out_file,
+                                     a->dw_attr_val.v.val_unsigned);

              break;
            case 2:
              break;
            case 2:

-             ASM_OUTPUT_DWARF_DATA2
-               (asm_out_file, a->dw_attr_val.v.val_unsigned);
+             ASM_OUTPUT_DWARF_DATA2 (asm_out_file,
+                                     a->dw_attr_val.v.val_unsigned);

              break;
            case 4:
              break;
            case 4:

-             ASM_OUTPUT_DWARF_DATA4
-               (asm_out_file, a->dw_attr_val.v.val_unsigned);
+             ASM_OUTPUT_DWARF_DATA4 (asm_out_file,
+                                     a->dw_attr_val.v.val_unsigned);

              break;
            default:
              abort ();
            }
          break;
              break;
            default:
              abort ();
            }
          break;

+

        case dw_val_class_long_long:
          ASM_OUTPUT_DWARF_DATA1 (asm_out_file, 8);
          if (flag_verbose_asm)
            fprintf (asm_out_file, "\t%s %s",
        case dw_val_class_long_long:
          ASM_OUTPUT_DWARF_DATA1 (asm_out_file, 8);
          if (flag_verbose_asm)
            fprintf (asm_out_file, "\t%s %s",

-                    ASM_COMMENT_START, dwarf_attr_name (a->dw_attr));
+                  ASM_COMMENT_START, dwarf_attr_name (a->dw_attr));
+

          fputc ('\n', asm_out_file);
          ASM_OUTPUT_DWARF_DATA8 (asm_out_file,
                                  a->dw_attr_val.v.val_long_long.hi,
                                  a->dw_attr_val.v.val_long_long.low);
          fputc ('\n', asm_out_file);
          ASM_OUTPUT_DWARF_DATA8 (asm_out_file,
                                  a->dw_attr_val.v.val_long_long.hi,
                                  a->dw_attr_val.v.val_long_long.low);

+

          if (flag_verbose_asm)
          if (flag_verbose_asm)

-           fprintf (asm_out_file, "\t%s long long constant",
-                    ASM_COMMENT_START);
+           fprintf (asm_out_file,
+                    "\t%s long long constant", ASM_COMMENT_START);
+         

          fputc ('\n', asm_out_file);
          break;
          fputc ('\n', asm_out_file);
          break;

+

        case dw_val_class_float:
          ASM_OUTPUT_DWARF_DATA1 (asm_out_file,
                                  a->dw_attr_val.v.val_float.length * 4);
          if (flag_verbose_asm)
            fprintf (asm_out_file, "\t%s %s",
                     ASM_COMMENT_START, dwarf_attr_name (a->dw_attr));
        case dw_val_class_float:
          ASM_OUTPUT_DWARF_DATA1 (asm_out_file,
                                  a->dw_attr_val.v.val_float.length * 4);
          if (flag_verbose_asm)
            fprintf (asm_out_file, "\t%s %s",
                     ASM_COMMENT_START, dwarf_attr_name (a->dw_attr));

+

          fputc ('\n', asm_out_file);
          for (i = 0; i < a->dw_attr_val.v.val_float.length; ++i)
            {
          fputc ('\n', asm_out_file);
          for (i = 0; i < a->dw_attr_val.v.val_float.length; ++i)
            {


@@ -3604,61 +3885,65 @@ output_die (die)
              if (flag_verbose_asm)
                fprintf (asm_out_file, "\t%s fp constant word %d",
                         ASM_COMMENT_START, i);
              if (flag_verbose_asm)
                fprintf (asm_out_file, "\t%s fp constant word %d",
                         ASM_COMMENT_START, i);

+

              fputc ('\n', asm_out_file);
            }
          break;
              fputc ('\n', asm_out_file);
            }
          break;

+

        case dw_val_class_flag:
          ASM_OUTPUT_DWARF_DATA1 (asm_out_file, a->dw_attr_val.v.val_flag);
          break;
        case dw_val_class_flag:
          ASM_OUTPUT_DWARF_DATA1 (asm_out_file, a->dw_attr_val.v.val_flag);
          break;

+

        case dw_val_class_die_ref:
          if (a->dw_attr_val.v.val_die_ref != NULL)
        case dw_val_class_die_ref:
          if (a->dw_attr_val.v.val_die_ref != NULL)

-           {
-             ref_offset = a->dw_attr_val.v.val_die_ref->die_offset;
-           }
+           ref_offset = a->dw_attr_val.v.val_die_ref->die_offset;

          else if (a->dw_attr == DW_AT_sibling)
          else if (a->dw_attr == DW_AT_sibling)

-           {
-             ref_offset = sibling_offset(die);
-           }
+           ref_offset = sibling_offset(die);

          else
          else

-           {
-             abort ();
-           }
+           abort ();
+

          ASM_OUTPUT_DWARF_DATA (asm_out_file, ref_offset);
          break;
          ASM_OUTPUT_DWARF_DATA (asm_out_file, ref_offset);
          break;

+

        case dw_val_class_fde_ref:
          ref_offset = fde_table[a->dw_attr_val.v.val_fde_index].dw_fde_offset;
          fprintf (asm_out_file, "\t%s\t%s+0x%x", UNALIGNED_OFFSET_ASM_OP,
                   stripattributes (FRAME_SECTION), ref_offset);
          break;
        case dw_val_class_fde_ref:
          ref_offset = fde_table[a->dw_attr_val.v.val_fde_index].dw_fde_offset;
          fprintf (asm_out_file, "\t%s\t%s+0x%x", UNALIGNED_OFFSET_ASM_OP,
                   stripattributes (FRAME_SECTION), ref_offset);
          break;

+

        case dw_val_class_lbl_id:
          ASM_OUTPUT_DWARF_ADDR (asm_out_file, a->dw_attr_val.v.val_lbl_id);
          break;
        case dw_val_class_lbl_id:
          ASM_OUTPUT_DWARF_ADDR (asm_out_file, a->dw_attr_val.v.val_lbl_id);
          break;

+

        case dw_val_class_section_offset:
        case dw_val_class_section_offset:

-         ASM_OUTPUT_DWARF_OFFSET
-           (asm_out_file, stripattributes (a->dw_attr_val.v.val_section));
+         ASM_OUTPUT_DWARF_OFFSET (asm_out_file,
+                                  stripattributes
+                                  (a->dw_attr_val.v.val_section));

          break;
          break;

+

        case dw_val_class_str:
          ASM_OUTPUT_DWARF_STRING (asm_out_file, a->dw_attr_val.v.val_str);
          break;
        case dw_val_class_str:
          ASM_OUTPUT_DWARF_STRING (asm_out_file, a->dw_attr_val.v.val_str);
          break;

+

        default:
          abort ();
        }
        default:
          abort ();
        }

+

       if (a->dw_attr_val.val_class != dw_val_class_loc
          && a->dw_attr_val.val_class != dw_val_class_long_long
          && a->dw_attr_val.val_class != dw_val_class_float)
        {
          if (flag_verbose_asm)
       if (a->dw_attr_val.val_class != dw_val_class_loc
          && a->dw_attr_val.val_class != dw_val_class_long_long
          && a->dw_attr_val.val_class != dw_val_class_float)
        {
          if (flag_verbose_asm)

-           {
-             fprintf (asm_out_file, "\t%s %s",
-                      ASM_COMMENT_START, dwarf_attr_name (a->dw_attr));
-           }
+           fprintf (asm_out_file, "\t%s %s",
+                    ASM_COMMENT_START, dwarf_attr_name (a->dw_attr));
+

          fputc ('\n', asm_out_file);
        }
     }
          fputc ('\n', asm_out_file);
        }
     }

+

   for (c = die->die_child; c != NULL; c = c->die_sib)
   for (c = die->die_child; c != NULL; c = c->die_sib)

-    {
-      output_die (c);
-    }
+    output_die (c);
+

   if (die->die_child != NULL)
     {
       /* Add null byte to terminate sibling list. */
   if (die->die_child != NULL)
     {
       /* Add null byte to terminate sibling list. */


@@ -3666,48 +3951,44 @@ output_die (die)
       if (flag_verbose_asm)
        fprintf (asm_out_file, "\t%s end of children of DIE 0x%x",
                 ASM_COMMENT_START, die->die_offset);
       if (flag_verbose_asm)
        fprintf (asm_out_file, "\t%s end of children of DIE 0x%x",
                 ASM_COMMENT_START, die->die_offset);

+

       fputc ('\n', asm_out_file);
     }
 }
 
 /* Output the compilation unit that appears at the beginning of the
    .debug_info section, and precedes the DIE descriptions.  */
       fputc ('\n', asm_out_file);
     }
 }
 
 /* Output the compilation unit that appears at the beginning of the
    .debug_info section, and precedes the DIE descriptions.  */

+

 static void
 output_compilation_unit_header ()
 {
   ASM_OUTPUT_DWARF_DATA (asm_out_file, next_die_offset - DWARF_OFFSET_SIZE);
   if (flag_verbose_asm)
 static void
 output_compilation_unit_header ()
 {
   ASM_OUTPUT_DWARF_DATA (asm_out_file, next_die_offset - DWARF_OFFSET_SIZE);
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s Length of Compilation Unit Info.",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s Length of Compilation Unit Info.",
+            ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA2 (asm_out_file, DWARF_VERSION);
   if (flag_verbose_asm)
   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA2 (asm_out_file, DWARF_VERSION);
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s DWARF version number",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s DWARF version number", ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_OFFSET (asm_out_file, stripattributes (ABBREV_SECTION));
   if (flag_verbose_asm)
   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_OFFSET (asm_out_file, stripattributes (ABBREV_SECTION));
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s Offset Into Abbrev. Section",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s Offset Into Abbrev. Section",
+            ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, PTR_SIZE);
   if (flag_verbose_asm)
   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, PTR_SIZE);
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s Pointer Size (in bytes)",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s Pointer Size (in bytes)", ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
 }
 
 /* Generate a new label for the CFI info to refer to.  */
 
   fputc ('\n', asm_out_file);
 }
 
 /* Generate a new label for the CFI info to refer to.  */
 

-char *
+static char *

 dwarf2out_cfi_label ()
 {
   static char label[20];
 dwarf2out_cfi_label ()
 {
   static char label[20];


@@ -3724,14 +4005,16 @@ dwarf2out_cfi_label ()
 
 static void
 add_fde_cfi (label, cfi)
 
 static void
 add_fde_cfi (label, cfi)

-     register char * label;
+     register char *label;

      register dw_cfi_ref cfi;
 {
   if (label)
     {
       register dw_fde_ref fde = &fde_table[fde_table_in_use - 1];
      register dw_cfi_ref cfi;
 {
   if (label)
     {
       register dw_fde_ref fde = &fde_table[fde_table_in_use - 1];

+

       if (*label == 0)
        label = dwarf2out_cfi_label ();
       if (*label == 0)
        label = dwarf2out_cfi_label ();

+

       if (fde->dw_fde_current_label == NULL
          || strcmp (label, fde->dw_fde_current_label) != 0)
        {
       if (fde->dw_fde_current_label == NULL
          || strcmp (label, fde->dw_fde_current_label) != 0)
        {


@@ -3745,14 +4028,17 @@ add_fde_cfi (label, cfi)
          xcfi->dw_cfi_oprnd1.dw_cfi_addr = label;
          add_cfi (&fde->dw_fde_cfi, xcfi);
        }
          xcfi->dw_cfi_oprnd1.dw_cfi_addr = label;
          add_cfi (&fde->dw_fde_cfi, xcfi);
        }

+

       add_cfi (&fde->dw_fde_cfi, cfi);
     }
       add_cfi (&fde->dw_fde_cfi, cfi);
     }

+

   else
     add_cfi (&cie_cfi_head, cfi);
 }
 
 /* Subroutine of lookup_cfa.  */
   else
     add_cfi (&cie_cfi_head, cfi);
 }
 
 /* Subroutine of lookup_cfa.  */

-inline void
+
+static inline void

 lookup_cfa_1 (cfi, regp, offsetp)
      register dw_cfi_ref cfi;
      register unsigned long *regp;
 lookup_cfa_1 (cfi, regp, offsetp)
      register dw_cfi_ref cfi;
      register unsigned long *regp;


@@ -3774,17 +4060,20 @@ lookup_cfa_1 (cfi, regp, offsetp)
 }
 
 /* Find the previous value for the CFA.  */
 }
 
 /* Find the previous value for the CFA.  */

+

 static void
 lookup_cfa (regp, offsetp)
      register unsigned long *regp;
      register long *offsetp;
 {
   register dw_cfi_ref cfi;
 static void
 lookup_cfa (regp, offsetp)
      register unsigned long *regp;
      register long *offsetp;
 {
   register dw_cfi_ref cfi;

+

   *regp = (unsigned long) -1;
   *offsetp = 0;
 
   for (cfi = cie_cfi_head; cfi; cfi = cfi->dw_cfi_next)
     lookup_cfa_1 (cfi, regp, offsetp);
   *regp = (unsigned long) -1;
   *offsetp = 0;
 
   for (cfi = cie_cfi_head; cfi; cfi = cfi->dw_cfi_next)
     lookup_cfa_1 (cfi, regp, offsetp);

+

   if (fde_table_in_use)
     {
       register dw_fde_ref fde = &fde_table[fde_table_in_use - 1];
   if (fde_table_in_use)
     {
       register dw_fde_ref fde = &fde_table[fde_table_in_use - 1];


@@ -3799,12 +4088,12 @@ lookup_cfa (regp, offsetp)
 
 void
 dwarf2out_def_cfa (label, reg, offset)
 
 void
 dwarf2out_def_cfa (label, reg, offset)

-     register char * label;
+     register char *label;

      register unsigned reg;
      register long offset;
 {
   register dw_cfi_ref cfi;
      register unsigned reg;
      register long offset;
 {
   register dw_cfi_ref cfi;

-  unsigned old_reg;
+  unsigned long old_reg;

   long old_offset;
 
   reg = DWARF_FRAME_REGNUM (reg);
   long old_offset;
 
   reg = DWARF_FRAME_REGNUM (reg);


@@ -3820,6 +4109,7 @@ dwarf2out_def_cfa (label, reg, offset)
       cfi->dw_cfi_opc = DW_CFA_def_cfa_offset;
       cfi->dw_cfi_oprnd1.dw_cfi_offset = offset;
     }
       cfi->dw_cfi_opc = DW_CFA_def_cfa_offset;
       cfi->dw_cfi_oprnd1.dw_cfi_offset = offset;
     }

+

 #ifndef MIPS_DEBUGGING_INFO  /* SGI dbx thinks this means no offset.  */
   else if (offset == old_offset && old_reg != (unsigned long) -1)
     {
 #ifndef MIPS_DEBUGGING_INFO  /* SGI dbx thinks this means no offset.  */
   else if (offset == old_offset && old_reg != (unsigned long) -1)
     {


@@ -3827,6 +4117,7 @@ dwarf2out_def_cfa (label, reg, offset)
       cfi->dw_cfi_oprnd1.dw_cfi_reg_num = reg;
     }
 #endif
       cfi->dw_cfi_oprnd1.dw_cfi_reg_num = reg;
     }
 #endif

+

   else
     {
       cfi->dw_cfi_opc = DW_CFA_def_cfa;
   else
     {
       cfi->dw_cfi_opc = DW_CFA_def_cfa;


@@ -4009,6 +4300,7 @@ dwarf2out_frame_debug (insn)
                default:
                  abort ();
                }
                default:
                  abort ();
                }

+

              if (GET_CODE (src) == PLUS)
                offset = -offset;
              if (cfa_reg == STACK_POINTER_REGNUM)
              if (GET_CODE (src) == PLUS)
                offset = -offset;
              if (cfa_reg == STACK_POINTER_REGNUM)


@@ -4053,11 +4345,13 @@ dwarf2out_frame_debug (insn)
          offset = GET_MODE_SIZE (GET_MODE (dest));
          if (GET_CODE (src) == PRE_INC)
            offset = -offset;
          offset = GET_MODE_SIZE (GET_MODE (dest));
          if (GET_CODE (src) == PRE_INC)
            offset = -offset;

+

          assert (REGNO (XEXP (XEXP (dest, 0), 0)) == STACK_POINTER_REGNUM);
          assert (cfa_store_reg == STACK_POINTER_REGNUM);
          cfa_store_offset += offset;
          if (cfa_reg == STACK_POINTER_REGNUM)
            cfa_offset = cfa_store_offset;
          assert (REGNO (XEXP (XEXP (dest, 0), 0)) == STACK_POINTER_REGNUM);
          assert (cfa_store_reg == STACK_POINTER_REGNUM);
          cfa_store_offset += offset;
          if (cfa_reg == STACK_POINTER_REGNUM)
            cfa_offset = cfa_store_offset;

+

          offset = -cfa_store_offset;
          break;
 
          offset = -cfa_store_offset;
          break;
 


@@ -4067,6 +4361,7 @@ dwarf2out_frame_debug (insn)
          offset = INTVAL (XEXP (XEXP (dest, 0), 1));
          if (GET_CODE (src) == MINUS)
            offset = -offset;
          offset = INTVAL (XEXP (XEXP (dest, 0), 1));
          if (GET_CODE (src) == MINUS)
            offset = -offset;

+

          assert (cfa_store_reg == REGNO (XEXP (XEXP (dest, 0), 0)));
          offset -= cfa_store_offset;
          break;
          assert (cfa_store_reg == REGNO (XEXP (XEXP (dest, 0), 0)));
          offset -= cfa_store_offset;
          break;


@@ -4084,17 +4379,19 @@ dwarf2out_frame_debug (insn)
 }
 
 /* Return the size of a Call Frame Instruction.  */
 }
 
 /* Return the size of a Call Frame Instruction.  */

+

 static unsigned long
 size_of_cfi (cfi)
      dw_cfi_ref cfi;
 {
   register unsigned long size;
 static unsigned long
 size_of_cfi (cfi)
      dw_cfi_ref cfi;
 {
   register unsigned long size;

-  /* count the 1-byte opcode */
+
+  /* Count the 1-byte opcode */

   size = 1;
   switch (cfi->dw_cfi_opc)
     {
     case DW_CFA_offset:
   size = 1;
   switch (cfi->dw_cfi_opc)
     {
     case DW_CFA_offset:

-      size += size_of_uleb128(cfi->dw_cfi_oprnd2.dw_cfi_offset);
+      size += size_of_uleb128 (cfi->dw_cfi_oprnd2.dw_cfi_offset);

       break;
     case DW_CFA_set_loc:
       size += PTR_SIZE;
       break;
     case DW_CFA_set_loc:
       size += PTR_SIZE;


@@ -4115,32 +4412,34 @@ size_of_cfi (cfi)
 #endif
     case DW_CFA_offset_extended:
     case DW_CFA_def_cfa:
 #endif
     case DW_CFA_offset_extended:
     case DW_CFA_def_cfa:

-      size += size_of_uleb128(cfi->dw_cfi_oprnd1.dw_cfi_reg_num);
-      size += size_of_uleb128(cfi->dw_cfi_oprnd2.dw_cfi_offset);
+      size += size_of_uleb128 (cfi->dw_cfi_oprnd1.dw_cfi_reg_num);
+      size += size_of_uleb128 (cfi->dw_cfi_oprnd2.dw_cfi_offset);

       break;
     case DW_CFA_restore_extended:
     case DW_CFA_undefined:
       break;
     case DW_CFA_restore_extended:
     case DW_CFA_undefined:

-      size += size_of_uleb128(cfi->dw_cfi_oprnd1.dw_cfi_reg_num);
+      size += size_of_uleb128 (cfi->dw_cfi_oprnd1.dw_cfi_reg_num);

       break;
     case DW_CFA_same_value:
     case DW_CFA_def_cfa_register:
       break;
     case DW_CFA_same_value:
     case DW_CFA_def_cfa_register:

-      size += size_of_uleb128(cfi->dw_cfi_oprnd1.dw_cfi_reg_num);
+      size += size_of_uleb128 (cfi->dw_cfi_oprnd1.dw_cfi_reg_num);

       break;
     case DW_CFA_register:
       break;
     case DW_CFA_register:

-      size += size_of_uleb128(cfi->dw_cfi_oprnd1.dw_cfi_reg_num);
-      size += size_of_uleb128(cfi->dw_cfi_oprnd2.dw_cfi_reg_num);
+      size += size_of_uleb128 (cfi->dw_cfi_oprnd1.dw_cfi_reg_num);
+      size += size_of_uleb128 (cfi->dw_cfi_oprnd2.dw_cfi_reg_num);

       break;
     case DW_CFA_def_cfa_offset:
       break;
     case DW_CFA_def_cfa_offset:

-      size += size_of_uleb128(cfi->dw_cfi_oprnd1.dw_cfi_offset);
+      size += size_of_uleb128 (cfi->dw_cfi_oprnd1.dw_cfi_offset);

       break;
     default:
       break;
     }
       break;
     default:
       break;
     }

+

     return size;
 }
 
 /* Return the size of an FDE sans the length word.  */
     return size;
 }
 
 /* Return the size of an FDE sans the length word.  */

-inline unsigned long
+
+static inline unsigned long

 size_of_fde (fde, npad)
     dw_fde_ref fde;
     unsigned long *npad;
 size_of_fde (fde, npad)
     dw_fde_ref fde;
     unsigned long *npad;


@@ -4148,11 +4447,11 @@ size_of_fde (fde, npad)
   register dw_cfi_ref cfi;
   register unsigned long aligned_size;
   register unsigned long size;
   register dw_cfi_ref cfi;
   register unsigned long aligned_size;
   register unsigned long size;

+

   size = DWARF_FDE_HEADER_SIZE;
   for (cfi = fde->dw_fde_cfi; cfi != NULL; cfi = cfi->dw_cfi_next)
   size = DWARF_FDE_HEADER_SIZE;
   for (cfi = fde->dw_fde_cfi; cfi != NULL; cfi = cfi->dw_cfi_next)

-    {
-       size += size_of_cfi(cfi);
-    }
+    size += size_of_cfi(cfi);
+

   /* Round the size up to a word boundary.  */
   aligned_size = DWARF_ROUND (size, PTR_SIZE);
   *npad = aligned_size - size;
   /* Round the size up to a word boundary.  */
   aligned_size = DWARF_ROUND (size, PTR_SIZE);
   *npad = aligned_size - size;


@@ -4161,6 +4460,7 @@ size_of_fde (fde, npad)
 
 /* Calculate the size of the FDE table, and establish the offset
    of each FDE in the .debug_frame section.  */
 
 /* Calculate the size of the FDE table, and establish the offset
    of each FDE in the .debug_frame section.  */

+

 static void
 calc_fde_sizes ()
 {
 static void
 calc_fde_sizes ()
 {


@@ -4187,6 +4487,7 @@ calc_fde_sizes ()
 }
 
 /* Output a Call Frame Information opcode and its operand(s).  */
 }
 
 /* Output a Call Frame Information opcode and its operand(s).  */

+

 static void
 output_cfi (cfi, fde)
      register dw_cfi_ref cfi;
 static void
 output_cfi (cfi, fde)
      register dw_cfi_ref cfi;


@@ -4202,6 +4503,7 @@ output_cfi (cfi, fde)
                 ASM_COMMENT_START, cfi->dw_cfi_oprnd1.dw_cfi_offset);
       fputc ('\n', asm_out_file);
     }
                 ASM_COMMENT_START, cfi->dw_cfi_oprnd1.dw_cfi_offset);
       fputc ('\n', asm_out_file);
     }

+

   else if (cfi->dw_cfi_opc == DW_CFA_offset)
     {
       ASM_OUTPUT_DWARF_DATA1 (asm_out_file,
   else if (cfi->dw_cfi_opc == DW_CFA_offset)
     {
       ASM_OUTPUT_DWARF_DATA1 (asm_out_file,


@@ -4210,8 +4512,9 @@ output_cfi (cfi, fde)
       if (flag_verbose_asm)
        fprintf (asm_out_file, "\t%s DW_CFA_offset, column 0x%x",
                 ASM_COMMENT_START, cfi->dw_cfi_oprnd1.dw_cfi_reg_num);
       if (flag_verbose_asm)
        fprintf (asm_out_file, "\t%s DW_CFA_offset, column 0x%x",
                 ASM_COMMENT_START, cfi->dw_cfi_oprnd1.dw_cfi_reg_num);

+

       fputc ('\n', asm_out_file);
       fputc ('\n', asm_out_file);

-      output_uleb128(cfi->dw_cfi_oprnd2.dw_cfi_offset);
+      output_uleb128 (cfi->dw_cfi_oprnd2.dw_cfi_offset);

       fputc ('\n', asm_out_file);
     }
   else if (cfi->dw_cfi_opc == DW_CFA_restore)
       fputc ('\n', asm_out_file);
     }
   else if (cfi->dw_cfi_opc == DW_CFA_restore)


@@ -4222,23 +4525,21 @@ output_cfi (cfi, fde)
       if (flag_verbose_asm)
        fprintf (asm_out_file, "\t%s DW_CFA_restore, column 0x%x",
                 ASM_COMMENT_START, cfi->dw_cfi_oprnd1.dw_cfi_reg_num);
       if (flag_verbose_asm)
        fprintf (asm_out_file, "\t%s DW_CFA_restore, column 0x%x",
                 ASM_COMMENT_START, cfi->dw_cfi_oprnd1.dw_cfi_reg_num);

+

       fputc ('\n', asm_out_file);
     }
   else
     {
       ASM_OUTPUT_DWARF_DATA1 (asm_out_file, cfi->dw_cfi_opc);
       if (flag_verbose_asm)
       fputc ('\n', asm_out_file);
     }
   else
     {
       ASM_OUTPUT_DWARF_DATA1 (asm_out_file, cfi->dw_cfi_opc);
       if (flag_verbose_asm)

-       {
-         fprintf (asm_out_file, "\t%s %s",
-                  ASM_COMMENT_START,
-                  dwarf_cfi_name (cfi->dw_cfi_opc));
-       }
+       fprintf (asm_out_file, "\t%s %s", ASM_COMMENT_START,
+                dwarf_cfi_name (cfi->dw_cfi_opc));
+

       fputc ('\n', asm_out_file);
       switch (cfi->dw_cfi_opc)
        {
        case DW_CFA_set_loc:
       fputc ('\n', asm_out_file);
       switch (cfi->dw_cfi_opc)
        {
        case DW_CFA_set_loc:

-          ASM_OUTPUT_DWARF_ADDR (asm_out_file,
-                                cfi->dw_cfi_oprnd1.dw_cfi_addr);
+          ASM_OUTPUT_DWARF_ADDR (asm_out_file, cfi->dw_cfi_oprnd1.dw_cfi_addr);

           fputc ('\n', asm_out_file);
          break;
        case DW_CFA_advance_loc1:
           fputc ('\n', asm_out_file);
          break;
        case DW_CFA_advance_loc1:


@@ -4247,15 +4548,15 @@ output_cfi (cfi, fde)
          break;
        case DW_CFA_advance_loc2:
           ASM_OUTPUT_DWARF_DELTA2 (asm_out_file,
          break;
        case DW_CFA_advance_loc2:
           ASM_OUTPUT_DWARF_DELTA2 (asm_out_file,

-                                cfi->dw_cfi_oprnd1.dw_cfi_addr,
-                                fde->dw_fde_current_label);
+                                  cfi->dw_cfi_oprnd1.dw_cfi_addr,
+                                  fde->dw_fde_current_label);

           fputc ('\n', asm_out_file);
          fde->dw_fde_current_label = cfi->dw_cfi_oprnd1.dw_cfi_addr;
          break;
        case DW_CFA_advance_loc4:
           ASM_OUTPUT_DWARF_DELTA4 (asm_out_file,
           fputc ('\n', asm_out_file);
          fde->dw_fde_current_label = cfi->dw_cfi_oprnd1.dw_cfi_addr;
          break;
        case DW_CFA_advance_loc4:
           ASM_OUTPUT_DWARF_DELTA4 (asm_out_file,

-                                cfi->dw_cfi_oprnd1.dw_cfi_addr,
-                                fde->dw_fde_current_label);
+                                  cfi->dw_cfi_oprnd1.dw_cfi_addr,
+                                  fde->dw_fde_current_label);

           fputc ('\n', asm_out_file);
          fde->dw_fde_current_label = cfi->dw_cfi_oprnd1.dw_cfi_addr;
          break;
           fputc ('\n', asm_out_file);
          fde->dw_fde_current_label = cfi->dw_cfi_oprnd1.dw_cfi_addr;
          break;


@@ -4267,29 +4568,29 @@ output_cfi (cfi, fde)
 #endif
        case DW_CFA_offset_extended:
        case DW_CFA_def_cfa:
 #endif
        case DW_CFA_offset_extended:
        case DW_CFA_def_cfa:

-         output_uleb128(cfi->dw_cfi_oprnd1.dw_cfi_reg_num);
+         output_uleb128 (cfi->dw_cfi_oprnd1.dw_cfi_reg_num);

           fputc ('\n', asm_out_file);
           fputc ('\n', asm_out_file);

-         output_uleb128(cfi->dw_cfi_oprnd2.dw_cfi_offset);
+         output_uleb128 (cfi->dw_cfi_oprnd2.dw_cfi_offset);

           fputc ('\n', asm_out_file);
          break;
        case DW_CFA_restore_extended:
        case DW_CFA_undefined:
           fputc ('\n', asm_out_file);
          break;
        case DW_CFA_restore_extended:
        case DW_CFA_undefined:

-         output_uleb128(cfi->dw_cfi_oprnd1.dw_cfi_reg_num);
+         output_uleb128 (cfi->dw_cfi_oprnd1.dw_cfi_reg_num);

           fputc ('\n', asm_out_file);
          break;
        case DW_CFA_same_value:
        case DW_CFA_def_cfa_register:
           fputc ('\n', asm_out_file);
          break;
        case DW_CFA_same_value:
        case DW_CFA_def_cfa_register:

-         output_uleb128(cfi->dw_cfi_oprnd1.dw_cfi_reg_num);
+         output_uleb128 (cfi->dw_cfi_oprnd1.dw_cfi_reg_num);

           fputc ('\n', asm_out_file);
          break;
        case DW_CFA_register:
           fputc ('\n', asm_out_file);
          break;
        case DW_CFA_register:

-         output_uleb128(cfi->dw_cfi_oprnd1.dw_cfi_reg_num);
+         output_uleb128 (cfi->dw_cfi_oprnd1.dw_cfi_reg_num);

           fputc ('\n', asm_out_file);
           fputc ('\n', asm_out_file);

-         output_uleb128(cfi->dw_cfi_oprnd2.dw_cfi_reg_num);
+         output_uleb128 (cfi->dw_cfi_oprnd2.dw_cfi_reg_num);

           fputc ('\n', asm_out_file);
          break;
        case DW_CFA_def_cfa_offset:
           fputc ('\n', asm_out_file);
          break;
        case DW_CFA_def_cfa_offset:

-         output_uleb128(cfi->dw_cfi_oprnd1.dw_cfi_offset);
+         output_uleb128 (cfi->dw_cfi_oprnd1.dw_cfi_offset);

           fputc ('\n', asm_out_file);
          break;
        default:
           fputc ('\n', asm_out_file);
          break;
        default:


@@ -4301,6 +4602,7 @@ output_cfi (cfi, fde)
 /* Output the call frame information used to used to record information
    that relates to calculating the frame pointer, and records the
    location of saved registers.  */
 /* Output the call frame information used to used to record information
    that relates to calculating the frame pointer, and records the
    location of saved registers.  */

+

 static void
 output_call_frame_info ()
 {
 static void
 output_call_frame_info ()
 {


@@ -4326,55 +4628,49 @@ output_call_frame_info ()
   /* Output the CIE. */
   ASM_OUTPUT_DWARF_DATA (asm_out_file, next_fde_offset - DWARF_OFFSET_SIZE);
   if (flag_verbose_asm)
   /* Output the CIE. */
   ASM_OUTPUT_DWARF_DATA (asm_out_file, next_fde_offset - DWARF_OFFSET_SIZE);
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s Length of Common Information Entry",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s Length of Common Information Entry",
+            ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA4 (asm_out_file, DW_CIE_ID);
   if (flag_verbose_asm)
   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA4 (asm_out_file, DW_CIE_ID);
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s CIE Identifier Tag",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s CIE Identifier Tag", ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   if (DWARF_OFFSET_SIZE == 8)
     {
       ASM_OUTPUT_DWARF_DATA4 (asm_out_file, DW_CIE_ID);
       fputc ('\n', asm_out_file);
     }
   fputc ('\n', asm_out_file);
   if (DWARF_OFFSET_SIZE == 8)
     {
       ASM_OUTPUT_DWARF_DATA4 (asm_out_file, DW_CIE_ID);
       fputc ('\n', asm_out_file);
     }

+

   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DW_CIE_VERSION);
   if (flag_verbose_asm)
   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DW_CIE_VERSION);
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s CIE Version",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s CIE Version", ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, 0);
   if (flag_verbose_asm)
   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, 0);
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s CIE Augmentation (none)",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s CIE Augmentation (none)", ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   output_uleb128 (1);
   if (flag_verbose_asm)
     fprintf (asm_out_file, " (CIE Code Alignment Factor)");
   fputc ('\n', asm_out_file);
   output_uleb128 (1);
   if (flag_verbose_asm)
     fprintf (asm_out_file, " (CIE Code Alignment Factor)");

+

   fputc ('\n', asm_out_file);
   output_sleb128 (DWARF_CIE_DATA_ALIGNMENT);
   if (flag_verbose_asm)
     fprintf (asm_out_file, " (CIE Data Alignment Factor)");
   fputc ('\n', asm_out_file);
   output_sleb128 (DWARF_CIE_DATA_ALIGNMENT);
   if (flag_verbose_asm)
     fprintf (asm_out_file, " (CIE Data Alignment Factor)");

+

   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DWARF_FRAME_RETURN_COLUMN);
   if (flag_verbose_asm)
   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DWARF_FRAME_RETURN_COLUMN);
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s CIE RA Column",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s CIE RA Column", ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
 
   for (cfi = cie_cfi_head; cfi != NULL; cfi = cfi->dw_cfi_next)
   fputc ('\n', asm_out_file);
 
   for (cfi = cie_cfi_head; cfi != NULL; cfi = cfi->dw_cfi_next)

-    output_cfi (cfi);
+    output_cfi (cfi, NULL);

 
   /* Pad the CIE out to an address sized boundary.  */
   for (i = next_fde_offset - cie_size; i; --i)
 
   /* Pad the CIE out to an address sized boundary.  */
   for (i = next_fde_offset - cie_size; i; --i)


@@ -4382,10 +4678,8 @@ output_call_frame_info ()
       /* Pad out to a pointer size boundary */
       ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DW_CFA_nop);
       if (flag_verbose_asm)
       /* Pad out to a pointer size boundary */
       ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DW_CFA_nop);
       if (flag_verbose_asm)

-       {
-         fprintf (asm_out_file, "\t%s CIE DW_CFA_nop (pad)",
-                  ASM_COMMENT_START);
-       }
+       fprintf (asm_out_file, "\t%s CIE DW_CFA_nop (pad)", ASM_COMMENT_START);
+

       fputc ('\n', asm_out_file);
     }
 
       fputc ('\n', asm_out_file);
     }
 


@@ -4395,35 +4689,28 @@ output_call_frame_info ()
       fde = &fde_table[i];
       if (fde->dw_fde_cfi == NULL)
        continue;
       fde = &fde_table[i];
       if (fde->dw_fde_cfi == NULL)
        continue;

+

       fde_size = size_of_fde (fde, &fde_pad);
       ASM_OUTPUT_DWARF_DATA (asm_out_file, fde_size - DWARF_OFFSET_SIZE);
       if (flag_verbose_asm)
       fde_size = size_of_fde (fde, &fde_pad);
       ASM_OUTPUT_DWARF_DATA (asm_out_file, fde_size - DWARF_OFFSET_SIZE);
       if (flag_verbose_asm)

-       {
-         fprintf (asm_out_file, "\t%s FDE Length",
-                  ASM_COMMENT_START);
-       }
+       fprintf (asm_out_file, "\t%s FDE Length", ASM_COMMENT_START);
+

       fputc ('\n', asm_out_file);
       ASM_OUTPUT_DWARF_OFFSET (asm_out_file, stripattributes (FRAME_SECTION));
       if (flag_verbose_asm)
       fputc ('\n', asm_out_file);
       ASM_OUTPUT_DWARF_OFFSET (asm_out_file, stripattributes (FRAME_SECTION));
       if (flag_verbose_asm)

-       {
-         fprintf (asm_out_file, "\t%s FDE CIE offset",
-                  ASM_COMMENT_START);
-       }
+       fprintf (asm_out_file, "\t%s FDE CIE offset", ASM_COMMENT_START);
+

       fputc ('\n', asm_out_file);
       ASM_OUTPUT_DWARF_ADDR (asm_out_file, fde->dw_fde_begin);
       if (flag_verbose_asm)
       fputc ('\n', asm_out_file);
       ASM_OUTPUT_DWARF_ADDR (asm_out_file, fde->dw_fde_begin);
       if (flag_verbose_asm)

-       {
-         fprintf (asm_out_file, "\t%s FDE initial location",
-                  ASM_COMMENT_START);
-       }
+       fprintf (asm_out_file, "\t%s FDE initial location", ASM_COMMENT_START);
+

       fputc ('\n', asm_out_file);
       fputc ('\n', asm_out_file);

-      ASM_OUTPUT_DWARF_ADDR_DELTA
-       (asm_out_file, fde->dw_fde_end, fde->dw_fde_begin);
+      ASM_OUTPUT_DWARF_ADDR_DELTA (asm_out_file,
+                                  fde->dw_fde_end, fde->dw_fde_begin);

       if (flag_verbose_asm)
       if (flag_verbose_asm)

-       {
-         fprintf (asm_out_file, "\t%s FDE address range",
-                  ASM_COMMENT_START);
-       }
+       fprintf (asm_out_file, "\t%s FDE address range", ASM_COMMENT_START);
+

       fputc ('\n', asm_out_file);
 
       /* Loop through the Call Frame Instructions associated with
       fputc ('\n', asm_out_file);
 
       /* Loop through the Call Frame Instructions associated with


@@ -4437,10 +4724,9 @@ output_call_frame_info ()
        {
          ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DW_CFA_nop);
          if (flag_verbose_asm)
        {
          ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DW_CFA_nop);
          if (flag_verbose_asm)

-           {
-             fprintf (asm_out_file, "\t%s CIE DW_CFA_nop (pad)",
-                      ASM_COMMENT_START);
-           }
+           fprintf (asm_out_file, "\t%s CIE DW_CFA_nop (pad)",
+                    ASM_COMMENT_START);
+

          fputc ('\n', asm_out_file);
        }
     }
          fputc ('\n', asm_out_file);
        }
     }


@@ -4450,7 +4736,7 @@ output_call_frame_info ()
    of decl_printable_name for C++ looks like "A::f(int)".  Let's drop the
    argument list, and maybe the scope.  */
 
    of decl_printable_name for C++ looks like "A::f(int)".  Let's drop the
    argument list, and maybe the scope.  */
 

-static char*
+static char *

 dwarf2_name (decl, scope)
      tree decl;
      int scope;
 dwarf2_name (decl, scope)
      tree decl;
      int scope;


@@ -4459,6 +4745,7 @@ dwarf2_name (decl, scope)
 }
 
 /* Add a new entry to .debug_pubnames if appropriate.  */
 }
 
 /* Add a new entry to .debug_pubnames if appropriate.  */

+

 static void
 add_pubname (decl, die)
      tree decl;
 static void
 add_pubname (decl, die)
      tree decl;


@@ -4475,6 +4762,7 @@ add_pubname (decl, die)
       pubname_table = (pubname_ref) xrealloc
        (pubname_table, pubname_table_allocated * sizeof (pubname_entry));
     }
       pubname_table = (pubname_ref) xrealloc
        (pubname_table, pubname_table_allocated * sizeof (pubname_entry));
     }

+

   p = &pubname_table[pubname_table_in_use++];
   p->die = die;
 
   p = &pubname_table[pubname_table_in_use++];
   p->die = die;
 


@@ -4484,65 +4772,60 @@ add_pubname (decl, die)
 /* Output the public names table used to speed up access to externally
    visible names.  For now, only generate entries for externally
    visible procedures.  */
 /* Output the public names table used to speed up access to externally
    visible names.  For now, only generate entries for externally
    visible procedures.  */

+

 static void
 output_pubnames ()
 {
   register unsigned i;
 static void
 output_pubnames ()
 {
   register unsigned i;

-  {
-    register unsigned long pubnames_length = size_of_pubnames ();
-    ASM_OUTPUT_DWARF_DATA (asm_out_file, pubnames_length);
-  }
+  register unsigned long pubnames_length = size_of_pubnames ();
+
+  ASM_OUTPUT_DWARF_DATA (asm_out_file, pubnames_length);
+

   if (flag_verbose_asm)
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s Length of Public Names Info.",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s Length of Public Names Info.",
+            ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA2 (asm_out_file, DWARF_VERSION);
   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA2 (asm_out_file, DWARF_VERSION);

+

   if (flag_verbose_asm)
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s DWARF Version",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s DWARF Version", ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_OFFSET (asm_out_file, stripattributes (DEBUG_SECTION));
   if (flag_verbose_asm)
   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_OFFSET (asm_out_file, stripattributes (DEBUG_SECTION));
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s Offset of Compilation Unit Info.",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s Offset of Compilation Unit Info.",
+            ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA (asm_out_file, next_die_offset);
   if (flag_verbose_asm)
   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA (asm_out_file, next_die_offset);
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s Compilation Unit Length",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s Compilation Unit Length", ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   for (i = 0; i < pubname_table_in_use; ++i)
     {
       register pubname_ref pub = &pubname_table[i];
   fputc ('\n', asm_out_file);
   for (i = 0; i < pubname_table_in_use; ++i)
     {
       register pubname_ref pub = &pubname_table[i];

+

       ASM_OUTPUT_DWARF_DATA (asm_out_file, pub->die->die_offset);
       if (flag_verbose_asm)
       ASM_OUTPUT_DWARF_DATA (asm_out_file, pub->die->die_offset);
       if (flag_verbose_asm)

-       {
-         fprintf (asm_out_file, "\t%s DIE offset",
-                  ASM_COMMENT_START);
-       }
+       fprintf (asm_out_file, "\t%s DIE offset", ASM_COMMENT_START);
+

       fputc ('\n', asm_out_file);
 
       ASM_OUTPUT_DWARF_STRING (asm_out_file, pub->name);
       if (flag_verbose_asm)
       fputc ('\n', asm_out_file);
 
       ASM_OUTPUT_DWARF_STRING (asm_out_file, pub->name);
       if (flag_verbose_asm)

-       {
-         fprintf (asm_out_file, "%s external name",
-                  ASM_COMMENT_START);
-       }
+       fprintf (asm_out_file, "%s external name", ASM_COMMENT_START);
+

       fputc ('\n', asm_out_file);
     }
       fputc ('\n', asm_out_file);
     }

+

   ASM_OUTPUT_DWARF_DATA (asm_out_file, 0);
   fputc ('\n', asm_out_file);
 }
 
 /* Add a new entry to .debug_aranges if appropriate.  */
   ASM_OUTPUT_DWARF_DATA (asm_out_file, 0);
   fputc ('\n', asm_out_file);
 }
 
 /* Add a new entry to .debug_aranges if appropriate.  */

+

 static void
 add_arange (decl, die)
      tree decl;
 static void
 add_arange (decl, die)
      tree decl;


@@ -4554,81 +4837,75 @@ add_arange (decl, die)
   if (arange_table_in_use == arange_table_allocated)
     {
       arange_table_allocated += ARANGE_TABLE_INCREMENT;
   if (arange_table_in_use == arange_table_allocated)
     {
       arange_table_allocated += ARANGE_TABLE_INCREMENT;

-      arange_table = (arange_ref) xrealloc
-       (arange_table, arange_table_allocated * sizeof (dw_die_ref));
+      arange_table
+       = (arange_ref) xrealloc (arange_table,
+                                arange_table_allocated * sizeof (dw_die_ref));

     }
     }

+

   arange_table[arange_table_in_use++] = die;
 }
 
 /* Output the information that goes into the .debug_aranges table.
    Namely, define the beginning and ending address range of the
    text section generated for this compilation unit.  */
   arange_table[arange_table_in_use++] = die;
 }
 
 /* Output the information that goes into the .debug_aranges table.
    Namely, define the beginning and ending address range of the
    text section generated for this compilation unit.  */

+

 static void
 output_aranges ()
 {
   register unsigned i;
 static void
 output_aranges ()
 {
   register unsigned i;

-  {
-    register unsigned long aranges_length = size_of_aranges ();
-    ASM_OUTPUT_DWARF_DATA (asm_out_file, aranges_length);
-  }
+  register unsigned long aranges_length = size_of_aranges ();
+
+  ASM_OUTPUT_DWARF_DATA (asm_out_file, aranges_length);

   if (flag_verbose_asm)
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s Length of Address Ranges Info.",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s Length of Address Ranges Info.",
+            ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA2 (asm_out_file, DWARF_VERSION);
   if (flag_verbose_asm)
   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA2 (asm_out_file, DWARF_VERSION);
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s DWARF Version",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s DWARF Version", ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_OFFSET (asm_out_file, stripattributes (DEBUG_SECTION));
   if (flag_verbose_asm)
   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_OFFSET (asm_out_file, stripattributes (DEBUG_SECTION));
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s Offset of Compilation Unit Info.",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s Offset of Compilation Unit Info.",
+            ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, PTR_SIZE);
   if (flag_verbose_asm)
   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, PTR_SIZE);
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s Size of Address",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s Size of Address", ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, 0);
   if (flag_verbose_asm)
   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, 0);
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s Size of Segment Descriptor",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s Size of Segment Descriptor",
+            ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA4 (asm_out_file, 4);
   if (PTR_SIZE == 8)
     fprintf (asm_out_file, ",0,0");
   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA4 (asm_out_file, 4);
   if (PTR_SIZE == 8)
     fprintf (asm_out_file, ",0,0");

+

   if (flag_verbose_asm)
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s Pad to %d byte boundary",
-              ASM_COMMENT_START, 2 * PTR_SIZE);
-    }
+    fprintf (asm_out_file, "\t%s Pad to %d byte boundary",
+            ASM_COMMENT_START, 2 * PTR_SIZE);
+

   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_ADDR (asm_out_file, TEXT_SECTION);
   if (flag_verbose_asm)
   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_ADDR (asm_out_file, TEXT_SECTION);
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s Address", ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s Address", ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_ADDR_DELTA (asm_out_file, text_end_label, TEXT_SECTION);
   if (flag_verbose_asm)
   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_ADDR_DELTA (asm_out_file, text_end_label, TEXT_SECTION);
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "%s Length", ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "%s Length", ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   for (i = 0; i < arange_table_in_use; ++i)
     {
       dw_die_ref a = arange_table[i];
   fputc ('\n', asm_out_file);
   for (i = 0; i < arange_table_in_use; ++i)
     {
       dw_die_ref a = arange_table[i];

+

       if (a->die_tag == DW_TAG_subprogram)
        ASM_OUTPUT_DWARF_ADDR (asm_out_file, get_AT_low_pc (a));
       else
       if (a->die_tag == DW_TAG_subprogram)
        ASM_OUTPUT_DWARF_ADDR (asm_out_file, get_AT_low_pc (a));
       else


@@ -4636,12 +4913,13 @@ output_aranges ()
          char *name = get_AT_string (a, DW_AT_MIPS_linkage_name);
          if (! name)
            name = get_AT_string (a, DW_AT_name);
          char *name = get_AT_string (a, DW_AT_MIPS_linkage_name);
          if (! name)
            name = get_AT_string (a, DW_AT_name);

+

          ASM_OUTPUT_DWARF_ADDR (asm_out_file, name);
        }
          ASM_OUTPUT_DWARF_ADDR (asm_out_file, name);
        }

-      if (flag_verbose_asm)
-       {
-         fprintf (asm_out_file, "\t%s Address", ASM_COMMENT_START);
-       }
+
+      if (flag_verbose_asm)
+       fprintf (asm_out_file, "\t%s Address", ASM_COMMENT_START);
+

       fputc ('\n', asm_out_file);
       if (a->die_tag == DW_TAG_subprogram)
        ASM_OUTPUT_DWARF_ADDR_DELTA (asm_out_file, get_AT_hi_pc (a),
       fputc ('\n', asm_out_file);
       if (a->die_tag == DW_TAG_subprogram)
        ASM_OUTPUT_DWARF_ADDR_DELTA (asm_out_file, get_AT_hi_pc (a),


@@ -4649,12 +4927,13 @@ output_aranges ()
       else
        ASM_OUTPUT_DWARF_ADDR_DATA (asm_out_file,
                                    get_AT_unsigned (a, DW_AT_byte_size));
       else
        ASM_OUTPUT_DWARF_ADDR_DATA (asm_out_file,
                                    get_AT_unsigned (a, DW_AT_byte_size));

+

       if (flag_verbose_asm)
       if (flag_verbose_asm)

-       {
-         fprintf (asm_out_file, "%s Length", ASM_COMMENT_START);
-       }
+       fprintf (asm_out_file, "%s Length", ASM_COMMENT_START);
+

       fputc ('\n', asm_out_file);
     }
       fputc ('\n', asm_out_file);
     }

+

   /* Output the terminator words.  */
   ASM_OUTPUT_DWARF_ADDR_DATA (asm_out_file, 0);
   fputc ('\n', asm_out_file);
   /* Output the terminator words.  */
   ASM_OUTPUT_DWARF_ADDR_DATA (asm_out_file, 0);
   fputc ('\n', asm_out_file);


@@ -4664,6 +4943,7 @@ output_aranges ()
 
 /* Output the source line number correspondence information.  This
    information goes into the .debug_line section.  */
 
 /* Output the source line number correspondence information.  This
    information goes into the .debug_line section.  */

+

 static void
 output_line_info ()
 {
 static void
 output_line_info ()
 {


@@ -4678,61 +4958,51 @@ output_line_info ()
   register long line_delta;
   register unsigned long current_file;
   register unsigned long function;
   register long line_delta;
   register unsigned long current_file;
   register unsigned long function;

+

   ASM_OUTPUT_DWARF_DATA (asm_out_file, size_of_line_info ());
   if (flag_verbose_asm)
   ASM_OUTPUT_DWARF_DATA (asm_out_file, size_of_line_info ());
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s Length of Source Line Info.",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s Length of Source Line Info.",
+            ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA2 (asm_out_file, DWARF_VERSION);
   if (flag_verbose_asm)
   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA2 (asm_out_file, DWARF_VERSION);
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s DWARF Version",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s DWARF Version", ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA (asm_out_file, size_of_line_prolog ());
   if (flag_verbose_asm)
   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA (asm_out_file, size_of_line_prolog ());
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s Prolog Length",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s Prolog Length", ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DWARF_LINE_MIN_INSTR_LENGTH);
   if (flag_verbose_asm)
   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DWARF_LINE_MIN_INSTR_LENGTH);
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s Minimum Instruction Length",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s Minimum Instruction Length",
+            ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DWARF_LINE_DEFAULT_IS_STMT_START);
   if (flag_verbose_asm)
   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DWARF_LINE_DEFAULT_IS_STMT_START);
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s Default is_stmt_start flag",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s Default is_stmt_start flag",
+            ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   fprintf (asm_out_file, "\t%s\t%d", ASM_BYTE_OP, DWARF_LINE_BASE);
   if (flag_verbose_asm)
   fputc ('\n', asm_out_file);
   fprintf (asm_out_file, "\t%s\t%d", ASM_BYTE_OP, DWARF_LINE_BASE);
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s Line Base Value (Special Opcodes)",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s Line Base Value (Special Opcodes)",
+            ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   fprintf (asm_out_file, "\t%s\t%u", ASM_BYTE_OP, DWARF_LINE_RANGE);
   if (flag_verbose_asm)
   fputc ('\n', asm_out_file);
   fprintf (asm_out_file, "\t%s\t%u", ASM_BYTE_OP, DWARF_LINE_RANGE);
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s Line Range Value (Special Opcodes)",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s Line Range Value (Special Opcodes)",
+            ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   fprintf (asm_out_file, "\t%s\t%u", ASM_BYTE_OP, DWARF_LINE_OPCODE_BASE);
   if (flag_verbose_asm)
   fputc ('\n', asm_out_file);
   fprintf (asm_out_file, "\t%s\t%u", ASM_BYTE_OP, DWARF_LINE_OPCODE_BASE);
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s Special Opcode Base",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s Special Opcode Base", ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   for (opc = 1; opc < DWARF_LINE_OPCODE_BASE; ++opc)
     {
   fputc ('\n', asm_out_file);
   for (opc = 1; opc < DWARF_LINE_OPCODE_BASE; ++opc)
     {


@@ -4751,43 +5021,42 @@ output_line_info ()
        }
       ASM_OUTPUT_DWARF_DATA1 (asm_out_file, n_op_args);
       if (flag_verbose_asm)
        }
       ASM_OUTPUT_DWARF_DATA1 (asm_out_file, n_op_args);
       if (flag_verbose_asm)

-       {
-         fprintf (asm_out_file, "\t%s opcode: 0x%x has %d args",
-                  ASM_COMMENT_START, opc, n_op_args);
-       }
+       fprintf (asm_out_file, "\t%s opcode: 0x%x has %d args",
+                ASM_COMMENT_START, opc, n_op_args);

       fputc ('\n', asm_out_file);
     }
       fputc ('\n', asm_out_file);
     }

+

   if (flag_verbose_asm)
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "%s Include Directory Table\n",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "%s Include Directory Table\n", ASM_COMMENT_START);
+

   /* Include directory table is empty, at present */
   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, 0);
   fputc ('\n', asm_out_file);
   if (flag_verbose_asm)
   /* Include directory table is empty, at present */
   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, 0);
   fputc ('\n', asm_out_file);
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "%s File Name Table\n", ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "%s File Name Table\n", ASM_COMMENT_START);
+

   for (ft_index = 1; ft_index < file_table_in_use; ++ft_index)
     {
       ASM_OUTPUT_DWARF_STRING (asm_out_file, file_table[ft_index]);
       if (flag_verbose_asm)
   for (ft_index = 1; ft_index < file_table_in_use; ++ft_index)
     {
       ASM_OUTPUT_DWARF_STRING (asm_out_file, file_table[ft_index]);
       if (flag_verbose_asm)

-       {
-         fprintf (asm_out_file, "%s File Entry: 0x%x",
-                  ASM_COMMENT_START, ft_index);
-       }
+       fprintf (asm_out_file, "%s File Entry: 0x%x",
+                ASM_COMMENT_START, ft_index);
+

       fputc ('\n', asm_out_file);
       fputc ('\n', asm_out_file);

+

       /* Include directory index */
       output_uleb128 (0);
       fputc ('\n', asm_out_file);
       /* Include directory index */
       output_uleb128 (0);
       fputc ('\n', asm_out_file);

+

       /* Modification time */
       output_uleb128 (0);
       fputc ('\n', asm_out_file);
       /* Modification time */
       output_uleb128 (0);
       fputc ('\n', asm_out_file);

+

       /* File length in bytes */
       output_uleb128 (0);
       fputc ('\n', asm_out_file);
     }
       /* File length in bytes */
       output_uleb128 (0);
       fputc ('\n', asm_out_file);
     }

+

   /* Terminate the file name table */
   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, 0);
   fputc ('\n', asm_out_file);
   /* Terminate the file name table */
   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, 0);
   fputc ('\n', asm_out_file);


@@ -4795,9 +5064,8 @@ output_line_info ()
   /* Set the address register to the first location in the text section */
   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, 0);
   if (flag_verbose_asm)
   /* Set the address register to the first location in the text section */
   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, 0);
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s DW_LNE_set_address", ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s DW_LNE_set_address", ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   output_uleb128 (1 + PTR_SIZE);
   fputc ('\n', asm_out_file);
   fputc ('\n', asm_out_file);
   output_uleb128 (1 + PTR_SIZE);
   fputc ('\n', asm_out_file);


@@ -4814,12 +5082,12 @@ output_line_info ()
   for (lt_index = 1; lt_index < line_info_table_in_use; ++lt_index)
     {
       register dw_line_info_ref line_info;
   for (lt_index = 1; lt_index < line_info_table_in_use; ++lt_index)
     {
       register dw_line_info_ref line_info;

+

       ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DW_LNS_fixed_advance_pc);
       if (flag_verbose_asm)
       ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DW_LNS_fixed_advance_pc);
       if (flag_verbose_asm)

-       {
-         fprintf (asm_out_file, "\t%s DW_LNS_fixed_advance_pc",
-                  ASM_COMMENT_START);
-       }
+       fprintf (asm_out_file, "\t%s DW_LNS_fixed_advance_pc",
+                ASM_COMMENT_START);
+

       fputc ('\n', asm_out_file);
       ASM_GENERATE_INTERNAL_LABEL (line_label, LINE_CODE_LABEL, lt_index);
       ASM_OUTPUT_DWARF_DELTA2 (asm_out_file, line_label, prev_line_label);
       fputc ('\n', asm_out_file);
       ASM_GENERATE_INTERNAL_LABEL (line_label, LINE_CODE_LABEL, lt_index);
       ASM_OUTPUT_DWARF_DELTA2 (asm_out_file, line_label, prev_line_label);


@@ -4830,16 +5098,16 @@ output_line_info ()
          current_file = line_info->dw_file_num;
          ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DW_LNS_set_file);
          if (flag_verbose_asm)
          current_file = line_info->dw_file_num;
          ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DW_LNS_set_file);
          if (flag_verbose_asm)

-           {
-             fprintf (asm_out_file,
-                      "\t%s DW_LNS_set_file", ASM_COMMENT_START);
-           }
+           fprintf (asm_out_file, "\t%s DW_LNS_set_file", ASM_COMMENT_START);
+

          fputc ('\n', asm_out_file);
          output_uleb128 (current_file);
          if (flag_verbose_asm)
            fprintf (asm_out_file, " (\"%s\")", file_table[current_file]);
          fputc ('\n', asm_out_file);
          output_uleb128 (current_file);
          if (flag_verbose_asm)
            fprintf (asm_out_file, " (\"%s\")", file_table[current_file]);

+

          fputc ('\n', asm_out_file);
        }
          fputc ('\n', asm_out_file);
        }

+

       line_offset = line_info->dw_line_num - current_line;
       line_delta = line_offset - DWARF_LINE_BASE;
       current_line = line_info->dw_line_num;
       line_offset = line_info->dw_line_num - current_line;
       line_delta = line_offset - DWARF_LINE_BASE;
       current_line = line_info->dw_line_num;


@@ -4848,36 +5116,32 @@ output_line_info ()
          ASM_OUTPUT_DWARF_DATA1 (asm_out_file,
                                  DWARF_LINE_OPCODE_BASE + line_delta);
          if (flag_verbose_asm)
          ASM_OUTPUT_DWARF_DATA1 (asm_out_file,
                                  DWARF_LINE_OPCODE_BASE + line_delta);
          if (flag_verbose_asm)

-           {

              fprintf (asm_out_file,
                       "\t%s line %d", ASM_COMMENT_START, current_line);
              fprintf (asm_out_file,
                       "\t%s line %d", ASM_COMMENT_START, current_line);

-           }
+

          fputc ('\n', asm_out_file);
        }
       else
        {
          ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DW_LNS_advance_line);
          if (flag_verbose_asm)
          fputc ('\n', asm_out_file);
        }
       else
        {
          ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DW_LNS_advance_line);
          if (flag_verbose_asm)

-           {
-             fprintf (asm_out_file,
-                      "\t%s advance to line %d",
-                      ASM_COMMENT_START, current_line);
-           }
+           fprintf (asm_out_file, "\t%s advance to line %d",
+                    ASM_COMMENT_START, current_line);
+

          fputc ('\n', asm_out_file);
          output_sleb128 (line_offset);
          fputc ('\n', asm_out_file);
          ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DW_LNS_copy);
          fputc ('\n', asm_out_file);
        }
          fputc ('\n', asm_out_file);
          output_sleb128 (line_offset);
          fputc ('\n', asm_out_file);
          ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DW_LNS_copy);
          fputc ('\n', asm_out_file);
        }

+

       strcpy (prev_line_label, line_label);
     }
 
   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DW_LNS_fixed_advance_pc);
   if (flag_verbose_asm)
       strcpy (prev_line_label, line_label);
     }
 
   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DW_LNS_fixed_advance_pc);
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s DW_LNS_fixed_advance_pc",
-              ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s DW_LNS_fixed_advance_pc", ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DELTA2 (asm_out_file, text_end_label, prev_line_label);
   fputc ('\n', asm_out_file);
   fputc ('\n', asm_out_file);
   ASM_OUTPUT_DWARF_DELTA2 (asm_out_file, text_end_label, prev_line_label);
   fputc ('\n', asm_out_file);


@@ -4885,9 +5149,8 @@ output_line_info ()
   /* Output the marker for the end of the line number info.  */
   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, 0);
   if (flag_verbose_asm)
   /* Output the marker for the end of the line number info.  */
   ASM_OUTPUT_DWARF_DATA1 (asm_out_file, 0);
   if (flag_verbose_asm)

-    {
-      fprintf (asm_out_file, "\t%s DW_LNE_end_sequence", ASM_COMMENT_START);
-    }
+    fprintf (asm_out_file, "\t%s DW_LNE_end_sequence", ASM_COMMENT_START);
+

   fputc ('\n', asm_out_file);
   output_uleb128 (1);
   fputc ('\n', asm_out_file);
   fputc ('\n', asm_out_file);
   output_uleb128 (1);
   fputc ('\n', asm_out_file);


@@ -4901,16 +5164,19 @@ output_line_info ()
     {
       register dw_separate_line_info_ref line_info
        = &separate_line_info_table[lt_index];
     {
       register dw_separate_line_info_ref line_info
        = &separate_line_info_table[lt_index];

+

       ASM_GENERATE_INTERNAL_LABEL (line_label, SEPARATE_LINE_CODE_LABEL,
                                   lt_index);
       if (function != line_info->function)
        {
          function = line_info->function;
       ASM_GENERATE_INTERNAL_LABEL (line_label, SEPARATE_LINE_CODE_LABEL,
                                   lt_index);
       if (function != line_info->function)
        {
          function = line_info->function;

+

          /* Set the address register to the first line in the function */
          ASM_OUTPUT_DWARF_DATA1 (asm_out_file, 0);
          if (flag_verbose_asm)
            fprintf (asm_out_file, "\t%s DW_LNE_set_address",
                     ASM_COMMENT_START);
          /* Set the address register to the first line in the function */
          ASM_OUTPUT_DWARF_DATA1 (asm_out_file, 0);
          if (flag_verbose_asm)
            fprintf (asm_out_file, "\t%s DW_LNE_set_address",
                     ASM_COMMENT_START);

+

          fputc ('\n', asm_out_file);
          output_uleb128 (1 + PTR_SIZE);
          fputc ('\n', asm_out_file);
          fputc ('\n', asm_out_file);
          output_uleb128 (1 + PTR_SIZE);
          fputc ('\n', asm_out_file);


@@ -4925,25 +5191,27 @@ output_line_info ()
          if (flag_verbose_asm)
            fprintf (asm_out_file, "\t%s DW_LNS_fixed_advance_pc",
                     ASM_COMMENT_START);
          if (flag_verbose_asm)
            fprintf (asm_out_file, "\t%s DW_LNS_fixed_advance_pc",
                     ASM_COMMENT_START);

+

          fputc ('\n', asm_out_file);
          ASM_OUTPUT_DWARF_DELTA2 (asm_out_file, line_label, prev_line_label);
          fputc ('\n', asm_out_file);
        }
          fputc ('\n', asm_out_file);
          ASM_OUTPUT_DWARF_DELTA2 (asm_out_file, line_label, prev_line_label);
          fputc ('\n', asm_out_file);
        }

+

       if (line_info->dw_file_num != current_file)
        {
          current_file = line_info->dw_file_num;
          ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DW_LNS_set_file);
          if (flag_verbose_asm)
       if (line_info->dw_file_num != current_file)
        {
          current_file = line_info->dw_file_num;
          ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DW_LNS_set_file);
          if (flag_verbose_asm)

-           {
-             fprintf (asm_out_file,
-                      "\t%s DW_LNS_set_file", ASM_COMMENT_START);
-           }
+           fprintf (asm_out_file, "\t%s DW_LNS_set_file", ASM_COMMENT_START);
+

          fputc ('\n', asm_out_file);
          output_uleb128 (current_file);
          if (flag_verbose_asm)
            fprintf (asm_out_file, " (\"%s\")", file_table[current_file]);
          fputc ('\n', asm_out_file);
          output_uleb128 (current_file);
          if (flag_verbose_asm)
            fprintf (asm_out_file, " (\"%s\")", file_table[current_file]);

+

          fputc ('\n', asm_out_file);
        }
          fputc ('\n', asm_out_file);
        }

+

       if (line_info->dw_line_num != current_line)
        {
          line_offset = line_info->dw_line_num - current_line;
       if (line_info->dw_line_num != current_line)
        {
          line_offset = line_info->dw_line_num - current_line;


@@ -4954,21 +5222,18 @@ output_line_info ()
              ASM_OUTPUT_DWARF_DATA1 (asm_out_file,
                                      DWARF_LINE_OPCODE_BASE + line_delta);
              if (flag_verbose_asm)
              ASM_OUTPUT_DWARF_DATA1 (asm_out_file,
                                      DWARF_LINE_OPCODE_BASE + line_delta);
              if (flag_verbose_asm)

-               {
-                 fprintf (asm_out_file,
-                          "\t%s line %d", ASM_COMMENT_START, current_line);
-               }
+               fprintf (asm_out_file,
+                        "\t%s line %d", ASM_COMMENT_START, current_line);
+

              fputc ('\n', asm_out_file);
            }
          else
            {
              ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DW_LNS_advance_line);
              if (flag_verbose_asm)
              fputc ('\n', asm_out_file);
            }
          else
            {
              ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DW_LNS_advance_line);
              if (flag_verbose_asm)

-               {
-                 fprintf (asm_out_file,
-                          "\t%s advance to line %d",
-                          ASM_COMMENT_START, current_line);
-               }
+               fprintf (asm_out_file, "\t%s advance to line %d",
+                        ASM_COMMENT_START, current_line);
+

              fputc ('\n', asm_out_file);
              output_sleb128 (line_offset);
              fputc ('\n', asm_out_file);
              fputc ('\n', asm_out_file);
              output_sleb128 (line_offset);
              fputc ('\n', asm_out_file);


@@ -4976,6 +5241,7 @@ output_line_info ()
              fputc ('\n', asm_out_file);
            }
        }
              fputc ('\n', asm_out_file);
            }
        }

+

       ++lt_index;
       strcpy (prev_line_label, line_label);
 
       ++lt_index;
       strcpy (prev_line_label, line_label);
 


@@ -4989,6 +5255,7 @@ output_line_info ()
          if (flag_verbose_asm)
            fprintf (asm_out_file, "\t%s DW_LNS_fixed_advance_pc",
                     ASM_COMMENT_START);
          if (flag_verbose_asm)
            fprintf (asm_out_file, "\t%s DW_LNS_fixed_advance_pc",
                     ASM_COMMENT_START);

+

          fputc ('\n', asm_out_file);
          ASM_GENERATE_INTERNAL_LABEL (line_label, FUNC_END_LABEL, function);
          ASM_OUTPUT_DWARF_DELTA2 (asm_out_file, line_label, prev_line_label);
          fputc ('\n', asm_out_file);
          ASM_GENERATE_INTERNAL_LABEL (line_label, FUNC_END_LABEL, function);
          ASM_OUTPUT_DWARF_DELTA2 (asm_out_file, line_label, prev_line_label);


@@ -4999,6 +5266,7 @@ output_line_info ()
          if (flag_verbose_asm)
            fprintf (asm_out_file, "\t%s DW_LNE_end_sequence",
                     ASM_COMMENT_START);
          if (flag_verbose_asm)
            fprintf (asm_out_file, "\t%s DW_LNE_end_sequence",
                     ASM_COMMENT_START);

+

          fputc ('\n', asm_out_file);
          output_uleb128 (1);
          fputc ('\n', asm_out_file);
          fputc ('\n', asm_out_file);
          output_uleb128 (1);
          fputc ('\n', asm_out_file);


@@ -5008,20 +5276,17 @@ output_line_info ()
     }
 }
 \f
     }
 }
 \f

-/**************** attribute support utilities ********************************/
-
-/*
- * Given a pointer to a BLOCK node return non-zero if (and only if) the node
- * in question represents the outermost pair of curly braces (i.e. the "body
- * block") of a function or method.
- *
- * For any BLOCK node representing a "body block" of a function or method, the
- * BLOCK_SUPERCONTEXT of the node will point to another BLOCK node which
- * represents the outermost (function) scope for the function or method (i.e.
- * the one which includes the formal parameters).  The BLOCK_SUPERCONTEXT of
- * *that* node in turn will point to the relevant FUNCTION_DECL node.
- */
-inline int
+/* Given a pointer to a BLOCK node return non-zero if (and only if) the node
+   in question represents the outermost pair of curly braces (i.e. the "body
+   block") of a function or method.
+
+   For any BLOCK node representing a "body block" of a function or method, the
+   BLOCK_SUPERCONTEXT of the node will point to another BLOCK node which
+   represents the outermost (function) scope for the function or method (i.e.
+   the one which includes the formal parameters).  The BLOCK_SUPERCONTEXT of
+   *that* node in turn will point to the relevant FUNCTION_DECL node. */
+
+static inline int

 is_body_block (stmt)
      register tree stmt;
 {
 is_body_block (stmt)
      register tree stmt;
 {


@@ -5037,6 +5302,7 @@ is_body_block (stmt)
            return 1;
        }
     }
            return 1;
        }
     }

+

   return 0;
 }
 
   return 0;
 }
 


@@ -5045,6 +5311,7 @@ is_body_block (stmt)
 
    This routine must only be called for GCC type nodes that correspond to
    Dwarf base (fundamental) types.  */
 
    This routine must only be called for GCC type nodes that correspond to
    Dwarf base (fundamental) types.  */

+

 static dw_die_ref
 base_type_die (type)
      register tree type;
 static dw_die_ref
 base_type_die (type)
      register tree type;


@@ -5052,17 +5319,15 @@ base_type_die (type)
   register dw_die_ref base_type_result;
   register char *type_name;
   register enum dwarf_type encoding;
   register dw_die_ref base_type_result;
   register char *type_name;
   register enum dwarf_type encoding;

+  register tree name = TYPE_NAME (type);

 
   if (TREE_CODE (type) == ERROR_MARK
       || TREE_CODE (type) == VOID_TYPE)
     return 0;
 
 
   if (TREE_CODE (type) == ERROR_MARK
       || TREE_CODE (type) == VOID_TYPE)
     return 0;
 

-  {
-    register tree name = TYPE_NAME (type);
-    if (TREE_CODE (name) == TYPE_DECL)
-      name = DECL_NAME (name);
-    type_name = IDENTIFIER_POINTER (name);
-  }
+  if (TREE_CODE (name) == TYPE_DECL)
+    name = DECL_NAME (name);
+  type_name = IDENTIFIER_POINTER (name);

 
   switch (TREE_CODE (type))
     {
 
   switch (TREE_CODE (type))
     {


@@ -5126,6 +5391,7 @@ base_type_die (type)
    type.  (This definition of the "root" type is recursive.) Also, the root
    type of a `const' qualified type or a `volatile' qualified type is the
    root type of the given type without the qualifiers.  */
    type.  (This definition of the "root" type is recursive.) Also, the root
    type of a `const' qualified type or a `volatile' qualified type is the
    root type of the given type without the qualifiers.  */

+

 static tree
 root_type (type)
      register tree type;
 static tree
 root_type (type)
      register tree type;


@@ -5149,7 +5415,8 @@ root_type (type)
 
 /* Given a pointer to an arbitrary ..._TYPE tree node, return non-zero if the
    given input type is a Dwarf "fundamental" type.  Otherwise return null.  */
 
 /* Given a pointer to an arbitrary ..._TYPE tree node, return non-zero if the
    given input type is a Dwarf "fundamental" type.  Otherwise return null.  */

-inline int
+
+static inline int

 is_base_type (type)
      register tree type;
 {
 is_base_type (type)
      register tree type;
 {


@@ -5182,11 +5449,13 @@ is_base_type (type)
     default:
       abort ();
     }
     default:
       abort ();
     }

+

   return 0;
 }
 
 /* Given a pointer to an arbitrary ..._TYPE tree node, return a debugging
    entry that chains various modifiers in front of the given type.  */
   return 0;
 }
 
 /* Given a pointer to an arbitrary ..._TYPE tree node, return a debugging
    entry that chains various modifiers in front of the given type.  */

+

 static dw_die_ref
 modified_type_die (type, is_const_type, is_volatile_type, context_die)
      register tree type;
 static dw_die_ref
 modified_type_die (type, is_const_type, is_volatile_type, context_die)
      register tree type;


@@ -5218,14 +5487,16 @@ modified_type_die (type, is_const_type, is_volatile_type, context_die)
              gen_type_die (type, context_die);
              mod_type_die = lookup_type_die (type);
            }
              gen_type_die (type, context_die);
              mod_type_die = lookup_type_die (type);
            }

+

          else if (is_const_type < TYPE_READONLY (dtype)
                   || is_volatile_type < TYPE_VOLATILE (dtype))
            /* cv-unqualified version of named type.  Just use the unnamed
               type to which it refers.  */
          else if (is_const_type < TYPE_READONLY (dtype)
                   || is_volatile_type < TYPE_VOLATILE (dtype))
            /* cv-unqualified version of named type.  Just use the unnamed
               type to which it refers.  */

-           mod_type_die = modified_type_die
-             (DECL_ORIGINAL_TYPE (TYPE_NAME (type)),
-              is_const_type, is_volatile_type);
-         /* else cv-qualified version of named type; fall through.  */
+           mod_type_die
+             = modified_type_die (DECL_ORIGINAL_TYPE (TYPE_NAME (type)),
+                                  is_const_type, is_volatile_type,
+                                  context_die);
+         /* Else cv-qualified version of named type; fall through.  */

        }
 
       if (mod_type_die)
        }
 
       if (mod_type_die)


@@ -5259,9 +5530,7 @@ modified_type_die (type, is_const_type, is_volatile_type, context_die)
          item_type = TREE_TYPE (type);
        }
       else if (is_base_type (type))
          item_type = TREE_TYPE (type);
        }
       else if (is_base_type (type))

-       {
-         mod_type_die = base_type_die (type);
-       }
+       mod_type_die = base_type_die (type);

       else
        {
          gen_type_die (type, context_die);
       else
        {
          gen_type_die (type, context_die);


@@ -5276,28 +5545,28 @@ modified_type_die (type, is_const_type, is_volatile_type, context_die)
          assert (mod_type_die != NULL);
        }
     }
          assert (mod_type_die != NULL);
        }
     }

+

   equate_type_number_to_die (type, mod_type_die);
   if (item_type)
   equate_type_number_to_die (type, mod_type_die);
   if (item_type)

-    {
-      /* We must do this after the equate_type_number_to_die call, in case
-        this is a recursive type.  This ensures that the modified_type_die
-        recursion will terminate even if the type is recursive.  Recursive
-        types are possible in Ada.  */
-      sub_die = modified_type_die (item_type,
-                                  TYPE_READONLY (item_type),
-                                  TYPE_VOLATILE (item_type),
-                                  context_die);
-    }
+    /* We must do this after the equate_type_number_to_die call, in case
+       this is a recursive type.  This ensures that the modified_type_die
+       recursion will terminate even if the type is recursive.  Recursive
+       types are possible in Ada.  */
+    sub_die = modified_type_die (item_type,
+                                TYPE_READONLY (item_type),
+                                TYPE_VOLATILE (item_type),
+                                context_die);
+

   if (sub_die != NULL)
   if (sub_die != NULL)

-    {
-      add_AT_die_ref (mod_type_die, DW_AT_type, sub_die);
-    }
+    add_AT_die_ref (mod_type_die, DW_AT_type, sub_die);
+

   return mod_type_die;
 }
 
 /* Given a pointer to an arbitrary ..._TYPE tree node, return true if it is
    an enumerated type.   */
   return mod_type_die;
 }
 
 /* Given a pointer to an arbitrary ..._TYPE tree node, return true if it is
    an enumerated type.   */

-inline int
+
+static inline int

 type_is_enum (type)
      register tree type;
 {
 type_is_enum (type)
      register tree type;
 {


@@ -5305,6 +5574,7 @@ type_is_enum (type)
 }
 
 /* Return the register number described by a given RTL node.  */
 }
 
 /* Return the register number described by a given RTL node.  */

+

 static unsigned
 reg_number (rtl)
      register rtx rtl;
 static unsigned
 reg_number (rtl)
      register rtx rtl;


@@ -5317,29 +5587,30 @@ reg_number (rtl)
                         regno);
       regno = 0;
     }
                         regno);
       regno = 0;
     }

+

   regno = DBX_REGISTER_NUMBER (regno);
   return regno;
 }
 
 /* Return a location descriptor that designates a machine register.  */
   regno = DBX_REGISTER_NUMBER (regno);
   return regno;
 }
 
 /* Return a location descriptor that designates a machine register.  */

+

 static dw_loc_descr_ref
 reg_loc_descriptor (rtl)
      register rtx rtl;
 {
   register dw_loc_descr_ref loc_result = NULL;
   register unsigned reg = reg_number (rtl);
 static dw_loc_descr_ref
 reg_loc_descriptor (rtl)
      register rtx rtl;
 {
   register dw_loc_descr_ref loc_result = NULL;
   register unsigned reg = reg_number (rtl);

+

   if (reg >= 0 && reg <= 31)
   if (reg >= 0 && reg <= 31)

-    {
-      loc_result = new_loc_descr (DW_OP_reg0 + reg, 0);
-    }
+    loc_result = new_loc_descr (DW_OP_reg0 + reg, 0, 0);

   else
   else

-    {
-      loc_result = new_loc_descr (DW_OP_regx, reg, 0);
-    }
+    loc_result = new_loc_descr (DW_OP_regx, reg, 0);
+

   return loc_result;
 }
 
 /* Return a location descriptor that designates a base+offset location.  */
   return loc_result;
 }
 
 /* Return a location descriptor that designates a base+offset location.  */

+

 static dw_loc_descr_ref
 based_loc_descr (reg, offset)
      unsigned reg;
 static dw_loc_descr_ref
 based_loc_descr (reg, offset)
      unsigned reg;


@@ -5352,39 +5623,38 @@ based_loc_descr (reg, offset)
   register unsigned fp_reg = DBX_REGISTER_NUMBER (frame_pointer_needed
                                                  ? HARD_FRAME_POINTER_REGNUM
                                                  : STACK_POINTER_REGNUM);
   register unsigned fp_reg = DBX_REGISTER_NUMBER (frame_pointer_needed
                                                  ? HARD_FRAME_POINTER_REGNUM
                                                  : STACK_POINTER_REGNUM);

+

   if (reg == fp_reg)
   if (reg == fp_reg)

-    {
-      loc_result = new_loc_descr (DW_OP_fbreg, offset, 0);
-    }
+    loc_result = new_loc_descr (DW_OP_fbreg, offset, 0);

   else if (reg >= 0 && reg <= 31)
   else if (reg >= 0 && reg <= 31)

-    {
-      loc_result = new_loc_descr (DW_OP_breg0 + reg, offset);
-    }
+    loc_result = new_loc_descr (DW_OP_breg0 + reg, offset, 0);

   else
   else

-    {
-      loc_result = new_loc_descr (DW_OP_bregx, reg, offset);
-    }
+    loc_result = new_loc_descr (DW_OP_bregx, reg, offset);
+

   return loc_result;
 }
 
 /* Return true if this RTL expression describes a base+offset calculation.  */
   return loc_result;
 }
 
 /* Return true if this RTL expression describes a base+offset calculation.  */

-inline int
+
+static inline int

 is_based_loc (rtl)
      register rtx rtl;
 {
 is_based_loc (rtl)
      register rtx rtl;
 {

-    return GET_CODE (rtl) == PLUS
-          && ((GET_CODE (XEXP (rtl, 0)) == REG
-               && GET_CODE (XEXP (rtl, 1)) == CONST_INT));
+    return (GET_CODE (rtl) == PLUS
+           && ((GET_CODE (XEXP (rtl, 0)) == REG
+                && GET_CODE (XEXP (rtl, 1)) == CONST_INT)));

 }
 
 /* The following routine converts the RTL for a variable or parameter
    (resident in memory) into an equivalent Dwarf representation of a
    mechanism for getting the address of that same variable onto the top of a
    hypothetical "address evaluation" stack.
 }
 
 /* The following routine converts the RTL for a variable or parameter
    (resident in memory) into an equivalent Dwarf representation of a
    mechanism for getting the address of that same variable onto the top of a
    hypothetical "address evaluation" stack.

+

    When creating memory location descriptors, we are effectively transforming
    the RTL for a memory-resident object into its Dwarf postfix expression
    equivalent.  This routine recursively descends an RTL tree, turning
    it into Dwarf postfix code as it goes.  */
    When creating memory location descriptors, we are effectively transforming
    the RTL for a memory-resident object into its Dwarf postfix expression
    equivalent.  This routine recursively descends an RTL tree, turning
    it into Dwarf postfix code as it goes.  */

+

 static dw_loc_descr_ref
 mem_loc_descriptor (rtl)
      register rtx rtl;
 static dw_loc_descr_ref
 mem_loc_descriptor (rtl)
      register rtx rtl;


@@ -5394,6 +5664,7 @@ mem_loc_descriptor (rtl)
      description of here will be the lowest numbered location which is
      actually within the array.  That's *not* necessarily the same as the
      zeroth element of the array.  */
      description of here will be the lowest numbered location which is
      actually within the array.  That's *not* necessarily the same as the
      zeroth element of the array.  */

+

   switch (GET_CODE (rtl))
     {
     case SUBREG:
   switch (GET_CODE (rtl))
     {
     case SUBREG:


@@ -5403,7 +5674,8 @@ mem_loc_descriptor (rtl)
          legitimate to make the Dwarf info refer to the whole register which
          contains the given subreg.  */
       rtl = XEXP (rtl, 0);
          legitimate to make the Dwarf info refer to the whole register which
          contains the given subreg.  */
       rtl = XEXP (rtl, 0);

-      /* Drop thru.  */
+
+      /* ... fall through ... */

 
     case REG:
       /* Whenever a register number forms a part of the description of the
 
     case REG:
       /* Whenever a register number forms a part of the description of the


@@ -5436,11 +5708,8 @@ mem_loc_descriptor (rtl)
 
     case PLUS:
       if (is_based_loc (rtl))
 
     case PLUS:
       if (is_based_loc (rtl))

-       {
-         mem_loc_result = based_loc_descr (
-                             reg_number (XEXP (rtl, 0)),
-                             INTVAL (XEXP (rtl, 1)));
-       }
+       mem_loc_result = based_loc_descr (reg_number (XEXP (rtl, 0)),
+                                         INTVAL (XEXP (rtl, 1)));

       else
        {
          add_loc_descr (&mem_loc_result, mem_loc_descriptor (XEXP (rtl, 0)));
       else
        {
          add_loc_descr (&mem_loc_result, mem_loc_descriptor (XEXP (rtl, 0)));


@@ -5464,6 +5733,7 @@ mem_loc_descriptor (rtl)
     default:
       abort ();
     }
     default:
       abort ();
     }

+

   return mem_loc_result;
 }
 
   return mem_loc_result;
 }
 


@@ -5472,6 +5742,7 @@ mem_loc_descriptor (rtl)
    register, we just generate an OP_REG and the register number.  For a
    memory location we provide a Dwarf postfix expression describing how to
    generate the (dynamic) address of the object onto the address stack.  */
    register, we just generate an OP_REG and the register number.  For a
    memory location we provide a Dwarf postfix expression describing how to
    generate the (dynamic) address of the object onto the address stack.  */

+

 static dw_loc_descr_ref
 loc_descriptor (rtl)
      register rtx rtl;
 static dw_loc_descr_ref
 loc_descriptor (rtl)
      register rtx rtl;


@@ -5480,15 +5751,14 @@ loc_descriptor (rtl)
   switch (GET_CODE (rtl))
     {
     case SUBREG:
   switch (GET_CODE (rtl))
     {
     case SUBREG:

-

       /* The case of a subreg may arise when we have a local (register)
          variable or a formal (register) parameter which doesn't quite fill
       /* The case of a subreg may arise when we have a local (register)
          variable or a formal (register) parameter which doesn't quite fill

-         up an entire register.       For now, just assume that it is
+         up an entire register.  For now, just assume that it is

          legitimate to make the Dwarf info refer to the whole register which
          contains the given subreg.  */
          legitimate to make the Dwarf info refer to the whole register which
          contains the given subreg.  */

-

       rtl = XEXP (rtl, 0);
       rtl = XEXP (rtl, 0);

-      /* fall through */
+
+      /* ... fall through ... */

 
     case REG:
       loc_result = reg_loc_descriptor (rtl);
 
     case REG:
       loc_result = reg_loc_descriptor (rtl);


@@ -5499,14 +5769,16 @@ loc_descriptor (rtl)
       break;
 
     default:
       break;
 
     default:

-      abort ();                        /* Should never happen */
+      abort ();

     }
     }

+

   return loc_result;
 }
 
 /* Given an unsigned value, round it up to the lowest multiple of `boundary'
    which is not less than the value itself.  */
   return loc_result;
 }
 
 /* Given an unsigned value, round it up to the lowest multiple of `boundary'
    which is not less than the value itself.  */

-inline unsigned
+
+static inline unsigned

 ceiling (value, boundary)
      register unsigned value;
      register unsigned boundary;
 ceiling (value, boundary)
      register unsigned value;
      register unsigned boundary;


@@ -5518,7 +5790,8 @@ ceiling (value, boundary)
    pointer to the declared type for the relevant field variable, or return
    `integer_type_node' if the given node turns out to be an
    ERROR_MARK node.  */
    pointer to the declared type for the relevant field variable, or return
    `integer_type_node' if the given node turns out to be an
    ERROR_MARK node.  */

-inline tree
+
+static inline tree

 field_type (decl)
      register tree decl;
 {
 field_type (decl)
      register tree decl;
 {


@@ -5528,7 +5801,7 @@ field_type (decl)
     return integer_type_node;
 
   type = DECL_BIT_FIELD_TYPE (decl);
     return integer_type_node;
 
   type = DECL_BIT_FIELD_TYPE (decl);

-  if (type == NULL)
+  if (type == NULL_TREE)

     type = TREE_TYPE (decl);
 
   return type;
     type = TREE_TYPE (decl);
 
   return type;


@@ -5538,7 +5811,8 @@ field_type (decl)
    node, return the alignment in bits for the type, or else return
    BITS_PER_WORD if the node actually turns out to be an
    ERROR_MARK node.  */
    node, return the alignment in bits for the type, or else return
    BITS_PER_WORD if the node actually turns out to be an
    ERROR_MARK node.  */

-inline unsigned
+
+static inline unsigned

 simple_type_align_in_bits (type)
      register tree type;
 {
 simple_type_align_in_bits (type)
      register tree type;
 {


@@ -5550,7 +5824,8 @@ simple_type_align_in_bits (type)
    return the alignment for the type if the type's size is not constant, or
    else return BITS_PER_WORD if the type actually turns out to be an
    ERROR_MARK node.  */
    return the alignment for the type if the type's size is not constant, or
    else return BITS_PER_WORD if the type actually turns out to be an
    ERROR_MARK node.  */

-inline unsigned
+
+static inline unsigned

 simple_type_size_in_bits (type)
      register tree type;
 {
 simple_type_size_in_bits (type)
      register tree type;
 {


@@ -5573,6 +5848,7 @@ simple_type_size_in_bits (type)
    determine what that offset is, either because the argument turns out to
    be a pointer to an ERROR_MARK node, or because the offset is actually
    variable.  (We can't handle the latter case just yet).  */
    determine what that offset is, either because the argument turns out to
    be a pointer to an ERROR_MARK node, or because the offset is actually
    variable.  (We can't handle the latter case just yet).  */

+

 static unsigned
 field_byte_offset (decl)
      register tree decl;
 static unsigned
 field_byte_offset (decl)
      register tree decl;


@@ -5610,10 +5886,9 @@ field_byte_offset (decl)
 
   if (TREE_CODE (field_size_tree) != INTEGER_CST)
     return 0;
 
   if (TREE_CODE (field_size_tree) != INTEGER_CST)
     return 0;

-  field_size_in_bits = (unsigned) TREE_INT_CST_LOW (field_size_tree);

 
 

+  field_size_in_bits = (unsigned) TREE_INT_CST_LOW (field_size_tree);

   type_size_in_bits = simple_type_size_in_bits (type);
   type_size_in_bits = simple_type_size_in_bits (type);

-

   type_align_in_bits = simple_type_align_in_bits (type);
   type_align_in_bytes = type_align_in_bits / BITS_PER_UNIT;
 
   type_align_in_bits = simple_type_align_in_bits (type);
   type_align_in_bytes = type_align_in_bits / BITS_PER_UNIT;
 


@@ -5673,18 +5948,15 @@ field_byte_offset (decl)
 
   return object_offset_in_bytes;
 }
 
   return object_offset_in_bytes;
 }

-
-

 \f
 \f

-/****************************** attributes *********************************/
-
-/* The following routines define various Dwarf attributes
-   (and any data associated with them).  */
+/* The following routines define various Dwarf attributes and any data
+   associated with them.  */

 
 
 /* Output the form of location attributes suitable for whole variables and
    whole parameters.  Note that the location attributes for struct fields are
    generated by the routine `data_member_location_attribute' below.  */
 
 
 /* Output the form of location attributes suitable for whole variables and
    whole parameters.  Note that the location attributes for struct fields are
    generated by the routine `data_member_location_attribute' below.  */

+

 static void
 add_location_attribute (die, rtl)
      dw_die_ref die;
 static void
 add_location_attribute (die, rtl)
      dw_die_ref die;


@@ -5707,21 +5979,18 @@ add_location_attribute (die, rtl)
      certain kinds of DIEs is used to indicate something else entirely...
      i.e. that the DIE represents an object declaration, but not a
      definition.  So sayeth the PLSIG.  */
      certain kinds of DIEs is used to indicate something else entirely...
      i.e. that the DIE represents an object declaration, but not a
      definition.  So sayeth the PLSIG.  */

+

   if (!is_pseudo_reg (rtl)
       && (GET_CODE (rtl) != MEM
          || !is_pseudo_reg (XEXP (rtl, 0))))
   if (!is_pseudo_reg (rtl)
       && (GET_CODE (rtl) != MEM
          || !is_pseudo_reg (XEXP (rtl, 0))))

-    {
-      loc_descr = loc_descriptor (eliminate_regs (rtl, 0, NULL_RTX, 0));
-    }
+    loc_descr = loc_descriptor (eliminate_regs (rtl, 0, NULL_RTX, 0));

 
 #ifdef MIPS_DEBUGGING_INFO
   /* ??? SGI's dwarf reader is buggy, and will not accept a zero size
      location descriptor.  Lets just use r0 for now to represent a
      variable that has been optimized away.  */
   if (loc_descr == NULL)
 
 #ifdef MIPS_DEBUGGING_INFO
   /* ??? SGI's dwarf reader is buggy, and will not accept a zero size
      location descriptor.  Lets just use r0 for now to represent a
      variable that has been optimized away.  */
   if (loc_descr == NULL)

-    {
-      loc_descr = loc_descriptor (gen_rtx (REG, word_mode, 0));
-    }
+    loc_descr = loc_descriptor (gen_rtx (REG, word_mode, 0));

 #endif
 
   add_AT_loc (die, DW_AT_location, loc_descr);
 #endif
 
   add_AT_loc (die, DW_AT_location, loc_descr);


@@ -5745,6 +6014,7 @@ add_location_attribute (die, rtl)
    (See the `byte_size_attribute' function below.)  It is also used
    when calculating the value of the DW_AT_bit_offset attribute.
    (See the `bit_offset_attribute' function below).  */
    (See the `byte_size_attribute' function below.)  It is also used
    when calculating the value of the DW_AT_bit_offset attribute.
    (See the `bit_offset_attribute' function below).  */

+

 static void
 add_data_member_location_attribute (die, decl)
      register dw_die_ref die;
 static void
 add_data_member_location_attribute (die, decl)
      register dw_die_ref die;


@@ -5762,6 +6032,7 @@ add_data_member_location_attribute (die, decl)
   /* The DWARF2 standard says that we should assume that the structure address
      is already on the stack, so we can specify a structure field address
      by using DW_OP_plus_uconst.  */
   /* The DWARF2 standard says that we should assume that the structure address
      is already on the stack, so we can specify a structure field address
      by using DW_OP_plus_uconst.  */

+

 #ifdef MIPS_DEBUGGING_INFO
   /* ??? The SGI dwarf reader does not handle the DW_OP_plus_uconst operator
      correctly.  It works only if we leave the offset on the stack.  */
 #ifdef MIPS_DEBUGGING_INFO
   /* ??? The SGI dwarf reader does not handle the DW_OP_plus_uconst operator
      correctly.  It works only if we leave the offset on the stack.  */


@@ -5769,6 +6040,7 @@ add_data_member_location_attribute (die, decl)
 #else
   op = DW_OP_plus_uconst;
 #endif
 #else
   op = DW_OP_plus_uconst;
 #endif

+

   loc_descr = new_loc_descr (op, offset, 0);
   add_AT_loc (die, DW_AT_data_member_location, loc_descr);
 }
   loc_descr = new_loc_descr (op, offset, 0);
   add_AT_loc (die, DW_AT_data_member_location, loc_descr);
 }


@@ -5778,6 +6050,7 @@ add_data_member_location_attribute (die, decl)
    things can arise in GNU C when a constant is passed as an actual parameter
    to an inlined function.  They can also arise in C++ where declared
    constants do not necessarily get memory "homes".  */
    things can arise in GNU C when a constant is passed as an actual parameter
    to an inlined function.  They can also arise in C++ where declared
    constants do not necessarily get memory "homes".  */

+

 static void
 add_const_value_attribute (die, rtl)
      register dw_die_ref die;
 static void
 add_const_value_attribute (die, rtl)
      register dw_die_ref die;


@@ -5804,42 +6077,30 @@ add_const_value_attribute (die, rtl)
 
        if (GET_MODE_CLASS (mode) == MODE_FLOAT)
          {
 
        if (GET_MODE_CLASS (mode) == MODE_FLOAT)
          {

-           union real_extract u;
-           jmp_buf handler;
-           register unsigned length = GET_MODE_SIZE (mode) / 4;
-           register long *array = (long *) xmalloc (length * sizeof (long));
-           
-           bcopy ((char *) &CONST_DOUBLE_LOW (rtl), (char *) &u, sizeof u);
-
-           if (setjmp (handler))
-             {
-               error ("floating point trap outputting debug info");
-               u.d = dconst0;
-             }
-
-           set_float_handler (handler);
+           register unsigned length = GET_MODE_SIZE (mode) / sizeof (long);
+           long array[4];
+           REAL_VALUE_TYPE rv;

 
 

+           REAL_VALUE_FROM_CONST_DOUBLE (rv, rtl);

            switch (mode)
              {
              case SFmode:
            switch (mode)
              {
              case SFmode:

-               REAL_VALUE_TO_TARGET_SINGLE (u.d, array[0]);
+               REAL_VALUE_TO_TARGET_SINGLE (rv, array[0]);

                break;
 
              case DFmode:
                break;
 
              case DFmode:

-               REAL_VALUE_TO_TARGET_DOUBLE (u.d, array);
+               REAL_VALUE_TO_TARGET_DOUBLE (rv, array);

                break;
 
              case XFmode:
              case TFmode:
                break;
 
              case XFmode:
              case TFmode:

-               REAL_VALUE_TO_TARGET_LONG_DOUBLE (u.d, array);
+               REAL_VALUE_TO_TARGET_LONG_DOUBLE (rv, array);

                break;
 
              default:
                abort ();
              }
 
                break;
 
              default:
                abort ();
              }
 

-           set_float_handler (NULL_PTR);
-

            add_AT_float (die, DW_AT_const_value, length, array);
          }
        else
            add_AT_float (die, DW_AT_const_value, length, array);
          }
        else


@@ -5891,6 +6152,7 @@ add_const_value_attribute (die, rtl)
    constant value which can be passed into an inlined function is a constant
    pointer.  This can happen for example if an actual argument in an inlined
    function call evaluates to a compile-time constant address.  */
    constant value which can be passed into an inlined function is a constant
    pointer.  This can happen for example if an actual argument in an inlined
    function call evaluates to a compile-time constant address.  */

+

 static void
 add_location_or_const_value_attribute (die, decl)
      register dw_die_ref die;
 static void
 add_location_or_const_value_attribute (die, decl)
      register dw_die_ref die;


@@ -5901,80 +6163,84 @@ add_location_or_const_value_attribute (die, decl)
   register tree passed_type;
 
   if (TREE_CODE (decl) == ERROR_MARK)
   register tree passed_type;
 
   if (TREE_CODE (decl) == ERROR_MARK)

-    {
-      return;
-    }
-  if ((TREE_CODE (decl) != VAR_DECL)
-      && (TREE_CODE (decl) != PARM_DECL))
-    {
-      /* Should never happen.  */
-      abort ();
-      return;
-    }
+    return;
+
+  if (TREE_CODE (decl) != VAR_DECL && TREE_CODE (decl) != PARM_DECL)
+    abort ();
+

   /* Here we have to decide where we are going to say the parameter "lives"
      (as far as the debugger is concerned).  We only have a couple of
      choices.  GCC provides us with DECL_RTL and with DECL_INCOMING_RTL.
   /* Here we have to decide where we are going to say the parameter "lives"
      (as far as the debugger is concerned).  We only have a couple of
      choices.  GCC provides us with DECL_RTL and with DECL_INCOMING_RTL.

+

      DECL_RTL normally indicates where the parameter lives during most of the 
      DECL_RTL normally indicates where the parameter lives during most of the 

-     activa- tion of the function.  If optimization is enabled however, this
+     activation of the function.  If optimization is enabled however, this

      could be either NULL or else a pseudo-reg.  Both of those cases indicate 
      that the parameter doesn't really live anywhere (as far as the code
      generation parts of GCC are concerned) during most of the function's
      activation.  That will happen (for example) if the parameter is never
      could be either NULL or else a pseudo-reg.  Both of those cases indicate 
      that the parameter doesn't really live anywhere (as far as the code
      generation parts of GCC are concerned) during most of the function's
      activation.  That will happen (for example) if the parameter is never

-     referenced within the function.  We could just generate a location
-     descriptor here for all non-NULL non-pseudo values of DECL_RTL and
-     ignore all of the rest, but we can be a little nicer than that if we
-     also consider DECL_INCOMING_RTL in cases where DECL_RTL is NULL or is a
-     pseudo-reg. Note however that we can only get away with using
-     DECL_INCOMING_RTL as a backup substitute for DECL_RTL in certain limited 
-     cases.  In cases where DECL_ARG_TYPE(decl) indicates the same type as
-     TREE_TYPE(decl) we can be sure that the parameter was passed using the
-     same type as it is declared to have within the function, and that its
-     DECL_INCOMING_RTL points us to a place where a value of that type is
-     passed.  In cases where DECL_ARG_TYPE(decl) and TREE_TYPE(decl) are
-     different types however, we cannot (in general) use DECL_INCOMING_RTL as 
-     a backup substitute for DECL_RTL because in these cases,
-     DECL_INCOMING_RTL points us to a value of some type which is *different* 
-     from the type of the parameter itself.  Thus, if we tried to use
-     DECL_INCOMING_RTL to generate a location attribute in such cases, the
-     debugger would end up (for example) trying to fetch a `float' from a
-     place which actually contains the first part of a `double'.  That would
-     lead to really incorrect and confusing output at debug-time, and we
-     don't want that now do we? So in general, we DO NOT use
-     DECL_INCOMING_RTL as a backup for DECL_RTL in cases where
-     DECL_ARG_TYPE(decl) != TREE_TYPE(decl).  There are a couple of cute
-     exceptions however.  On little-endian machines we can get away with
-     using DECL_INCOMING_RTL even when DECL_ARG_TYPE(decl) is not the same as 
-     TREE_TYPE(decl) but only when DECL_ARG_TYPE(decl) is an integral type
-     which is smaller than TREE_TYPE(decl). These cases arise when (on a
-     little-endian machine) a non-prototyped function has a parameter
-     declared to be of type `short' or `char'.  In such cases,
-     TREE_TYPE(decl) will be `short' or `char', DECL_ARG_TYPE(decl) will be
-     `int', and DECL_INCOMING_RTL will point to the lowest-order byte of the
-     passed `int' value.  If the debugger then uses that address to fetch a
-     `short' or a `char' (on a little-endian machine) the result will be the
-     correct data, so we allow for such exceptional cases below. Note that
-     our goal here is to describe the place where the given formal parameter
-     lives during most of the function's activation (i.e. between the end of
-     the prologue and the start of the epilogue).  We'll do that as best as
-     we can. Note however that if the given formal parameter is modified
-     sometime during the execution of the function, then a stack backtrace
-     (at debug-time) will show the function as having been called with the
-     *new* value rather than the value which was originally passed in.  This
-     happens rarely enough that it is not a major problem, but it *is* a
-     problem, and I'd like to fix it.  A future version of dwarf2out.c may
-     generate two additional attributes for any given DW_TAG_formal_parameter 
-     DIE which will describe the "passed type" and the "passed location" for
-     the given formal parameter in addition to the attributes we now generate 
-     to indicate the "declared type" and the "active location" for each
-     parameter.  This additional set of attributes could be used by debuggers 
-     for stack backtraces. Separately, note that sometimes DECL_RTL can be
-     NULL and DECL_INCOMING_RTL can be NULL also.  This happens (for example) 
-     for inlined-instances of inline function formal parameters which are
-     never referenced.  This really shouldn't be happening.  All PARM_DECL
-     nodes should get valid non-NULL DECL_INCOMING_RTL values, but
-     integrate.c doesn't currently generate these values for inlined
-     instances of inline function parameters, so when we see such cases, we
-     are just SOL (shit-out-of-luck) for the time being (until integrate.c
+     referenced within the function.
+
+     We could just generate a location descriptor here for all non-NULL
+     non-pseudo values of DECL_RTL and ignore all of the rest, but we can be
+     a little nicer than that if we also consider DECL_INCOMING_RTL in cases
+     where DECL_RTL is NULL or is a pseudo-reg.
+
+     Note however that we can only get away with using DECL_INCOMING_RTL as
+     a backup substitute for DECL_RTL in certain limited cases.  In cases
+     where DECL_ARG_TYPE (decl) indicates the same type as TREE_TYPE (decl),
+     we can be sure that the parameter was passed using the same type as it is
+     declared to have within the function, and that its DECL_INCOMING_RTL
+     points us to a place where a value of that type is passed.
+
+     In cases where DECL_ARG_TYPE (decl) and TREE_TYPE (decl) are different,
+     we cannot (in general) use DECL_INCOMING_RTL as a substitute for DECL_RTL
+     because in these cases DECL_INCOMING_RTL points us to a value of some
+     type which is *different* from the type of the parameter itself.  Thus,
+     if we tried to use DECL_INCOMING_RTL to generate a location attribute in
+     such cases, the debugger would end up (for example) trying to fetch a
+     `float' from a place which actually contains the first part of a
+     `double'.  That would lead to really incorrect and confusing
+     output at debug-time.
+
+     So, in general, we *do not* use DECL_INCOMING_RTL as a backup for DECL_RTL
+     in cases where DECL_ARG_TYPE (decl) != TREE_TYPE (decl).  There
+     are a couple of exceptions however.  On little-endian machines we can
+     get away with using DECL_INCOMING_RTL even when DECL_ARG_TYPE (decl) is
+     not the same as TREE_TYPE (decl), but only when DECL_ARG_TYPE (decl) is
+     an integral type that is smaller than TREE_TYPE (decl). These cases arise
+     when (on a little-endian machine) a non-prototyped function has a
+     parameter declared to be of type `short' or `char'.  In such cases,
+     TREE_TYPE (decl) will be `short' or `char', DECL_ARG_TYPE (decl) will
+     be `int', and DECL_INCOMING_RTL will point to the lowest-order byte of the
+     passed `int' value.  If the debugger then uses that address to fetch
+     a `short' or a `char' (on a little-endian machine) the result will be
+     the correct data, so we allow for such exceptional cases below.
+
+     Note that our goal here is to describe the place where the given formal
+     parameter lives during most of the function's activation (i.e. between
+     the end of the prologue and the start of the epilogue).  We'll do that
+     as best as we can. Note however that if the given formal parameter is
+     modified sometime during the execution of the function, then a stack
+     backtrace (at debug-time) will show the function as having been
+     called with the *new* value rather than the value which was
+     originally passed in.  This happens rarely enough that it is not
+     a major problem, but it *is* a problem, and I'd like to fix it.
+
+     A future version of dwarf2out.c may generate two additional
+     attributes for any given DW_TAG_formal_parameter DIE which will
+     describe the "passed type" and the "passed location" for the
+     given formal parameter in addition to the attributes we now
+     generate to indicate the "declared type" and the "active
+     location" for each parameter.  This additional set of attributes
+     could be used by debuggers for stack backtraces. Separately, note
+     that sometimes DECL_RTL can be NULL and DECL_INCOMING_RTL can be
+     NULL also.  This happens (for example) for inlined-instances of
+     inline function formal parameters which are never referenced.
+     This really shouldn't be happening.  All PARM_DECL nodes should
+     get valid non-NULL DECL_INCOMING_RTL values, but integrate.c
+     doesn't currently generate these values for inlined instances of
+     inline function parameters, so when we see such cases, we are
+     just SOL (shit-out-of-luck) for the time being (until integrate.c

      gets fixed).  */
 
   /* Use DECL_RTL as the "location" unless we find something better.  */
      gets fixed).  */
 
   /* Use DECL_RTL as the "location" unless we find something better.  */


@@ -5986,27 +6252,19 @@ add_location_or_const_value_attribute (die, decl)
        {
          declared_type = type_main_variant (TREE_TYPE (decl));
          passed_type = type_main_variant (DECL_ARG_TYPE (decl));
        {
          declared_type = type_main_variant (TREE_TYPE (decl));
          passed_type = type_main_variant (DECL_ARG_TYPE (decl));

-         /* This decl represents a formal parameter which was
-            optimized out.

 
 

+         /* This decl represents a formal parameter which was optimized out.

             Note that DECL_INCOMING_RTL may be NULL in here, but we handle
             all* cases where (rtl == NULL_RTX) just below.  */
          if (declared_type == passed_type)
             Note that DECL_INCOMING_RTL may be NULL in here, but we handle
             all* cases where (rtl == NULL_RTX) just below.  */
          if (declared_type == passed_type)

-           {
-             rtl = DECL_INCOMING_RTL (decl);
-           }
-         else if (!BYTES_BIG_ENDIAN)
-           {
-             if (TREE_CODE (declared_type) == INTEGER_TYPE)
-               {
-                 if (TYPE_SIZE (declared_type) <= TYPE_SIZE (passed_type))
-                   {
-                     rtl = DECL_INCOMING_RTL (decl);
-                   }
-               }
-           }
+           rtl = DECL_INCOMING_RTL (decl);
+         else if (! BYTES_BIG_ENDIAN
+                  && TREE_CODE (declared_type) == INTEGER_TYPE
+                  && TYPE_SIZE (declared_type) <= TYPE_SIZE (passed_type))
+               rtl = DECL_INCOMING_RTL (decl);

        }
     }
        }
     }

+

   if (rtl == NULL_RTX)
     return;
 
   if (rtl == NULL_RTX)
     return;
 


@@ -6030,25 +6288,25 @@ add_location_or_const_value_attribute (die, decl)
       break;
 
     default:
       break;
 
     default:

-      abort ();                        /* Should never happen.  */
+      abort ();

     }
 }
 
 /* Generate an DW_AT_name attribute given some string value to be included as
    the value of the attribute.  */
     }
 }
 
 /* Generate an DW_AT_name attribute given some string value to be included as
    the value of the attribute.  */

-inline void
+
+static inline void

 add_name_attribute (die, name_string)
      register dw_die_ref die;
      register char *name_string;
 {
 add_name_attribute (die, name_string)
      register dw_die_ref die;
      register char *name_string;
 {

-  if (name_string && *name_string)
-    {
-      add_AT_string (die, DW_AT_name, name_string);
-    }
+  if (name_string != NULL && *name_string != 0)
+    add_AT_string (die, DW_AT_name, name_string);

 }
 
 /* Given a tree node describing an array bound (either lower or upper) output
    a representation for that bound.  */
 }
 
 /* Given a tree node describing an array bound (either lower or upper) output
    a representation for that bound.  */

+

 static void
 add_bound_info (subrange_die, bound_attr, bound)
      register dw_die_ref subrange_die;
 static void
 add_bound_info (subrange_die, bound_attr, bound)
      register dw_die_ref subrange_die;


@@ -6110,13 +6368,15 @@ add_bound_info (subrange_die, bound_attr, bound)
          add_location_attribute (decl_die, SAVE_EXPR_RTL (bound));
          add_AT_die_ref (subrange_die, bound_attr, decl_die);
        }
          add_location_attribute (decl_die, SAVE_EXPR_RTL (bound));
          add_AT_die_ref (subrange_die, bound_attr, decl_die);
        }

-      /* else leave out the attribute.  */
+
+      /* Else leave out the attribute.  */

       break;
     }
 }
 
 /* Note that the block of subscript information for an array type also
    includes information about the element type of type given array type.  */
       break;
     }
 }
 
 /* Note that the block of subscript information for an array type also
    includes information about the element type of type given array type.  */

+

 static void
 add_subscript_info (type_die, type)
      register dw_die_ref type_die;
 static void
 add_subscript_info (type_die, type)
      register dw_die_ref type_die;


@@ -6134,6 +6394,7 @@ add_subscript_info (type_die, type)
      compression in C (because there is no difference between an array or
      arrays and a multidimensional array in C) but for other source languages 
      (e.g. Ada) we probably shouldn't do this.  */
      compression in C (because there is no difference between an array or
      arrays and a multidimensional array in C) but for other source languages 
      (e.g. Ada) we probably shouldn't do this.  */

+

   /* ??? The SGI dwarf reader fails for multidimensional arrays with a
      const enum type.  E.g. const enum machine_mode insn_operand_mode[2][10].
      We work around this by disabling this feature.  See also
   /* ??? The SGI dwarf reader fails for multidimensional arrays with a
      const enum type.  E.g. const enum machine_mode insn_operand_mode[2][10].
      We work around this by disabling this feature.  See also


@@ -6165,11 +6426,11 @@ add_subscript_info (type_die, type)
          add_bound_info (subrange_die, DW_AT_upper_bound, upper);
        }
       else
          add_bound_info (subrange_die, DW_AT_upper_bound, upper);
        }
       else

-       {
-         /* We have an array type with an unspecified length.  The DWARF-2
+       /* We have an array type with an unspecified length.  The DWARF-2

             spec does not say how to handle this; let's just leave out the
             bounds.  */
             spec does not say how to handle this; let's just leave out the
             bounds.  */

-       }
+       ;
+

 #ifndef MIPS_DEBUGGING_INFO
     }
 #endif
 #ifndef MIPS_DEBUGGING_INFO
     }
 #endif


@@ -6228,7 +6489,8 @@ add_byte_size_attribute (die, tree_node)
    Note that it is the size (in bytes) of the hypothetical "containing object"
    which will be given in the DW_AT_byte_size attribute for this bit-field.
    (See `byte_size_attribute' above).  */
    Note that it is the size (in bytes) of the hypothetical "containing object"
    which will be given in the DW_AT_byte_size attribute for this bit-field.
    (See `byte_size_attribute' above).  */

-inline void
+
+static inline void

 add_bit_offset_attribute (die, decl)
      register dw_die_ref die;
      register tree decl;
 add_bit_offset_attribute (die, decl)
      register dw_die_ref die;
      register tree decl;


@@ -6248,9 +6510,8 @@ add_bit_offset_attribute (die, decl)
      encounter such things, just return without generating any attribute
      whatsoever.  */
   if (TREE_CODE (bitpos_tree) != INTEGER_CST)
      encounter such things, just return without generating any attribute
      whatsoever.  */
   if (TREE_CODE (bitpos_tree) != INTEGER_CST)

-    {
-      return;
-    }
+    return;
+

   bitpos_int = (unsigned) TREE_INT_CST_LOW (bitpos_tree);
 
   /* Note that the bit offset is always the distance (in bits) from the
   bitpos_int = (unsigned) TREE_INT_CST_LOW (bitpos_tree);
 
   /* Note that the bit offset is always the distance (in bits) from the


@@ -6261,24 +6522,26 @@ add_bit_offset_attribute (die, decl)
   highest_order_object_bit_offset = object_offset_in_bytes * BITS_PER_UNIT;
   highest_order_field_bit_offset = bitpos_int;
 
   highest_order_object_bit_offset = object_offset_in_bytes * BITS_PER_UNIT;
   highest_order_field_bit_offset = bitpos_int;
 

-  if (!BYTES_BIG_ENDIAN)
+  if (! BYTES_BIG_ENDIAN)

     {
       highest_order_field_bit_offset
        += (unsigned) TREE_INT_CST_LOW (DECL_SIZE (decl));
 
       highest_order_object_bit_offset += simple_type_size_in_bits (type);
     }
     {
       highest_order_field_bit_offset
        += (unsigned) TREE_INT_CST_LOW (DECL_SIZE (decl));
 
       highest_order_object_bit_offset += simple_type_size_in_bits (type);
     }

-  bit_offset =
-    (!BYTES_BIG_ENDIAN
-     ? highest_order_object_bit_offset - highest_order_field_bit_offset
-     : highest_order_field_bit_offset - highest_order_object_bit_offset);
+
+  bit_offset
+    = (! BYTES_BIG_ENDIAN
+       ? highest_order_object_bit_offset - highest_order_field_bit_offset
+       : highest_order_field_bit_offset - highest_order_object_bit_offset);

 
   add_AT_unsigned (die, DW_AT_bit_offset, bit_offset);
 }
 
 /* For a FIELD_DECL node which represents a bit field, output an attribute
    which specifies the length in bits of the given field.  */
 
   add_AT_unsigned (die, DW_AT_bit_offset, bit_offset);
 }
 
 /* For a FIELD_DECL node which represents a bit field, output an attribute
    which specifies the length in bits of the given field.  */

-inline void
+
+static inline void

 add_bit_size_attribute (die, decl)
      register dw_die_ref die;
      register tree decl;
 add_bit_size_attribute (die, decl)
      register dw_die_ref die;
      register tree decl;


@@ -6291,7 +6554,8 @@ add_bit_size_attribute (die, decl)
 
 /* If the compiled language is ANSI C, then add a 'prototyped'
    attribute, if arg types are given for the parameters of a function.  */
 
 /* If the compiled language is ANSI C, then add a 'prototyped'
    attribute, if arg types are given for the parameters of a function.  */

-inline void
+
+static inline void

 add_prototyped_attribute (die, func_type)
      register dw_die_ref die;
      register tree func_type;
 add_prototyped_attribute (die, func_type)
      register dw_die_ref die;
      register tree func_type;


@@ -6305,26 +6569,24 @@ add_prototyped_attribute (die, func_type)
 /* Add an 'abstract_origin' attribute below a given DIE.  The DIE is found
    by looking in either the type declaration or object declaration
    equate table.  */
 /* Add an 'abstract_origin' attribute below a given DIE.  The DIE is found
    by looking in either the type declaration or object declaration
    equate table.  */

-inline void
+
+static inline void

 add_abstract_origin_attribute (die, origin)
      register dw_die_ref die;
      register tree origin;
 {
   dw_die_ref origin_die = NULL;
   if (TREE_CODE_CLASS (TREE_CODE (origin)) == 'd')
 add_abstract_origin_attribute (die, origin)
      register dw_die_ref die;
      register tree origin;
 {
   dw_die_ref origin_die = NULL;
   if (TREE_CODE_CLASS (TREE_CODE (origin)) == 'd')

-    {
-      origin_die = lookup_decl_die (origin);
-    }
+    origin_die = lookup_decl_die (origin);

   else if (TREE_CODE_CLASS (TREE_CODE (origin)) == 't')
   else if (TREE_CODE_CLASS (TREE_CODE (origin)) == 't')

-    {
-      origin_die = lookup_type_die (origin);
-    }
+    origin_die = lookup_type_die (origin);
+

   add_AT_die_ref (die, DW_AT_abstract_origin, origin_die);
 }
 
 /* We do not currently support the pure_virtual attribute.  */
 
   add_AT_die_ref (die, DW_AT_abstract_origin, origin_die);
 }
 
 /* We do not currently support the pure_virtual attribute.  */
 

-inline void
+static inline void

 add_pure_or_virtual_attribute (die, func_decl)
      register dw_die_ref die;
      register tree func_decl;
 add_pure_or_virtual_attribute (die, func_decl)
      register dw_die_ref die;
      register tree func_decl;


@@ -6332,8 +6594,11 @@ add_pure_or_virtual_attribute (die, func_decl)
   if (DECL_VINDEX (func_decl))
     {
       add_AT_unsigned (die, DW_AT_virtuality, DW_VIRTUALITY_virtual);
   if (DECL_VINDEX (func_decl))
     {
       add_AT_unsigned (die, DW_AT_virtuality, DW_VIRTUALITY_virtual);

-      add_AT_loc (die, DW_AT_vtable_elem_location, new_loc_descr
-                 (DW_OP_constu, TREE_INT_CST_LOW (DECL_VINDEX (func_decl))));
+      add_AT_loc (die, DW_AT_vtable_elem_location,
+                 new_loc_descr (DW_OP_constu,
+                                TREE_INT_CST_LOW (DECL_VINDEX (func_decl)),
+                                0));
+

       /* GNU extension: Record what type this method came from originally.  */
       if (debug_info_level > DINFO_LEVEL_TERSE)
        add_AT_die_ref (die, DW_AT_containing_type,
       /* GNU extension: Record what type this method came from originally.  */
       if (debug_info_level > DINFO_LEVEL_TERSE)
        add_AT_die_ref (die, DW_AT_containing_type,


@@ -6341,29 +6606,31 @@ add_pure_or_virtual_attribute (die, func_decl)
     }
 }
 \f
     }
 }
 \f

-/********************* utility routines for DIEs *************************/
-

 /* Add source coordinate attributes for the given decl.  */
 /* Add source coordinate attributes for the given decl.  */

+

 static void
 add_src_coords_attributes (die, decl)
      register dw_die_ref die;
      register tree decl;
 {
   register unsigned file_index = lookup_filename (DECL_SOURCE_FILE (decl));
 static void
 add_src_coords_attributes (die, decl)
      register dw_die_ref die;
      register tree decl;
 {
   register unsigned file_index = lookup_filename (DECL_SOURCE_FILE (decl));

+

   add_AT_unsigned (die, DW_AT_decl_file, file_index);
   add_AT_unsigned (die, DW_AT_decl_line, DECL_SOURCE_LINE (decl));
 }
 
 /* Add an DW_AT_name attribute and source coordinate attribute for the
    given decl, but only if it actually has a name.  */
   add_AT_unsigned (die, DW_AT_decl_file, file_index);
   add_AT_unsigned (die, DW_AT_decl_line, DECL_SOURCE_LINE (decl));
 }
 
 /* Add an DW_AT_name attribute and source coordinate attribute for the
    given decl, but only if it actually has a name.  */

+

 static void
 add_name_and_src_coords_attributes (die, decl)
      register dw_die_ref die;
      register tree decl;
 {
   register tree decl_name;
 static void
 add_name_and_src_coords_attributes (die, decl)
      register dw_die_ref die;
      register tree decl;
 {
   register tree decl_name;

+

   decl_name = DECL_NAME (decl); 
   decl_name = DECL_NAME (decl); 

-  if (decl_name && IDENTIFIER_POINTER (decl_name))
+  if (decl_name != NULL && IDENTIFIER_POINTER (decl_name) != NULL)

     {
       add_name_attribute (die, dwarf2_name (decl, 0));
       add_src_coords_attributes (die, decl);
     {
       add_name_attribute (die, dwarf2_name (decl, 0));
       add_src_coords_attributes (die, decl);


@@ -6375,6 +6642,7 @@ add_name_and_src_coords_attributes (die, decl)
 }
 
 /* Push a new declaration scope. */
 }
 
 /* Push a new declaration scope. */

+

 static void
 push_decl_scope (scope)
      tree scope;
 static void
 push_decl_scope (scope)
      tree scope;


@@ -6383,13 +6651,16 @@ push_decl_scope (scope)
   if (decl_scope_table_allocated == decl_scope_depth)
     {
       decl_scope_table_allocated += DECL_SCOPE_TABLE_INCREMENT;
   if (decl_scope_table_allocated == decl_scope_depth)
     {
       decl_scope_table_allocated += DECL_SCOPE_TABLE_INCREMENT;

-      decl_scope_table = (tree *) xrealloc (decl_scope_table,
-                          decl_scope_table_allocated * sizeof (tree));
+      decl_scope_table
+       = (tree *) xrealloc (decl_scope_table,
+                            decl_scope_table_allocated * sizeof (tree));

     }
     }

+

   decl_scope_table[decl_scope_depth++] = scope;
 }
 
 /* Return the DIE for the scope the immediately contains this declaration.  */
   decl_scope_table[decl_scope_depth++] = scope;
 }
 
 /* Return the DIE for the scope the immediately contains this declaration.  */

+

 static dw_die_ref
 scope_die_for (t, context_die)
     register tree t; 
 static dw_die_ref
 scope_die_for (t, context_die)
     register tree t; 


@@ -6414,16 +6685,15 @@ scope_die_for (t, context_die)
   else
     containing_scope = DECL_CONTEXT (t);
 
   else
     containing_scope = DECL_CONTEXT (t);
 

-  if (containing_scope == NULL)
-    {
-      scope_die = comp_unit_die;
-    }
+  if (containing_scope == NULL_TREE)
+    scope_die = comp_unit_die;

   else
     {
       for (i = decl_scope_depth, scope_die = context_die;
           i > 0 && decl_scope_table[i - 1] != containing_scope;
           scope_die = scope_die->die_parent, --i)
   else
     {
       for (i = decl_scope_depth, scope_die = context_die;
           i > 0 && decl_scope_table[i - 1] != containing_scope;
           scope_die = scope_die->die_parent, --i)

-       /* nothing */ ;
+       ;
+

       if (i == 0)
        {
          assert (scope_die == comp_unit_die);
       if (i == 0)
        {
          assert (scope_die == comp_unit_die);


@@ -6432,11 +6702,12 @@ scope_die_for (t, context_die)
            assert (TREE_ASM_WRITTEN (containing_scope));
        }
     }
            assert (TREE_ASM_WRITTEN (containing_scope));
        }
     }

+

   return scope_die;
 }
 
 /* Pop a declaration scope.  */
   return scope_die;
 }
 
 /* Pop a declaration scope.  */

-inline void
+static inline void

 pop_decl_scope ()
 {
   assert (decl_scope_depth > 0);
 pop_decl_scope ()
 {
   assert (decl_scope_depth > 0);


@@ -6446,6 +6717,7 @@ pop_decl_scope ()
 /* Many forms of DIEs require a "type description" attribute.  This
    routine locates the proper "type descriptor" die for the type given
    by 'type', and adds an DW_AT_type attribute below the given die.  */
 /* Many forms of DIEs require a "type description" attribute.  This
    routine locates the proper "type descriptor" die for the type given
    by 'type', and adds an DW_AT_type attribute below the given die.  */

+

 static void
 add_type_attribute (object_die, type, decl_const, decl_volatile, context_die)
      register dw_die_ref object_die;
 static void
 add_type_attribute (object_die, type, decl_const, decl_volatile, context_die)
      register dw_die_ref object_die;


@@ -6477,14 +6749,13 @@ add_type_attribute (object_die, type, decl_const, decl_volatile, context_die)
                                decl_volatile || TYPE_VOLATILE (type),
                                context_die);
   if (type_die != NULL)
                                decl_volatile || TYPE_VOLATILE (type),
                                context_die);
   if (type_die != NULL)

-    {
-      add_AT_die_ref (object_die, DW_AT_type, type_die);
-    }
+    add_AT_die_ref (object_die, DW_AT_type, type_die);

 }
 
 /* Given a tree pointer to a struct, class, union, or enum type node, return
    a pointer to the (string) tag name for the given type, or zero if the type
    was declared without a tag.  */
 }
 
 /* Given a tree pointer to a struct, class, union, or enum type node, return
    a pointer to the (string) tag name for the given type, or zero if the type
    was declared without a tag.  */

+

 static char *
 type_tag (type)
      register tree type;
 static char *
 type_tag (type)
      register tree type;


@@ -6510,22 +6781,25 @@ type_tag (type)
       if (t != 0)
        name = IDENTIFIER_POINTER (t);
     }
       if (t != 0)
        name = IDENTIFIER_POINTER (t);
     }

+

   return (name == 0 || *name == '\0') ? 0 : name;
 }
 
 /* Return the type associated with a data member, make a special check
    for bit field types.  */
   return (name == 0 || *name == '\0') ? 0 : name;
 }
 
 /* Return the type associated with a data member, make a special check
    for bit field types.  */

-inline tree
+
+static inline tree

 member_declared_type (member)
      register tree member;
 {
 member_declared_type (member)
      register tree member;
 {

-  return (DECL_BIT_FIELD_TYPE (member))
-    ? DECL_BIT_FIELD_TYPE (member)
-    : TREE_TYPE (member);
+  return (DECL_BIT_FIELD_TYPE (member)
+         ? DECL_BIT_FIELD_TYPE (member)
+         : TREE_TYPE (member));

 }
 
 /* Get the decl's label, as described by its RTL. This may be different
    from the DECL_NAME name used in the source file.  */
 }
 
 /* Get the decl's label, as described by its RTL. This may be different
    from the DECL_NAME name used in the source file.  */

+

 static char *
 decl_start_label (decl)
      register tree decl;
 static char *
 decl_start_label (decl)
      register tree decl;


@@ -6534,20 +6808,16 @@ decl_start_label (decl)
   char *fnname;
   x = DECL_RTL (decl);
   if (GET_CODE (x) != MEM)
   char *fnname;
   x = DECL_RTL (decl);
   if (GET_CODE (x) != MEM)

-    {
-      abort ();
-    }
+    abort ();
+

   x = XEXP (x, 0);
   if (GET_CODE (x) != SYMBOL_REF)
   x = XEXP (x, 0);
   if (GET_CODE (x) != SYMBOL_REF)

-    {
-      abort ();
-    }
+    abort ();
+

   fnname = XSTR (x, 0);
   return fnname;
 }
 \f
   fnname = XSTR (x, 0);
   return fnname;
 }
 \f

-/******************************* DIE Generation *************************/
-

 /* These routines generate the internnal representation of the DIE's for
    the compilation unit.  Debugging information is collected by walking
    the declaration trees passed in from dwarf2out_decl().  */
 /* These routines generate the internnal representation of the DIE's for
    the compilation unit.  Debugging information is collected by walking
    the declaration trees passed in from dwarf2out_decl().  */


@@ -6594,15 +6864,15 @@ gen_array_type_die (type, context_die)
 
   /* Add representation of the type of the elements of this array type.  */
   element_type = TREE_TYPE (type);
 
   /* Add representation of the type of the elements of this array type.  */
   element_type = TREE_TYPE (type);

+

   /* ??? The SGI dwarf reader fails for multidimensional arrays with a
      const enum type.  E.g. const enum machine_mode insn_operand_mode[2][10].
      We work around this by disabling this feature.  See also
      add_subscript_info.  */
 #ifndef MIPS_DEBUGGING_INFO
   /* ??? The SGI dwarf reader fails for multidimensional arrays with a
      const enum type.  E.g. const enum machine_mode insn_operand_mode[2][10].
      We work around this by disabling this feature.  See also
      add_subscript_info.  */
 #ifndef MIPS_DEBUGGING_INFO

-  while (TREE_CODE (element_type) == ARRAY_TYPE)
-    {
-      element_type = TREE_TYPE (element_type);
-    }
+  while (TREE_CODE (element_type) == ARRAY_TYPE)
+    element_type = TREE_TYPE (element_type);
+

   gen_type_die (element_type, context_die);
 #endif
 
   gen_type_die (element_type, context_die);
 #endif
 


@@ -6614,8 +6884,9 @@ gen_set_type_die (type, context_die)
      register tree type;
      register dw_die_ref context_die;
 {
      register tree type;
      register dw_die_ref context_die;
 {

-  register dw_die_ref type_die = new_die
-    (DW_TAG_set_type, scope_die_for (type, context_die));
+  register dw_die_ref type_die
+    = new_die (DW_TAG_set_type, scope_die_for (type, context_die));
+

   equate_type_number_to_die (type, type_die);
   add_type_attribute (type_die, TREE_TYPE (type), 0, 0, context_die);
 }
   equate_type_number_to_die (type, type_die);
   add_type_attribute (type_die, TREE_TYPE (type), 0, 0, context_die);
 }


@@ -6628,23 +6899,18 @@ gen_entry_point_die (decl, context_die)
   register tree origin = decl_ultimate_origin (decl);
   register dw_die_ref decl_die = new_die (DW_TAG_entry_point, context_die);
   if (origin != NULL)
   register tree origin = decl_ultimate_origin (decl);
   register dw_die_ref decl_die = new_die (DW_TAG_entry_point, context_die);
   if (origin != NULL)

-    {
-      add_abstract_origin_attribute (decl_die, origin);
-    }
+    add_abstract_origin_attribute (decl_die, origin);

   else
     {
       add_name_and_src_coords_attributes (decl_die, decl);
       add_type_attribute (decl_die, TREE_TYPE (TREE_TYPE (decl)),
                          0, 0, context_die);
     }
   else
     {
       add_name_and_src_coords_attributes (decl_die, decl);
       add_type_attribute (decl_die, TREE_TYPE (TREE_TYPE (decl)),
                          0, 0, context_die);
     }

+

   if (DECL_ABSTRACT (decl))
   if (DECL_ABSTRACT (decl))

-    {
-      equate_decl_number_to_die (decl, decl_die);
-    }
+    equate_decl_number_to_die (decl, decl_die);

   else
   else

-    {
-      add_AT_lbl_id (decl_die, DW_AT_low_pc, decl_start_label (decl));
-    }
+    add_AT_lbl_id (decl_die, DW_AT_low_pc, decl_start_label (decl));

 }
 
 /* Remember a type in the pending_types_list.  */
 }
 
 /* Remember a type in the pending_types_list.  */


@@ -6660,6 +6926,7 @@ pend_type (type)
        = (tree *) xrealloc (pending_types_list,
                             sizeof (tree) * pending_types_allocated);
     }
        = (tree *) xrealloc (pending_types_list,
                             sizeof (tree) * pending_types_allocated);
     }

+

   pending_types_list[pending_types++] = type;
 }
 
   pending_types_list[pending_types++] = type;
 }
 


@@ -6685,40 +6952,43 @@ output_pending_types_for_scope (context_die)
 }
 
 /* Generate a DIE to represent an inlined instance of an enumeration type.  */
 }
 
 /* Generate a DIE to represent an inlined instance of an enumeration type.  */

+

 static void
 gen_inlined_enumeration_type_die (type, context_die)
      register tree type;
      register dw_die_ref context_die;
 {
 static void
 gen_inlined_enumeration_type_die (type, context_die)
      register tree type;
      register dw_die_ref context_die;
 {

-  register dw_die_ref type_die;
-  type_die = new_die (DW_TAG_enumeration_type,
-                     scope_die_for (type, context_die));
+  register dw_die_ref type_die = new_die (DW_TAG_enumeration_type,
+                                         scope_die_for (type, context_die));
+

   assert (TREE_ASM_WRITTEN (type));
   add_abstract_origin_attribute (type_die, type);
 }
 
 /* Generate a DIE to represent an inlined instance of a structure type.  */
   assert (TREE_ASM_WRITTEN (type));
   add_abstract_origin_attribute (type_die, type);
 }
 
 /* Generate a DIE to represent an inlined instance of a structure type.  */

+

 static void
 gen_inlined_structure_type_die (type, context_die)
      register tree type;
      register dw_die_ref context_die;
 {
 static void
 gen_inlined_structure_type_die (type, context_die)
      register tree type;
      register dw_die_ref context_die;
 {

-  register dw_die_ref type_die;
-  type_die = new_die (DW_TAG_structure_type,
-                     scope_die_for (type, context_die));
+  register dw_die_ref type_die = new_die (DW_TAG_structure_type,
+                                         scope_die_for (type, context_die));
+

   assert (TREE_ASM_WRITTEN (type));
   add_abstract_origin_attribute (type_die, type);
 }
 
 /* Generate a DIE to represent an inlined instance of a union type.  */
   assert (TREE_ASM_WRITTEN (type));
   add_abstract_origin_attribute (type_die, type);
 }
 
 /* Generate a DIE to represent an inlined instance of a union type.  */

+

 static void
 gen_inlined_union_type_die (type, context_die)
      register tree type;
      register dw_die_ref context_die;
 {
 static void
 gen_inlined_union_type_die (type, context_die)
      register tree type;
      register dw_die_ref context_die;
 {

-  register dw_die_ref type_die;
-  type_die = new_die (DW_TAG_union_type,
-                     scope_die_for (type, context_die));
+  register dw_die_ref type_die = new_die (DW_TAG_union_type,
+                                         scope_die_for (type, context_die));
+

   assert (TREE_ASM_WRITTEN (type));
   add_abstract_origin_attribute (type_die, type);
 }
   assert (TREE_ASM_WRITTEN (type));
   add_abstract_origin_attribute (type_die, type);
 }


@@ -6727,6 +6997,7 @@ gen_inlined_union_type_die (type, context_die)
    include all of the information about the enumeration values also. Each
    enumerated type name/value is listed as a child of the enumerated type
    DIE.  */
    include all of the information about the enumeration values also. Each
    enumerated type name/value is listed as a child of the enumerated type
    DIE.  */

+

 static void
 gen_enumeration_type_die (type, context_die)
      register tree type;
 static void
 gen_enumeration_type_die (type, context_die)
      register tree type;


@@ -6752,14 +7023,17 @@ gen_enumeration_type_die (type, context_die)
   if (TYPE_SIZE (type))
     {
       register tree link;
   if (TYPE_SIZE (type))
     {
       register tree link;

+

       TREE_ASM_WRITTEN (type) = 1;
       add_byte_size_attribute (type_die, type);
       if (type_tag (type))
        add_src_coords_attributes (type_die, TYPE_STUB_DECL (type));
       TREE_ASM_WRITTEN (type) = 1;
       add_byte_size_attribute (type_die, type);
       if (type_tag (type))
        add_src_coords_attributes (type_die, TYPE_STUB_DECL (type));

+

       for (link = TYPE_FIELDS (type);
           link != NULL; link = TREE_CHAIN (link))
        {
          register dw_die_ref enum_die = new_die (DW_TAG_enumerator, type_die);
       for (link = TYPE_FIELDS (type);
           link != NULL; link = TREE_CHAIN (link))
        {
          register dw_die_ref enum_die = new_die (DW_TAG_enumerator, type_die);

+

          add_name_attribute (enum_die,
                              IDENTIFIER_POINTER (TREE_PURPOSE (link)));
          add_AT_unsigned (enum_die, DW_AT_const_value,
          add_name_attribute (enum_die,
                              IDENTIFIER_POINTER (TREE_PURPOSE (link)));
          add_AT_unsigned (enum_die, DW_AT_const_value,


@@ -6774,6 +7048,7 @@ gen_enumeration_type_die (type, context_die)
 /* Generate a DIE to represent either a real live formal parameter decl or to
    represent just the type of some formal parameter position in some function
    type.
 /* Generate a DIE to represent either a real live formal parameter decl or to
    represent just the type of some formal parameter position in some function
    type.

+

    Note that this routine is a bit unusual because its argument may be a
    ..._DECL node (i.e. either a PARM_DECL or perhaps a VAR_DECL which
    represents an inlining of some PARM_DECL) or else some sort of a ..._TYPE
    Note that this routine is a bit unusual because its argument may be a
    ..._DECL node (i.e. either a PARM_DECL or perhaps a VAR_DECL which
    represents an inlining of some PARM_DECL) or else some sort of a ..._TYPE


@@ -6782,17 +7057,18 @@ gen_enumeration_type_die (type, context_die)
    it's the latter, then this function is only being called to output a
    DW_TAG_formal_parameter DIE to stand as a placeholder for some formal
    argument type of some subprogram type.  */
    it's the latter, then this function is only being called to output a
    DW_TAG_formal_parameter DIE to stand as a placeholder for some formal
    argument type of some subprogram type.  */

+

 static dw_die_ref
 gen_formal_parameter_die (node, context_die)
      register tree node;
      register dw_die_ref context_die;
 {
 static dw_die_ref
 gen_formal_parameter_die (node, context_die)
      register tree node;
      register dw_die_ref context_die;
 {

-  register dw_die_ref parm_die = new_die (DW_TAG_formal_parameter,
-                                         context_die);
+  register dw_die_ref parm_die
+    = new_die (DW_TAG_formal_parameter, context_die);

   register tree origin;
   register tree origin;

+

   switch (TREE_CODE_CLASS (TREE_CODE (node)))
     {
   switch (TREE_CODE_CLASS (TREE_CODE (node)))
     {

-      /* We were called with some kind of a ..._DECL node.  */

     case 'd':
       origin = decl_ultimate_origin (node);
       if (origin != NULL)
     case 'd':
       origin = decl_ultimate_origin (node);
       if (origin != NULL)


@@ -6807,25 +7083,28 @@ gen_formal_parameter_die (node, context_die)
          if (DECL_ARTIFICIAL (node))
            add_AT_flag (parm_die, DW_AT_artificial, 1);
        }
          if (DECL_ARTIFICIAL (node))
            add_AT_flag (parm_die, DW_AT_artificial, 1);
        }

+

       equate_decl_number_to_die (node, parm_die);
       if (! DECL_ABSTRACT (node))
        add_location_or_const_value_attribute (parm_die, node);
       equate_decl_number_to_die (node, parm_die);
       if (! DECL_ABSTRACT (node))
        add_location_or_const_value_attribute (parm_die, node);

+

       break;
 
       break;
 

-      /* We were called with some kind of a ..._TYPE node.  */

     case 't':
     case 't':

+      /* We were called with some kind of a ..._TYPE node.  */

       add_type_attribute (parm_die, node, 0, 0, context_die);
       break;
 
       add_type_attribute (parm_die, node, 0, 0, context_die);
       break;
 

-      /* Should never happen.  */

     default:
       abort ();
     }
     default:
       abort ();
     }

+

   return parm_die;
 }
 
 /* Generate a special type of DIE used as a stand-in for a trailing ellipsis
    at the end of an (ANSI prototyped) formal parameters list.  */
   return parm_die;
 }
 
 /* Generate a special type of DIE used as a stand-in for a trailing ellipsis
    at the end of an (ANSI prototyped) formal parameters list.  */

+

 static void
 gen_unspecified_parameters_die (decl_or_type, context_die)
      register tree decl_or_type;
 static void
 gen_unspecified_parameters_die (decl_or_type, context_die)
      register tree decl_or_type;


@@ -6839,10 +7118,12 @@ gen_unspecified_parameters_die (decl_or_type, context_die)
    DW_TAG_unspecified_parameters DIE) to represent the types of the formal
    parameters as specified in some function type specification (except for
    those which appear as part of a function *definition*).
    DW_TAG_unspecified_parameters DIE) to represent the types of the formal
    parameters as specified in some function type specification (except for
    those which appear as part of a function *definition*).

-   Note that we must be careful here to output all of the parameter DIEs before*
+
+   Note we must be careful here to output all of the parameter DIEs before*

    we output any DIEs needed to represent the types of the formal parameters.
    This keeps svr4 SDB happy because it (incorrectly) thinks that the first
    non-parameter DIE it sees ends the formal parameter list.  */
    we output any DIEs needed to represent the types of the formal parameters.
    This keeps svr4 SDB happy because it (incorrectly) thinks that the first
    non-parameter DIE it sees ends the formal parameter list.  */

+

 static void
 gen_formal_types_die (function_or_method_type, context_die)
      register tree function_or_method_type;
 static void
 gen_formal_types_die (function_or_method_type, context_die)
      register tree function_or_method_type;


@@ -6903,6 +7184,7 @@ gen_formal_types_die (function_or_method_type, context_die)
 
 /* Generate a DIE to represent a declared function (either file-scope or
    block-local).  */
 
 /* Generate a DIE to represent a declared function (either file-scope or
    block-local).  */

+

 static void
 gen_subprogram_die (decl, context_die)
      register tree decl;
 static void
 gen_subprogram_die (decl, context_die)
      register tree decl;


@@ -6977,13 +7259,16 @@ gen_subprogram_die (decl, context_die)
                         
       if (TREE_PUBLIC (decl))
        add_AT_flag (subr_die, DW_AT_external, 1);
                         
       if (TREE_PUBLIC (decl))
        add_AT_flag (subr_die, DW_AT_external, 1);

+

       add_name_and_src_coords_attributes (subr_die, decl);
       if (debug_info_level > DINFO_LEVEL_TERSE)
        {
          register tree type = TREE_TYPE (decl);
       add_name_and_src_coords_attributes (subr_die, decl);
       if (debug_info_level > DINFO_LEVEL_TERSE)
        {
          register tree type = TREE_TYPE (decl);

+

          add_prototyped_attribute (subr_die, type);
          add_type_attribute (subr_die, TREE_TYPE (type), 0, 0, context_die);
        }
          add_prototyped_attribute (subr_die, type);
          add_type_attribute (subr_die, TREE_TYPE (type), 0, 0, context_die);
        }

+

       add_pure_or_virtual_attribute (subr_die, decl);
       if (DECL_ARTIFICIAL (decl))
        add_AT_flag (subr_die, DW_AT_artificial, 1);
       add_pure_or_virtual_attribute (subr_die, decl);
       if (DECL_ARTIFICIAL (decl))
        add_AT_flag (subr_die, DW_AT_artificial, 1);


@@ -7017,7 +7302,7 @@ gen_subprogram_die (decl, context_die)
       else if (DECL_INLINE (decl))
        add_AT_unsigned (subr_die, DW_AT_inline, DW_INL_inlined);
       else if (declaration)
       else if (DECL_INLINE (decl))
        add_AT_unsigned (subr_die, DW_AT_inline, DW_INL_inlined);
       else if (declaration)

-       /* block extern declaration in an inline function.  */
+       /* Block extern declaration in an inline function.  */

        add_AT_flag (subr_die, DW_AT_declaration, 1);
       else
        abort ();
        add_AT_flag (subr_die, DW_AT_declaration, 1);
       else
        abort ();


@@ -7026,8 +7311,9 @@ gen_subprogram_die (decl, context_die)
     }
   else if (!DECL_EXTERNAL (decl))
     {
     }
   else if (!DECL_EXTERNAL (decl))
     {

-      if (origin == NULL)
+      if (origin == NULL_TREE)

        equate_decl_number_to_die (decl, subr_die);
        equate_decl_number_to_die (decl, subr_die);

+

       ASM_GENERATE_INTERNAL_LABEL (label_id, FUNC_BEGIN_LABEL,
                                   current_funcdef_number);
       add_AT_lbl_id (subr_die, DW_AT_low_pc, label_id);
       ASM_GENERATE_INTERNAL_LABEL (label_id, FUNC_BEGIN_LABEL,
                                   current_funcdef_number);
       add_AT_lbl_id (subr_die, DW_AT_low_pc, label_id);


@@ -7064,13 +7350,13 @@ gen_subprogram_die (decl, context_die)
      FUNCTION_TYPE. If the chain of type nodes hanging off of this
      FUNCTION_TYPE node ends with a void_type_node then there should *not* be 
      an ellipsis at the end.  */
      FUNCTION_TYPE. If the chain of type nodes hanging off of this
      FUNCTION_TYPE node ends with a void_type_node then there should *not* be 
      an ellipsis at the end.  */

-

   push_decl_scope (decl);
   push_decl_scope (decl);

+

   /* In the case where we are describing a mere function declaration, all we
      need to do here (and all we *can* do here) is to describe the *types* of 
      its formal parameters.  */
   if (debug_info_level <= DINFO_LEVEL_TERSE)
   /* In the case where we are describing a mere function declaration, all we
      need to do here (and all we *can* do here) is to describe the *types* of 
      its formal parameters.  */
   if (debug_info_level <= DINFO_LEVEL_TERSE)

-    /* do nothing */;
+    ;

   else if (declaration)
     gen_formal_types_die (TREE_TYPE (decl), subr_die);
   else
   else if (declaration)
     gen_formal_types_die (TREE_TYPE (decl), subr_die);
   else


@@ -7082,21 +7368,15 @@ gen_subprogram_die (decl, context_die)
       /* When generating DIEs, generate the unspecified_parameters DIE
          instead if we come across the arg "__builtin_va_alist" */
       for (parm = arg_decls; parm; parm = TREE_CHAIN (parm))
       /* When generating DIEs, generate the unspecified_parameters DIE
          instead if we come across the arg "__builtin_va_alist" */
       for (parm = arg_decls; parm; parm = TREE_CHAIN (parm))

-       {
-         if (TREE_CODE (parm) == PARM_DECL)
-           {
-             if (DECL_NAME (parm) &&
-                 !strcmp (IDENTIFIER_POINTER (DECL_NAME (parm)),
-                          "__builtin_va_alist"))
-               {
-                 gen_unspecified_parameters_die (parm, subr_die);
-               }
-             else
-               {
-                 gen_decl_die (parm, subr_die);
-               }
-           }
-       }
+       if (TREE_CODE (parm) == PARM_DECL)
+         {
+           if (DECL_NAME (parm) &&
+               !strcmp (IDENTIFIER_POINTER (DECL_NAME (parm)),
+                        "__builtin_va_alist"))
+             gen_unspecified_parameters_die (parm, subr_die);
+           else
+             gen_decl_die (parm, subr_die);
+         }

 
       /* Decide whether we need a unspecified_parameters DIE at the end.
          There are 2 more cases to do this for: 1) the ansi ... declaration - 
 
       /* Decide whether we need a unspecified_parameters DIE at the end.
          There are 2 more cases to do this for: 1) the ansi ... declaration - 


@@ -7105,22 +7385,14 @@ gen_subprogram_die (decl, context_die)
          definition).  This just means that we have no info about the
          parameters at all.  */
       fn_arg_types = TYPE_ARG_TYPES (TREE_TYPE (decl));
          definition).  This just means that we have no info about the
          parameters at all.  */
       fn_arg_types = TYPE_ARG_TYPES (TREE_TYPE (decl));

-      if (fn_arg_types)
+      if (fn_arg_types != NULL)

        {
          /* this is the prototyped case, check for ...  */
          if (TREE_VALUE (tree_last (fn_arg_types)) != void_type_node)
        {
          /* this is the prototyped case, check for ...  */
          if (TREE_VALUE (tree_last (fn_arg_types)) != void_type_node)

-           {
-             gen_unspecified_parameters_die (decl, subr_die);
-           }
-       }
-      else
-       {
-         /* this is unprotoyped, check for undefined (just declaration) */
-         if (!DECL_INITIAL (decl))
-           {
-             gen_unspecified_parameters_die (decl, subr_die);
-           }
+           gen_unspecified_parameters_die (decl, subr_die);

        }
        }

+      else if (DECL_INITIAL (decl) == NULL_TREE)
+       gen_unspecified_parameters_die (decl, subr_die);

     }
 
   /* Output Dwarf info for all of the stuff within the body of the function
     }
 
   /* Output Dwarf info for all of the stuff within the body of the function


@@ -7145,6 +7417,7 @@ gen_subprogram_die (decl, context_die)
     {
       current_function_has_inlines = 0;
       decls_for_scope (outer_scope, subr_die, 0);
     {
       current_function_has_inlines = 0;
       decls_for_scope (outer_scope, subr_die, 0);

+

 #if 0 && defined (MIPS_DEBUGGING_INFO)
       if (current_function_has_inlines)
        {
 #if 0 && defined (MIPS_DEBUGGING_INFO)
       if (current_function_has_inlines)
        {


@@ -7157,10 +7430,12 @@ gen_subprogram_die (decl, context_die)
        }
 #endif
     }
        }
 #endif
     }

+

   pop_decl_scope ();
 }
 
 /* Generate a DIE to represent a declared data object.  */
   pop_decl_scope ();
 }
 
 /* Generate a DIE to represent a declared data object.  */

+

 static void
 gen_variable_die (decl, context_die)
      register tree decl;
 static void
 gen_variable_die (decl, context_die)
      register tree decl;


@@ -7168,6 +7443,7 @@ gen_variable_die (decl, context_die)
 {
   register tree origin = decl_ultimate_origin (decl);
   register dw_die_ref var_die = new_die (DW_TAG_variable, context_die);
 {
   register tree origin = decl_ultimate_origin (decl);
   register dw_die_ref var_die = new_die (DW_TAG_variable, context_die);

+

   dw_die_ref old_die = lookup_decl_die (decl);
   int declaration
     = (DECL_EXTERNAL (decl)
   dw_die_ref old_die = lookup_decl_die (decl);
   int declaration
     = (DECL_EXTERNAL (decl)


@@ -7176,9 +7452,7 @@ gen_variable_die (decl, context_die)
        || context_die->die_tag == DW_TAG_union_type);
 
   if (origin != NULL)
        || context_die->die_tag == DW_TAG_union_type);
 
   if (origin != NULL)

-    {
-      add_abstract_origin_attribute (var_die, origin);
-    }
+    add_abstract_origin_attribute (var_die, origin);

   else if (old_die && TREE_STATIC (decl))
     {
       assert (get_AT_flag (old_die, DW_AT_declaration) == 1);
   else if (old_die && TREE_STATIC (decl))
     {
       assert (get_AT_flag (old_die, DW_AT_declaration) == 1);


@@ -7187,12 +7461,15 @@ gen_variable_die (decl, context_die)
        {
          register unsigned file_index
            = lookup_filename (DECL_SOURCE_FILE (decl));
        {
          register unsigned file_index
            = lookup_filename (DECL_SOURCE_FILE (decl));

+

          if (get_AT_unsigned (old_die, DW_AT_decl_file) != file_index)
            add_AT_unsigned (var_die, DW_AT_decl_file, file_index);
          if (get_AT_unsigned (old_die, DW_AT_decl_file) != file_index)
            add_AT_unsigned (var_die, DW_AT_decl_file, file_index);

+

          if (get_AT_unsigned (old_die, DW_AT_decl_line)
              != DECL_SOURCE_LINE (decl))
          if (get_AT_unsigned (old_die, DW_AT_decl_line)
              != DECL_SOURCE_LINE (decl))

-           add_AT_unsigned
-             (var_die, DW_AT_decl_line, DECL_SOURCE_LINE (decl));
+
+           add_AT_unsigned (var_die, DW_AT_decl_line,
+                            DECL_SOURCE_LINE (decl));

        }
     }
   else
        }
     }
   else


@@ -7201,12 +7478,16 @@ gen_variable_die (decl, context_die)
       add_type_attribute (var_die, TREE_TYPE (decl),
                          TREE_READONLY (decl),
                          TREE_THIS_VOLATILE (decl), context_die);
       add_type_attribute (var_die, TREE_TYPE (decl),
                          TREE_READONLY (decl),
                          TREE_THIS_VOLATILE (decl), context_die);

+

       if (TREE_PUBLIC (decl))
        add_AT_flag (var_die, DW_AT_external, 1);
       if (TREE_PUBLIC (decl))
        add_AT_flag (var_die, DW_AT_external, 1);

+

       if (DECL_ARTIFICIAL (decl))
        add_AT_flag (var_die, DW_AT_artificial, 1);
       if (DECL_ARTIFICIAL (decl))
        add_AT_flag (var_die, DW_AT_artificial, 1);

+

       if (TREE_PROTECTED (decl))
        add_AT_unsigned (var_die, DW_AT_accessibility, DW_ACCESS_protected);
       if (TREE_PROTECTED (decl))
        add_AT_unsigned (var_die, DW_AT_accessibility, DW_ACCESS_protected);

+

       else if (TREE_PRIVATE (decl))
        add_AT_unsigned (var_die, DW_AT_accessibility, DW_ACCESS_private);
     }
       else if (TREE_PRIVATE (decl))
        add_AT_unsigned (var_die, DW_AT_accessibility, DW_ACCESS_private);
     }


@@ -7226,6 +7507,7 @@ gen_variable_die (decl, context_die)
 }
 
 /* Generate a DIE to represent a label identifier.  */
 }
 
 /* Generate a DIE to represent a label identifier.  */

+

 static void
 gen_label_die (decl, context_die)
      register tree decl;
 static void
 gen_label_die (decl, context_die)
      register tree decl;


@@ -7236,18 +7518,14 @@ gen_label_die (decl, context_die)
   register rtx insn;
   char label[MAX_ARTIFICIAL_LABEL_BYTES];
   char label2[MAX_ARTIFICIAL_LABEL_BYTES];
   register rtx insn;
   char label[MAX_ARTIFICIAL_LABEL_BYTES];
   char label2[MAX_ARTIFICIAL_LABEL_BYTES];

+

   if (origin != NULL)
   if (origin != NULL)

-    {
-      add_abstract_origin_attribute (lbl_die, origin);
-    }
+    add_abstract_origin_attribute (lbl_die, origin);

   else
   else

-    {
-      add_name_and_src_coords_attributes (lbl_die, decl);
-    }
+    add_name_and_src_coords_attributes (lbl_die, decl);
+

   if (DECL_ABSTRACT (decl))
   if (DECL_ABSTRACT (decl))

-    {
-      equate_decl_number_to_die (decl, lbl_die);
-    }
+    equate_decl_number_to_die (decl, lbl_die);

   else
     {
       insn = DECL_RTL (decl);
   else
     {
       insn = DECL_RTL (decl);


@@ -7259,9 +7537,8 @@ gen_label_die (decl, context_die)
             the user.  This really shouldn't be happening though, so catch
             it if it ever does happen.  */
          if (INSN_DELETED_P (insn))
             the user.  This really shouldn't be happening though, so catch
             it if it ever does happen.  */
          if (INSN_DELETED_P (insn))

-           {
-             abort ();         /* Should never happen.  */
-           }
+           abort ();
+

          sprintf (label2, INSN_LABEL_FMT, current_funcdef_number);
          ASM_GENERATE_INTERNAL_LABEL (label, label2,
                                       (unsigned) INSN_UID (insn));
          sprintf (label2, INSN_LABEL_FMT, current_funcdef_number);
          ASM_GENERATE_INTERNAL_LABEL (label, label2,
                                       (unsigned) INSN_UID (insn));


@@ -7271,6 +7548,7 @@ gen_label_die (decl, context_die)
 }
 
 /* Generate a DIE for a lexical block.  */
 }
 
 /* Generate a DIE for a lexical block.  */

+

 static void
 gen_lexical_block_die (stmt, context_die, depth)
      register tree stmt;
 static void
 gen_lexical_block_die (stmt, context_die, depth)
      register tree stmt;


@@ -7279,7 +7557,8 @@ gen_lexical_block_die (stmt, context_die, depth)
 {
   register dw_die_ref stmt_die = new_die (DW_TAG_lexical_block, context_die);
   char label[MAX_ARTIFICIAL_LABEL_BYTES];
 {
   register dw_die_ref stmt_die = new_die (DW_TAG_lexical_block, context_die);
   char label[MAX_ARTIFICIAL_LABEL_BYTES];

-  if (!BLOCK_ABSTRACT (stmt))
+
+  if (! BLOCK_ABSTRACT (stmt))

     {
       ASM_GENERATE_INTERNAL_LABEL (label, BLOCK_BEGIN_LABEL,
                                   next_block_number);
     {
       ASM_GENERATE_INTERNAL_LABEL (label, BLOCK_BEGIN_LABEL,
                                   next_block_number);


@@ -7287,24 +7566,27 @@ gen_lexical_block_die (stmt, context_die, depth)
       ASM_GENERATE_INTERNAL_LABEL (label, BLOCK_END_LABEL, next_block_number);
       add_AT_lbl_id (stmt_die, DW_AT_high_pc, label);
     }
       ASM_GENERATE_INTERNAL_LABEL (label, BLOCK_END_LABEL, next_block_number);
       add_AT_lbl_id (stmt_die, DW_AT_high_pc, label);
     }

+

   push_decl_scope (stmt);
   decls_for_scope (stmt, stmt_die, depth);
   pop_decl_scope ();
 }
 
 /* Generate a DIE for an inlined subprogram.  */
   push_decl_scope (stmt);
   decls_for_scope (stmt, stmt_die, depth);
   pop_decl_scope ();
 }
 
 /* Generate a DIE for an inlined subprogram.  */

+

 static void
 gen_inlined_subroutine_die (stmt, context_die, depth)
      register tree stmt;
      register dw_die_ref context_die;
      int depth;
 {
 static void
 gen_inlined_subroutine_die (stmt, context_die, depth)
      register tree stmt;
      register dw_die_ref context_die;
      int depth;
 {

-  if (!BLOCK_ABSTRACT (stmt))
+  if (! BLOCK_ABSTRACT (stmt))

     {
     {

-      register dw_die_ref subr_die = new_die (DW_TAG_inlined_subroutine,
-                                             context_die);
+      register dw_die_ref subr_die
+       = new_die (DW_TAG_inlined_subroutine, context_die);

       register tree decl = block_ultimate_origin (stmt);
       char label[MAX_ARTIFICIAL_LABEL_BYTES];
       register tree decl = block_ultimate_origin (stmt);
       char label[MAX_ARTIFICIAL_LABEL_BYTES];

+

       add_abstract_origin_attribute (subr_die, decl);
       ASM_GENERATE_INTERNAL_LABEL (label, BLOCK_BEGIN_LABEL,
                                   next_block_number);
       add_abstract_origin_attribute (subr_die, decl);
       ASM_GENERATE_INTERNAL_LABEL (label, BLOCK_BEGIN_LABEL,
                                   next_block_number);


@@ -7319,16 +7601,19 @@ gen_inlined_subroutine_die (stmt, context_die, depth)
 }
 
 /* Generate a DIE for a field in a record, or structure.  */
 }
 
 /* Generate a DIE for a field in a record, or structure.  */

+

 static void
 gen_field_die (decl, context_die)
      register tree decl;
      register dw_die_ref context_die;
 {
   register dw_die_ref decl_die = new_die (DW_TAG_member, context_die);
 static void
 gen_field_die (decl, context_die)
      register tree decl;
      register dw_die_ref context_die;
 {
   register dw_die_ref decl_die = new_die (DW_TAG_member, context_die);

+

   add_name_and_src_coords_attributes (decl_die, decl);
   add_type_attribute (decl_die, member_declared_type (decl),
                      TREE_READONLY (decl), TREE_THIS_VOLATILE (decl),
                      context_die);
   add_name_and_src_coords_attributes (decl_die, decl);
   add_type_attribute (decl_die, member_declared_type (decl),
                      TREE_READONLY (decl), TREE_THIS_VOLATILE (decl),
                      context_die);

+

   /* If this is a bit field...  */
   if (DECL_BIT_FIELD_TYPE (decl))
     {
   /* If this is a bit field...  */
   if (DECL_BIT_FIELD_TYPE (decl))
     {


@@ -7336,12 +7621,16 @@ gen_field_die (decl, context_die)
       add_bit_size_attribute (decl_die, decl);
       add_bit_offset_attribute (decl_die, decl);
     }
       add_bit_size_attribute (decl_die, decl);
       add_bit_offset_attribute (decl_die, decl);
     }

+

   if (TREE_CODE (DECL_FIELD_CONTEXT (decl)) != UNION_TYPE)
     add_data_member_location_attribute (decl_die, decl);
   if (TREE_CODE (DECL_FIELD_CONTEXT (decl)) != UNION_TYPE)
     add_data_member_location_attribute (decl_die, decl);

+

   if (DECL_ARTIFICIAL (decl))
     add_AT_flag (decl_die, DW_AT_artificial, 1);
   if (DECL_ARTIFICIAL (decl))
     add_AT_flag (decl_die, DW_AT_artificial, 1);

+

   if (TREE_PROTECTED (decl))
     add_AT_unsigned (decl_die, DW_AT_accessibility, DW_ACCESS_protected);
   if (TREE_PROTECTED (decl))
     add_AT_unsigned (decl_die, DW_AT_accessibility, DW_ACCESS_protected);

+

   else if (TREE_PRIVATE (decl))
     add_AT_unsigned (decl_die, DW_AT_accessibility, DW_ACCESS_private);
 }
   else if (TREE_PRIVATE (decl))
     add_AT_unsigned (decl_die, DW_AT_accessibility, DW_ACCESS_private);
 }


@@ -7356,8 +7645,9 @@ gen_pointer_type_die (type, context_die)
      register tree type;
      register dw_die_ref context_die;
 {
      register tree type;
      register dw_die_ref context_die;
 {

-  register dw_die_ref ptr_die = new_die
-    (DW_TAG_pointer_type, scope_die_for (type, context_die));
+  register dw_die_ref ptr_die
+    = new_die (DW_TAG_pointer_type, scope_die_for (type, context_die));
+

   equate_type_number_to_die (type, ptr_die);
   add_type_attribute (ptr_die, TREE_TYPE (type), 0, 0, context_die);
   add_AT_unsigned (mod_type_die, DW_AT_byte_size, PTR_SIZE);
   equate_type_number_to_die (type, ptr_die);
   add_type_attribute (ptr_die, TREE_TYPE (type), 0, 0, context_die);
   add_AT_unsigned (mod_type_die, DW_AT_byte_size, PTR_SIZE);


@@ -7372,8 +7662,9 @@ gen_reference_type_die (type, context_die)
      register tree type;
      register dw_die_ref context_die;
 {
      register tree type;
      register dw_die_ref context_die;
 {

-  register dw_die_ref ref_die = new_die
-    (DW_TAG_reference_type, scope_die_for (type, context_die));
+  register dw_die_ref ref_die
+    = new_die (DW_TAG_reference_type, scope_die_for (type, context_die));
+

   equate_type_number_to_die (type, ref_die);
   add_type_attribute (ref_die, TREE_TYPE (type), 0, 0, context_die);
   add_AT_unsigned (mod_type_die, DW_AT_byte_size, PTR_SIZE);
   equate_type_number_to_die (type, ref_die);
   add_type_attribute (ref_die, TREE_TYPE (type), 0, 0, context_die);
   add_AT_unsigned (mod_type_die, DW_AT_byte_size, PTR_SIZE);


@@ -7386,8 +7677,9 @@ gen_ptr_to_mbr_type_die (type, context_die)
      register tree type;
      register dw_die_ref context_die;
 {
      register tree type;
      register dw_die_ref context_die;
 {

-  register dw_die_ref ptr_die = new_die
-    (DW_TAG_ptr_to_member_type, scope_die_for (type, context_die));
+  register dw_die_ref ptr_die
+    = new_die (DW_TAG_ptr_to_member_type, scope_die_for (type, context_die));
+

   equate_type_number_to_die (type, ptr_die);
   add_AT_die_ref (ptr_die, DW_AT_containing_type,
                  lookup_type_die (TYPE_OFFSET_BASETYPE (type)));
   equate_type_number_to_die (type, ptr_die);
   add_AT_die_ref (ptr_die, DW_AT_containing_type,
                  lookup_type_die (TYPE_OFFSET_BASETYPE (type)));


@@ -7395,6 +7687,7 @@ gen_ptr_to_mbr_type_die (type, context_die)
 }
 
 /* Generate the DIE for the compilation unit.  */
 }
 
 /* Generate the DIE for the compilation unit.  */

+

 static void
 gen_compile_unit_die (main_input_filename)
      register char *main_input_filename;
 static void
 gen_compile_unit_die (main_input_filename)
      register char *main_input_filename;


@@ -7403,13 +7696,10 @@ gen_compile_unit_die (main_input_filename)
   char *wd = getpwd ();
 
   comp_unit_die = new_die (DW_TAG_compile_unit, NULL);
   char *wd = getpwd ();
 
   comp_unit_die = new_die (DW_TAG_compile_unit, NULL);

-

   add_name_attribute (comp_unit_die, main_input_filename);
 
   add_name_attribute (comp_unit_die, main_input_filename);
 

-  if (wd)
-    {
-      add_AT_string (comp_unit_die, DW_AT_comp_dir, wd);
-    }
+  if (wd != NULL)
+    add_AT_string (comp_unit_die, DW_AT_comp_dir, wd);

 
   sprintf (producer, "%s %s", language_string, version_string);
 
 
   sprintf (producer, "%s %s", language_string, version_string);
 


@@ -7428,12 +7718,16 @@ gen_compile_unit_die (main_input_filename)
 
   if (strcmp (language_string, "GNU C++") == 0)
     add_AT_unsigned (comp_unit_die, DW_AT_language, DW_LANG_C_plus_plus);
 
   if (strcmp (language_string, "GNU C++") == 0)
     add_AT_unsigned (comp_unit_die, DW_AT_language, DW_LANG_C_plus_plus);

+

   else if (strcmp (language_string, "GNU Ada") == 0)
     add_AT_unsigned (comp_unit_die, DW_AT_language, DW_LANG_Ada83);
   else if (strcmp (language_string, "GNU Ada") == 0)
     add_AT_unsigned (comp_unit_die, DW_AT_language, DW_LANG_Ada83);

+

   else if (strcmp (language_string, "GNU F77") == 0)
     add_AT_unsigned (comp_unit_die, DW_AT_language, DW_LANG_Fortran77);
   else if (strcmp (language_string, "GNU F77") == 0)
     add_AT_unsigned (comp_unit_die, DW_AT_language, DW_LANG_Fortran77);

+

   else if (flag_traditional)
     add_AT_unsigned (comp_unit_die, DW_AT_language, DW_LANG_C);
   else if (flag_traditional)
     add_AT_unsigned (comp_unit_die, DW_AT_language, DW_LANG_C);

+

   else
     add_AT_unsigned (comp_unit_die, DW_AT_language, DW_LANG_C89);
 
   else
     add_AT_unsigned (comp_unit_die, DW_AT_language, DW_LANG_C89);
 


@@ -7444,31 +7738,36 @@ gen_compile_unit_die (main_input_filename)
 }
 
 /* Generate a DIE for a string type.  */
 }
 
 /* Generate a DIE for a string type.  */

+

 static void
 gen_string_type_die (type, context_die)
      register tree type;
      register dw_die_ref context_die;
 {
 static void
 gen_string_type_die (type, context_die)
      register tree type;
      register dw_die_ref context_die;
 {

-  register dw_die_ref type_die = new_die
-    (DW_TAG_string_type, scope_die_for (type, context_die));
+  register dw_die_ref type_die
+    = new_die (DW_TAG_string_type, scope_die_for (type, context_die));
+

   equate_type_number_to_die (type, type_die);
 
   /* Fudge the string length attribute for now.  */
   equate_type_number_to_die (type, type_die);
 
   /* Fudge the string length attribute for now.  */

-
+  

   /* TODO: add string length info.
   /* TODO: add string length info.

-     string_length_attribute (TYPE_MAX_VALUE (TYPE_DOMAIN (type)));
+   string_length_attribute (TYPE_MAX_VALUE (TYPE_DOMAIN (type)));

                              bound_representation (upper_bound, 0, 'u'); */
 }
 
 /* Generate the DIE for a base class.  */
                              bound_representation (upper_bound, 0, 'u'); */
 }
 
 /* Generate the DIE for a base class.  */

+

 static void
 gen_inheritance_die (binfo, context_die)
      register tree binfo;
      register dw_die_ref context_die;
 {
   dw_die_ref die = new_die (DW_TAG_inheritance, context_die);
 static void
 gen_inheritance_die (binfo, context_die)
      register tree binfo;
      register dw_die_ref context_die;
 {
   dw_die_ref die = new_die (DW_TAG_inheritance, context_die);

+

   add_type_attribute (die, BINFO_TYPE (binfo), 0, 0, context_die);
   add_data_member_location_attribute (die, binfo);
   add_type_attribute (die, BINFO_TYPE (binfo), 0, 0, context_die);
   add_data_member_location_attribute (die, binfo);

+

   if (TREE_VIA_VIRTUAL (binfo))
     add_AT_unsigned (die, DW_AT_virtuality, DW_VIRTUALITY_virtual);
   if (TREE_VIA_PUBLIC (binfo))
   if (TREE_VIA_VIRTUAL (binfo))
     add_AT_unsigned (die, DW_AT_virtuality, DW_VIRTUALITY_virtual);
   if (TREE_VIA_PUBLIC (binfo))


@@ -7478,12 +7777,14 @@ gen_inheritance_die (binfo, context_die)
 }
 
 /* Genearate a DIE for a class member.  */
 }
 
 /* Genearate a DIE for a class member.  */

+

 static void
 gen_member_die (type, context_die)
      register tree type;
      register dw_die_ref context_die;
 {
   register tree member;
 static void
 gen_member_die (type, context_die)
      register tree type;
      register dw_die_ref context_die;
 {
   register tree member;

+

   /* If this is not an incomplete type, output descriptions of each of its
      members. Note that as we output the DIEs necessary to represent the
      members of this record or union type, we will also be trying to output
   /* If this is not an incomplete type, output descriptions of each of its
      members. Note that as we output the DIEs necessary to represent the
      members of this record or union type, we will also be trying to output


@@ -7518,6 +7819,7 @@ gen_member_die (type, context_die)
 }
 
 /* Generate a DIE for a structure or union type.  */
 }
 
 /* Generate a DIE for a structure or union type.  */

+

 static void
 gen_struct_or_union_type_die (type, context_die)
      register tree type;
 static void
 gen_struct_or_union_type_die (type, context_die)
      register tree type;


@@ -7530,7 +7832,7 @@ gen_struct_or_union_type_die (type, context_die)
   if (type_die && ! TYPE_SIZE (type))
     return;
 
   if (type_die && ! TYPE_SIZE (type))
     return;
 

-  if (TYPE_CONTEXT (type)
+  if (TYPE_CONTEXT (type) != NULL_TREE

       && TREE_CODE_CLASS (TREE_CODE (TYPE_CONTEXT (type))) == 't')
     nested = 1;
 
       && TREE_CODE_CLASS (TREE_CODE (TYPE_CONTEXT (type))) == 't')
     nested = 1;
 


@@ -7540,6 +7842,7 @@ gen_struct_or_union_type_die (type, context_die)
     /* First occurrence of type or toplevel definition of nested class.  */
     {
       register dw_die_ref old_die = type_die;
     /* First occurrence of type or toplevel definition of nested class.  */
     {
       register dw_die_ref old_die = type_die;

+

       type_die = new_die (TREE_CODE (type) == RECORD_TYPE
                          ? DW_TAG_structure_type : DW_TAG_union_type,
                          scope_die);
       type_die = new_die (TREE_CODE (type) == RECORD_TYPE
                          ? DW_TAG_structure_type : DW_TAG_union_type,
                          scope_die);


@@ -7568,13 +7871,16 @@ gen_struct_or_union_type_die (type, context_die)
       add_byte_size_attribute (type_die, type);
       if (type_tag (type))
        add_src_coords_attributes (type_die, TYPE_STUB_DECL (type));
       add_byte_size_attribute (type_die, type);
       if (type_tag (type))
        add_src_coords_attributes (type_die, TYPE_STUB_DECL (type));

+

       push_decl_scope (type);
       gen_member_die (type, type_die);
       pop_decl_scope ();
       push_decl_scope (type);
       gen_member_die (type, type_die);
       pop_decl_scope ();

+

       /* GNU extension: Record what type our vtable lives in.  */
       if (TYPE_VFIELD (type))
        {
          tree vtype = DECL_FCONTEXT (TYPE_VFIELD (type));
       /* GNU extension: Record what type our vtable lives in.  */
       if (TYPE_VFIELD (type))
        {
          tree vtype = DECL_FCONTEXT (TYPE_VFIELD (type));

+

          gen_type_die (vtype, context_die);
          add_AT_die_ref (type_die, DW_AT_containing_type,
                          lookup_type_die (vtype));
          gen_type_die (vtype, context_die);
          add_AT_die_ref (type_die, DW_AT_containing_type,
                          lookup_type_die (vtype));


@@ -7585,14 +7891,16 @@ gen_struct_or_union_type_die (type, context_die)
 }
 
 /* Generate a DIE for a subroutine _type_.  */
 }
 
 /* Generate a DIE for a subroutine _type_.  */

+

 static void
 gen_subroutine_type_die (type, context_die)
      register tree type;
      register dw_die_ref context_die;
 {
   register tree return_type = TREE_TYPE (type);
 static void
 gen_subroutine_type_die (type, context_die)
      register tree type;
      register dw_die_ref context_die;
 {
   register tree return_type = TREE_TYPE (type);

-  register dw_die_ref subr_die = new_die
-    (DW_TAG_subroutine_type, scope_die_for (type, context_die));
+  register dw_die_ref subr_die
+    = new_die (DW_TAG_subroutine_type, scope_die_for (type, context_die));
+

   equate_type_number_to_die (type, subr_die);
   add_prototyped_attribute (subr_die, type);
   add_type_attribute (subr_die, return_type, 0, 0, context_die);
   equate_type_number_to_die (type, subr_die);
   add_prototyped_attribute (subr_die, type);
   add_type_attribute (subr_die, return_type, 0, 0, context_die);


@@ -7600,6 +7908,7 @@ gen_subroutine_type_die (type, context_die)
 }
 
 /* Generate a DIE for a type definition */
 }
 
 /* Generate a DIE for a type definition */

+

 static void
 gen_typedef_die (decl, context_die)
      register tree decl;
 static void
 gen_typedef_die (decl, context_die)
      register tree decl;


@@ -7630,20 +7939,20 @@ gen_typedef_die (decl, context_die)
       add_type_attribute (type_die, type, TREE_READONLY (decl),
                          TREE_THIS_VOLATILE (decl), context_die);
     }
       add_type_attribute (type_die, type, TREE_READONLY (decl),
                          TREE_THIS_VOLATILE (decl), context_die);
     }

+

   if (DECL_ABSTRACT (decl))
     equate_decl_number_to_die (decl, type_die);
 }
 
 /* Generate a type description DIE.  */
   if (DECL_ABSTRACT (decl))
     equate_decl_number_to_die (decl, type_die);
 }
 
 /* Generate a type description DIE.  */

+

 static void
 gen_type_die (type, context_die)
      register tree type;
      register dw_die_ref context_die;
 {
 static void
 gen_type_die (type, context_die)
      register tree type;
      register dw_die_ref context_die;
 {

-  if (type == 0 || type == error_mark_node)
-    {
-      return;
-    }
+  if (type == NULL_TREE || type == error_mark_node)
+    return;

 
   /* We are going to output a DIE to represent the unqualified version of of
      this type (i.e. without any const or volatile qualifiers) so get the
 
   /* We are going to output a DIE to represent the unqualified version of of
      this type (i.e. without any const or volatile qualifiers) so get the


@@ -7651,9 +7960,7 @@ gen_type_die (type, context_die)
   type = type_main_variant (type);
 
   if (TREE_ASM_WRITTEN (type))
   type = type_main_variant (type);
 
   if (TREE_ASM_WRITTEN (type))

-    {
-      return;
-    }
+    return;

 
   if (TYPE_NAME (type) && TREE_CODE (TYPE_NAME (type)) == TYPE_DECL
       && DECL_ORIGINAL_TYPE (TYPE_NAME (type)))
 
   if (TYPE_NAME (type) && TREE_CODE (TYPE_NAME (type)) == TYPE_DECL
       && DECL_ORIGINAL_TYPE (TYPE_NAME (type)))


@@ -7676,11 +7983,13 @@ gen_type_die (type, context_die)
       break;
 
     case OFFSET_TYPE:
       break;
 
     case OFFSET_TYPE:

-      /* This code is used for C++ pointer-to-data-member types.  */
-      /* Output a description of the relevant class type.  */
+      /* This code is used for C++ pointer-to-data-member types. 
+        Output a description of the relevant class type.  */

       gen_type_die (TYPE_OFFSET_BASETYPE (type), context_die);
       gen_type_die (TYPE_OFFSET_BASETYPE (type), context_die);

+

       /* Output a description of the type of the object pointed to.  */
       gen_type_die (TREE_TYPE (type), context_die);
       /* Output a description of the type of the object pointed to.  */
       gen_type_die (TREE_TYPE (type), context_die);

+

       /* Now output a DIE to represent this pointer-to-data-member type
          itself.  */
       gen_ptr_to_mbr_type_die (type, context_die);
       /* Now output a DIE to represent this pointer-to-data-member type
          itself.  */
       gen_ptr_to_mbr_type_die (type, context_die);


@@ -7715,9 +8024,7 @@ gen_type_die (type, context_die)
          gen_string_type_die (type, context_die);
        }
       else
          gen_string_type_die (type, context_die);
        }
       else

-       {
-         gen_array_type_die (type, context_die);
-       }
+       gen_array_type_die (type, context_die);

       break;
 
     case ENUMERAL_TYPE:
       break;
 
     case ENUMERAL_TYPE:


@@ -7776,15 +8083,14 @@ gen_type_die (type, context_die)
 }
 
 /* Generate a DIE for a tagged type instantiation.  */
 }
 
 /* Generate a DIE for a tagged type instantiation.  */

+

 static void
 gen_tagged_type_instantiation_die (type, context_die)
      register tree type;
      register dw_die_ref context_die;
 {
 static void
 gen_tagged_type_instantiation_die (type, context_die)
      register tree type;
      register dw_die_ref context_die;
 {

-  if (type == 0 || type == error_mark_node)
-    {
-      return;
-    }
+  if (type == NULL_TREE || type == error_mark_node)
+    return;

 
   /* We are going to output a DIE to represent the unqualified version of of
      this type (i.e. without any const or volatile qualifiers) so make sure
 
   /* We are going to output a DIE to represent the unqualified version of of
      this type (i.e. without any const or volatile qualifiers) so make sure


@@ -7812,12 +8118,13 @@ gen_tagged_type_instantiation_die (type, context_die)
       break;
 
     default:
       break;
 
     default:

-      abort ();                        /* Should never happen.  */
+      abort ();

     }
 }
 
 /* Generate a DW_TAG_lexical_block DIE followed by DIEs to represent all of the
    things which are local to the given block.  */
     }
 }
 
 /* Generate a DW_TAG_lexical_block DIE followed by DIEs to represent all of the
    things which are local to the given block.  */

+

 static void
 gen_block_die (stmt, context_die, depth)
      register tree stmt;
 static void
 gen_block_die (stmt, context_die, depth)
      register tree stmt;


@@ -7831,10 +8138,8 @@ gen_block_die (stmt, context_die, depth)
 
   /* Ignore blocks never really used to make RTL.  */
 
 
   /* Ignore blocks never really used to make RTL.  */
 

-  if (!stmt || !TREE_USED (stmt))
-    {
-      return;
-    }
+  if (stmt == NULL_TREE || !TREE_USED (stmt))
+    return;

 
   /* Determine the "ultimate origin" of this block.  This block may be an
      inlined instance of an inlined instance of inline function, so we have
 
   /* Determine the "ultimate origin" of this block.  This block may be an
      inlined instance of an inlined instance of inline function, so we have


@@ -7847,11 +8152,9 @@ gen_block_die (stmt, context_die, depth)
   /* Determine if we need to output any Dwarf DIEs at all to represent this
      block.  */
   if (origin_code == FUNCTION_DECL)
   /* Determine if we need to output any Dwarf DIEs at all to represent this
      block.  */
   if (origin_code == FUNCTION_DECL)

-    {
-      /* The outer scopes for inlinings *must* always be represented.  We
-         generate DW_TAG_inlined_subroutine DIEs for them.  (See below.) */
-      must_output_die = 1;
-    }
+    /* The outer scopes for inlinings *must* always be represented.  We
+       generate DW_TAG_inlined_subroutine DIEs for them.  (See below.) */
+    must_output_die = 1;

   else
     {
       /* In the case where the current block represents an inlining of the
   else
     {
       /* In the case where the current block represents an inlining of the


@@ -7867,26 +8170,20 @@ gen_block_die (stmt, context_die, depth)
          /* Determine if this block directly contains any "significant"
             local declarations which we will need to output DIEs for.  */
          if (debug_info_level > DINFO_LEVEL_TERSE)
          /* Determine if this block directly contains any "significant"
             local declarations which we will need to output DIEs for.  */
          if (debug_info_level > DINFO_LEVEL_TERSE)

-           {
-             /* We are not in terse mode so *any* local declaration counts
-                as being a "significant" one.  */
-             must_output_die = (BLOCK_VARS (stmt) != NULL);
-           }
+           /* We are not in terse mode so *any* local declaration counts
+              as being a "significant" one.  */
+           must_output_die = (BLOCK_VARS (stmt) != NULL);

          else
          else

-           {
-             /* We are in terse mode, so only local (nested) function
-                definitions count as "significant" local declarations.  */
-             for (decl = BLOCK_VARS (stmt);
-                  decl != NULL; decl = TREE_CHAIN (decl))
+           /* We are in terse mode, so only local (nested) function
+              definitions count as "significant" local declarations.  */
+           for (decl = BLOCK_VARS (stmt);
+                decl != NULL; decl = TREE_CHAIN (decl))
+             if (TREE_CODE (decl) == FUNCTION_DECL
+                 && DECL_INITIAL (decl))

                {
                {

-                 if (TREE_CODE (decl) == FUNCTION_DECL
-                     && DECL_INITIAL (decl))
-                   {
-                     must_output_die = 1;
-                     break;
-                   }
+                 must_output_die = 1;
+                 break;

                }
                }

-           }

        }
     }
 
        }
     }
 


@@ -7900,13 +8197,9 @@ gen_block_die (stmt, context_die, depth)
   if (must_output_die)
     {
       if (origin_code == FUNCTION_DECL)
   if (must_output_die)
     {
       if (origin_code == FUNCTION_DECL)

-       {
-         gen_inlined_subroutine_die (stmt, context_die, depth);
-       }
+       gen_inlined_subroutine_die (stmt, context_die, depth);

       else
       else

-       {
-         gen_lexical_block_die (stmt, context_die, depth);
-       }
+       gen_lexical_block_die (stmt, context_die, depth);

     }
   else
     decls_for_scope (stmt, context_die, depth);
     }
   else
     decls_for_scope (stmt, context_die, depth);


@@ -7914,6 +8207,7 @@ gen_block_die (stmt, context_die, depth)
 
 /* Generate all of the decls declared within a given scope and (recursively)
    all of it's sub-blocks.  */
 
 /* Generate all of the decls declared within a given scope and (recursively)
    all of it's sub-blocks.  */

+

 static void
 decls_for_scope (stmt, context_die, depth)
      register tree stmt;
 static void
 decls_for_scope (stmt, context_die, depth)
      register tree stmt;


@@ -7922,15 +8216,13 @@ decls_for_scope (stmt, context_die, depth)
 {
   register tree decl;
   register tree subblocks;
 {
   register tree decl;
   register tree subblocks;

+

   /* Ignore blocks never really used to make RTL.  */
   /* Ignore blocks never really used to make RTL.  */

-  if (!stmt || !TREE_USED (stmt))
-    {
-      return;
-    }
+  if (stmt == NULL_TREE || ! TREE_USED (stmt))
+    return;
+

   if (!BLOCK_ABSTRACT (stmt) && depth > 0)
   if (!BLOCK_ABSTRACT (stmt) && depth > 0)

-    {
-      next_block_number++;
-    }
+    next_block_number++;

 
   /* Output the DIEs to represent all of the data objects and typedefs
      declared directly within this block but not within any nested
 
   /* Output the DIEs to represent all of the data objects and typedefs
      declared directly within this block but not within any nested


@@ -7948,7 +8240,7 @@ decls_for_scope (stmt, context_die, depth)
       else
        die = NULL;
 
       else
        die = NULL;
 

-      if (die && die->die_parent == NULL)
+      if (die != NULL && die->die_parent == NULL)

        {
          add_child_die (context_die, die);
          --limbo_die_count;
        {
          add_child_die (context_die, die);
          --limbo_die_count;


@@ -7962,18 +8254,18 @@ decls_for_scope (stmt, context_die, depth)
   for (subblocks = BLOCK_SUBBLOCKS (stmt);
        subblocks != NULL;
        subblocks = BLOCK_CHAIN (subblocks))
   for (subblocks = BLOCK_SUBBLOCKS (stmt);
        subblocks != NULL;
        subblocks = BLOCK_CHAIN (subblocks))

-    {
-      gen_block_die (subblocks, context_die, depth + 1);
-    }
+    gen_block_die (subblocks, context_die, depth + 1);

 }
 
 /* Is this a typedef we can avoid emitting?  */
 }
 
 /* Is this a typedef we can avoid emitting?  */

-inline int
+
+static inline int

 is_redundant_typedef (decl)
      register tree decl;
 {
   if (TYPE_DECL_IS_STUB (decl))
     return 1;
 is_redundant_typedef (decl)
      register tree decl;
 {
   if (TYPE_DECL_IS_STUB (decl))
     return 1;

+

   if (DECL_ARTIFICIAL (decl)
       && DECL_CONTEXT (decl)
       && is_tagged_type (DECL_CONTEXT (decl))
   if (DECL_ARTIFICIAL (decl)
       && DECL_CONTEXT (decl)
       && is_tagged_type (DECL_CONTEXT (decl))


@@ -7981,25 +8273,26 @@ is_redundant_typedef (decl)
       && DECL_NAME (decl) == DECL_NAME (TYPE_NAME (DECL_CONTEXT (decl))))
     /* Also ignore the artificial member typedef for the class name.  */
     return 1;
       && DECL_NAME (decl) == DECL_NAME (TYPE_NAME (DECL_CONTEXT (decl))))
     /* Also ignore the artificial member typedef for the class name.  */
     return 1;

+

   return 0;
 }
 
 /* Generate Dwarf debug information for a decl described by DECL.  */
   return 0;
 }
 
 /* Generate Dwarf debug information for a decl described by DECL.  */

+

 static void
 gen_decl_die (decl, context_die)
      register tree decl;
      register dw_die_ref context_die;
 {
   register tree origin;
 static void
 gen_decl_die (decl, context_die)
      register tree decl;
      register dw_die_ref context_die;
 {
   register tree origin;

+

   /* Make a note of the decl node we are going to be working on.  We may need 
      to give the user the source coordinates of where it appeared in case we
      notice (later on) that something about it looks screwy.  */
   dwarf_last_decl = decl;
 
   if (TREE_CODE (decl) == ERROR_MARK)
   /* Make a note of the decl node we are going to be working on.  We may need 
      to give the user the source coordinates of where it appeared in case we
      notice (later on) that something about it looks screwy.  */
   dwarf_last_decl = decl;
 
   if (TREE_CODE (decl) == ERROR_MARK)

-    {
-      return;
-    }
+    return;

 
   /* If this ..._DECL node is marked to be ignored, then ignore it. But don't 
      ignore a function definition, since that would screw up our count of
 
   /* If this ..._DECL node is marked to be ignored, then ignore it. But don't 
      ignore a function definition, since that would screw up our count of


@@ -8007,9 +8300,7 @@ gen_decl_die (decl, context_die)
      reference in subsequent DW_AT_low_pc and DW_AT_high_pc attributes (for
      subsequent blocks).  */
   if (DECL_IGNORED_P (decl) && TREE_CODE (decl) != FUNCTION_DECL)
      reference in subsequent DW_AT_low_pc and DW_AT_high_pc attributes (for
      subsequent blocks).  */
   if (DECL_IGNORED_P (decl) && TREE_CODE (decl) != FUNCTION_DECL)

-    {
-      return;
-    }
+    return;

 
   switch (TREE_CODE (decl))
     {
 
   switch (TREE_CODE (decl))
     {


@@ -8023,9 +8314,7 @@ gen_decl_die (decl, context_die)
         unless they are class members or explicit block externs.  */
       if (DECL_INITIAL (decl) == NULL_TREE && DECL_CONTEXT (decl) == NULL_TREE
          && (current_function_decl == NULL_TREE || ! DECL_ARTIFICIAL (decl)))
         unless they are class members or explicit block externs.  */
       if (DECL_INITIAL (decl) == NULL_TREE && DECL_CONTEXT (decl) == NULL_TREE
          && (current_function_decl == NULL_TREE || ! DECL_ARTIFICIAL (decl)))

-       {
-         break;
-       }
+       break;

 
       if (debug_info_level > DINFO_LEVEL_TERSE)
        {
 
       if (debug_info_level > DINFO_LEVEL_TERSE)
        {


@@ -8035,11 +8324,11 @@ gen_decl_die (decl, context_die)
 
          /* And its containing type.  */
          origin = decl_class_context (decl);
 
          /* And its containing type.  */
          origin = decl_class_context (decl);

-         if (origin)
+         if (origin != NULL_TREE)

            gen_type_die (origin, context_die);
 
          /* And its virtual context.  */
            gen_type_die (origin, context_die);
 
          /* And its virtual context.  */

-         if (DECL_VINDEX (decl))
+         if (DECL_VINDEX (decl) != NULL_TREE)

            gen_type_die (DECL_CONTEXT (decl), context_die);
        }
 
            gen_type_die (DECL_CONTEXT (decl), context_die);
        }
 


@@ -8060,7 +8349,7 @@ gen_decl_die (decl, context_die)
          inline function) we have to generate a special (abbreviated)
          DW_TAG_structure_type, DW_TAG_union_type, or DW_TAG_enumeration-type 
          DIE here.  */
          inline function) we have to generate a special (abbreviated)
          DW_TAG_structure_type, DW_TAG_union_type, or DW_TAG_enumeration-type 
          DIE here.  */

-      if (TYPE_DECL_IS_STUB (decl) && DECL_ABSTRACT_ORIGIN (decl))
+      if (TYPE_DECL_IS_STUB (decl) && DECL_ABSTRACT_ORIGIN (decl) != NULL_TREE)

        {
          gen_tagged_type_instantiation_die (TREE_TYPE (decl), context_die);
          break;
        {
          gen_tagged_type_instantiation_die (TREE_TYPE (decl), context_die);
          break;


@@ -8069,26 +8358,20 @@ gen_decl_die (decl, context_die)
       if (is_redundant_typedef (decl))
        gen_type_die (TREE_TYPE (decl), context_die);
       else
       if (is_redundant_typedef (decl))
        gen_type_die (TREE_TYPE (decl), context_die);
       else

-       {
-         /* Output a DIE to represent the typedef itself.  */
-         gen_typedef_die (decl, context_die);
-       }
+       /* Output a DIE to represent the typedef itself.  */
+       gen_typedef_die (decl, context_die);

       break;
 
     case LABEL_DECL:
       if (debug_info_level >= DINFO_LEVEL_NORMAL)
       break;
 
     case LABEL_DECL:
       if (debug_info_level >= DINFO_LEVEL_NORMAL)

-       {
-         gen_label_die (decl, context_die);
-       }
+       gen_label_die (decl, context_die);

       break;
 
     case VAR_DECL:
       /* If we are in terse mode, don't generate any DIEs to represent any
          variable declarations or definitions.  */
       if (debug_info_level <= DINFO_LEVEL_TERSE)
       break;
 
     case VAR_DECL:
       /* If we are in terse mode, don't generate any DIEs to represent any
          variable declarations or definitions.  */
       if (debug_info_level <= DINFO_LEVEL_TERSE)

-       {
-         break;
-       }
+       break;

 
       /* Output any DIEs that are needed to specify the type of this data
          object.  */
 
       /* Output any DIEs that are needed to specify the type of this data
          object.  */


@@ -8096,7 +8379,7 @@ gen_decl_die (decl, context_die)
 
       /* And its containing type.  */
       origin = decl_class_context (decl);
 
       /* And its containing type.  */
       origin = decl_class_context (decl);

-      if (origin)
+      if (origin != NULL_TREE)

        gen_type_die (origin, context_die);
 
       /* Now output the DIE to represent the data object itself.  This gets
        gen_type_die (origin, context_die);
 
       /* Now output the DIE to represent the data object itself.  This gets


@@ -8104,20 +8387,17 @@ gen_decl_die (decl, context_die)
          represents an inlined instance of a formal parameter for an inline
          function.  */
       origin = decl_ultimate_origin (decl);
          represents an inlined instance of a formal parameter for an inline
          function.  */
       origin = decl_ultimate_origin (decl);

-      if (origin != NULL && TREE_CODE (origin) == PARM_DECL)
-       {
-         gen_formal_parameter_die (decl, context_die);
-       }
+      if (origin != NULL_TREE && TREE_CODE (origin) == PARM_DECL)
+       gen_formal_parameter_die (decl, context_die);

       else
       else

-       {
-         gen_variable_die (decl, context_die);
-       }
+       gen_variable_die (decl, context_die);

       break;
 
     case FIELD_DECL:
       /* Ignore the nameless fields that are used to skip bits, but
         handle C++ anonymous unions.  */
       break;
 
     case FIELD_DECL:
       /* Ignore the nameless fields that are used to skip bits, but
         handle C++ anonymous unions.  */

-      if (DECL_NAME (decl) != 0 || TREE_CODE (TREE_TYPE (decl)) == UNION_TYPE)
+      if (DECL_NAME (decl) != NULL_TREE
+         || TREE_CODE (TREE_TYPE (decl)) == UNION_TYPE)

        {
          gen_type_die (member_declared_type (decl), context_die);
          gen_field_die (decl, context_die);
        {
          gen_type_die (member_declared_type (decl), context_die);
          gen_field_die (decl, context_die);


@@ -8134,7 +8414,8 @@ gen_decl_die (decl, context_die)
     }
 }
 \f
     }
 }
 \f

-/***************** Debug Information Generation Hooks ***********************/
+/* Write the debugging output for DECL.  */
+

 void
 dwarf2out_decl (decl)
      register tree decl;
 void
 dwarf2out_decl (decl)
      register tree decl;


@@ -8142,9 +8423,7 @@ dwarf2out_decl (decl)
   register dw_die_ref context_die = comp_unit_die;
 
   if (TREE_CODE (decl) == ERROR_MARK)
   register dw_die_ref context_die = comp_unit_die;
 
   if (TREE_CODE (decl) == ERROR_MARK)

-    {
-      return;
-    }
+    return;

 
   /* If this ..._DECL node is marked to be ignored, then ignore it.  We gotta 
      hope that the node in question doesn't represent a function definition.
 
   /* If this ..._DECL node is marked to be ignored, then ignore it.  We gotta 
      hope that the node in question doesn't represent a function definition.


@@ -8157,9 +8436,8 @@ dwarf2out_decl (decl)
     {
       if (TREE_CODE (decl) == FUNCTION_DECL
          && DECL_INITIAL (decl) != NULL)
     {
       if (TREE_CODE (decl) == FUNCTION_DECL
          && DECL_INITIAL (decl) != NULL)

-       {
-         abort ();
-       }
+       abort ();
+

       return;
     }
 
       return;
     }
 


@@ -8218,16 +8496,12 @@ dwarf2out_decl (decl)
          would screw-up the debugger's name lookup mechanism and cause it to
          miss things which really ought to be in scope at a given point.  */
       if (DECL_EXTERNAL (decl) && !TREE_USED (decl))
          would screw-up the debugger's name lookup mechanism and cause it to
          miss things which really ought to be in scope at a given point.  */
       if (DECL_EXTERNAL (decl) && !TREE_USED (decl))

-       {
-         return;
-       }
+       return;

 
       /* If we are in terse mode, don't generate any DIEs to represent any
          variable declarations or definitions.  */
       if (debug_info_level <= DINFO_LEVEL_TERSE)
 
       /* If we are in terse mode, don't generate any DIEs to represent any
          variable declarations or definitions.  */
       if (debug_info_level <= DINFO_LEVEL_TERSE)

-       {
-         return;
-       }
+       return;

       break;
 
     case TYPE_DECL:
       break;
 
     case TYPE_DECL:


@@ -8241,6 +8515,7 @@ dwarf2out_decl (decl)
               == DW_LANG_C_plus_plus)
              && TREE_CODE (TREE_TYPE (decl)) == BOOLEAN_TYPE)
            modified_type_die (TREE_TYPE (decl), 0, 0, NULL);
               == DW_LANG_C_plus_plus)
              && TREE_CODE (TREE_TYPE (decl)) == BOOLEAN_TYPE)
            modified_type_die (TREE_TYPE (decl), 0, 0, NULL);

+

          return;
        }
 
          return;
        }
 


@@ -8263,16 +8538,13 @@ dwarf2out_decl (decl)
   gen_decl_die (decl, context_die);
   output_pending_types_for_scope (comp_unit_die);
 
   gen_decl_die (decl, context_die);
   output_pending_types_for_scope (comp_unit_die);
 

-  if (TREE_CODE (decl) == FUNCTION_DECL
-      && DECL_INITIAL (decl) != NULL)
-    {
-      current_funcdef_number++;
-    }
-
+  if (TREE_CODE (decl) == FUNCTION_DECL && DECL_INITIAL (decl) != NULL_TREE)
+    current_funcdef_number++;

 }
 
 /* Output a marker (i.e. a label) for the beginning of the generated code for
    a lexical block.  */
 }
 
 /* Output a marker (i.e. a label) for the beginning of the generated code for
    a lexical block.  */

+

 void
 dwarf2out_begin_block (blocknum)
      register unsigned blocknum;
 void
 dwarf2out_begin_block (blocknum)
      register unsigned blocknum;


@@ -8283,6 +8555,7 @@ dwarf2out_begin_block (blocknum)
 
 /* Output a marker (i.e. a label) for the end of the generated code for a
    lexical block.  */
 
 /* Output a marker (i.e. a label) for the end of the generated code for a
    lexical block.  */

+

 void
 dwarf2out_end_block (blocknum)
      register unsigned blocknum;
 void
 dwarf2out_end_block (blocknum)
      register unsigned blocknum;


@@ -8293,11 +8566,13 @@ dwarf2out_end_block (blocknum)
 
 /* Output a marker (i.e. a label) at a point in the assembly code which
    corresponds to a given source level label.  */
 
 /* Output a marker (i.e. a label) at a point in the assembly code which
    corresponds to a given source level label.  */

+

 void
 dwarf2out_label (insn)
      register rtx insn;
 {
   char label[MAX_ARTIFICIAL_LABEL_BYTES];
 void
 dwarf2out_label (insn)
      register rtx insn;
 {
   char label[MAX_ARTIFICIAL_LABEL_BYTES];

+

   if (debug_info_level >= DINFO_LEVEL_NORMAL)
     {
       function_section (current_function_decl);
   if (debug_info_level >= DINFO_LEVEL_NORMAL)
     {
       function_section (current_function_decl);


@@ -8309,6 +8584,7 @@ dwarf2out_label (insn)
 
 /* Output a marker (i.e. a label) for the beginning of a function, before
    the prologue.  */
 
 /* Output a marker (i.e. a label) for the beginning of a function, before
    the prologue.  */

+

 void
 dwarf2out_begin_prologue ()
 {
 void
 dwarf2out_begin_prologue ()
 {


@@ -8324,8 +8600,9 @@ dwarf2out_begin_prologue ()
   if (fde_table_in_use == fde_table_allocated)
     {
       fde_table_allocated += FDE_TABLE_INCREMENT;
   if (fde_table_in_use == fde_table_allocated)
     {
       fde_table_allocated += FDE_TABLE_INCREMENT;

-      fde_table = (dw_fde_ref) xrealloc (fde_table,
-              fde_table_allocated * sizeof (dw_fde_node));
+      fde_table
+       = (dw_fde_ref) xrealloc (fde_table,
+                                fde_table_allocated * sizeof (dw_fde_node));

     }
 
   /* Record the FDE associated with this function.  */
     }
 
   /* Record the FDE associated with this function.  */


@@ -8342,11 +8619,13 @@ dwarf2out_begin_prologue ()
 /* Output a marker (i.e. a label) for the absolute end of the generated code
    for a function definition.  This gets called *after* the epilogue code has
    been generated.  */
 /* Output a marker (i.e. a label) for the absolute end of the generated code
    for a function definition.  This gets called *after* the epilogue code has
    been generated.  */

+

 void
 dwarf2out_end_epilogue ()
 {
   dw_fde_ref fde;
   char label[MAX_ARTIFICIAL_LABEL_BYTES];
 void
 dwarf2out_end_epilogue ()
 {
   dw_fde_ref fde;
   char label[MAX_ARTIFICIAL_LABEL_BYTES];

+

   /* Output a label to mark the endpoint of the code generated for this
      function.        */
   ASM_GENERATE_INTERNAL_LABEL (label, FUNC_END_LABEL, current_funcdef_number);
   /* Output a label to mark the endpoint of the code generated for this
      function.        */
   ASM_GENERATE_INTERNAL_LABEL (label, FUNC_END_LABEL, current_funcdef_number);


@@ -8365,35 +8644,27 @@ dwarf2out_end_epilogue ()
    add it to the list and assign it the next available unique index number.
    In order to speed up searches, we remember the index of the filename
    was looked up last.  This handles the majority of all searches.  */
    add it to the list and assign it the next available unique index number.
    In order to speed up searches, we remember the index of the filename
    was looked up last.  This handles the majority of all searches.  */

+

 static unsigned
 lookup_filename (file_name)
      char *file_name;
 {
   static unsigned last_file_lookup_index = 0;
 static unsigned
 lookup_filename (file_name)
      char *file_name;
 {
   static unsigned last_file_lookup_index = 0;

-  register char *fn;

   register unsigned i;
 
   /* Check to see if the file name that was searched on the previous call
      matches this file name. If so, return the index.  */
   if (last_file_lookup_index != 0)
   register unsigned i;
 
   /* Check to see if the file name that was searched on the previous call
      matches this file name. If so, return the index.  */
   if (last_file_lookup_index != 0)

-    {
-      fn = file_table[last_file_lookup_index];
-      if (strcmp (file_name, fn) == 0)
-       {
-         return last_file_lookup_index;
-       }
-    }
+    if (strcmp (file_name, file_table[last_file_lookup_index]) == 0)
+      return last_file_lookup_index;

 
   /* Didn't match the previous lookup, search the table */
   for (i = 1; i < file_table_in_use; ++i)
 
   /* Didn't match the previous lookup, search the table */
   for (i = 1; i < file_table_in_use; ++i)

-    {
-      fn = file_table[i];
-      if (strcmp (file_name, fn) == 0)
-       {
-         last_file_lookup_index = i;
-         return i;
-       }
-    }
+    if (strcmp (file_name, file_table[i]) == 0)
+      {
+       last_file_lookup_index = i;
+       return i;
+      }

 
   /* Prepare to add a new table entry by making sure there is enough space in 
      the table to do so.  If not, expand the current table.  */
 
   /* Prepare to add a new table entry by making sure there is enough space in 
      the table to do so.  If not, expand the current table.  */


@@ -8401,19 +8672,21 @@ lookup_filename (file_name)
     {
       file_table_allocated += FILE_TABLE_INCREMENT;
       file_table
     {
       file_table_allocated += FILE_TABLE_INCREMENT;
       file_table

-       = (char **)
-       xrealloc (file_table, file_table_allocated * sizeof (char *));
+       = (char **) xrealloc (file_table,
+                             file_table_allocated * sizeof (char *));

     }
 
     }
 

-  /* add the new entry to the end of the filename table.  */
+  /* Add the new entry to the end of the filename table.  */

   file_table[file_table_in_use] = xstrdup (file_name);
   last_file_lookup_index = file_table_in_use++;
   file_table[file_table_in_use] = xstrdup (file_name);
   last_file_lookup_index = file_table_in_use++;

+

   return last_file_lookup_index;
 }
 
 /* Output a label to mark the beginning of a source code line entry
    and record information relating to this source line, in
    'line_info_table' for later output of the .debug_line section.  */
   return last_file_lookup_index;
 }
 
 /* Output a label to mark the beginning of a source code line entry
    and record information relating to this source line, in
    'line_info_table' for later output of the .debug_line section.  */

+

 void
 dwarf2out_line (filename, line)
      register char *filename;
 void
 dwarf2out_line (filename, line)
      register char *filename;


@@ -8436,12 +8709,13 @@ dwarf2out_line (filename, line)
            {
              separate_line_info_table_allocated += LINE_INFO_TABLE_INCREMENT;
              separate_line_info_table
            {
              separate_line_info_table_allocated += LINE_INFO_TABLE_INCREMENT;
              separate_line_info_table

-               = (dw_separate_line_info_ref) xrealloc
-               (separate_line_info_table,
-                separate_line_info_table_allocated
-                * sizeof (dw_separate_line_info_entry));
+               = (dw_separate_line_info_ref)
+                 xrealloc (separate_line_info_table,
+                           separate_line_info_table_allocated
+                           * sizeof (dw_separate_line_info_entry));

            }
            }

-         /* add the new entry at the end of the line_info_table.  */
+
+         /* Add the new entry at the end of the line_info_table.  */

          line_info
            = &separate_line_info_table[separate_line_info_table_in_use++];
          line_info->dw_file_num = lookup_filename (filename);
          line_info
            = &separate_line_info_table[separate_line_info_table_in_use++];
          line_info->dw_file_num = lookup_filename (filename);


@@ -8451,20 +8725,23 @@ dwarf2out_line (filename, line)
       else
        {
          register dw_line_info_ref line_info;
       else
        {
          register dw_line_info_ref line_info;

+

          ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, LINE_CODE_LABEL,
                                     line_info_table_in_use);
          fputc ('\n', asm_out_file);
 
          ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, LINE_CODE_LABEL,
                                     line_info_table_in_use);
          fputc ('\n', asm_out_file);
 

-         /* expand the line info table if necessary */
+         /* Expand the line info table if necessary.  */

          if (line_info_table_in_use == line_info_table_allocated)
            {
              line_info_table_allocated += LINE_INFO_TABLE_INCREMENT;
              line_info_table
          if (line_info_table_in_use == line_info_table_allocated)
            {
              line_info_table_allocated += LINE_INFO_TABLE_INCREMENT;
              line_info_table

-               = (dw_line_info_ref) xrealloc
-               (line_info_table,
-                line_info_table_allocated * sizeof (dw_line_info_entry));
+               = (dw_line_info_ref)
+                 xrealloc (line_info_table,
+                           (line_info_table_allocated
+                            * sizeof (dw_line_info_entry)));

            }
            }

-         /* add the new entry at the end of the line_info_table.  */
+
+         /* Add the new entry at the end of the line_info_table.  */

          line_info = &line_info_table[line_info_table_in_use++];
          line_info->dw_file_num = lookup_filename (filename);
          line_info->dw_line_num = line;
          line_info = &line_info_table[line_info_table_in_use++];
          line_info->dw_file_num = lookup_filename (filename);
          line_info->dw_line_num = line;


@@ -8474,6 +8751,7 @@ dwarf2out_line (filename, line)
 
 /* Record the beginning of a new source file, for later output
    of the .debug_macinfo section.  At present, unimplemented.  */
 
 /* Record the beginning of a new source file, for later output
    of the .debug_macinfo section.  At present, unimplemented.  */

+

 void
 dwarf2out_start_source_file (filename)
      register char *filename;
 void
 dwarf2out_start_source_file (filename)
      register char *filename;


@@ -8482,6 +8760,7 @@ dwarf2out_start_source_file (filename)
 
 /* Record the end of a source file, for later output
    of the .debug_macinfo section.  At present, unimplemented.  */
 
 /* Record the end of a source file, for later output
    of the .debug_macinfo section.  At present, unimplemented.  */

+

 void
 dwarf2out_end_source_file ()
 {
 void
 dwarf2out_end_source_file ()
 {


@@ -8490,6 +8769,7 @@ dwarf2out_end_source_file ()
 /* Called from check_newline in c-parse.y.  The `buffer' parameter contains
    the tail part of the directive line, i.e. the part which is past the
    initial whitespace, #, whitespace, directive-name, whitespace part.  */
 /* Called from check_newline in c-parse.y.  The `buffer' parameter contains
    the tail part of the directive line, i.e. the part which is past the
    initial whitespace, #, whitespace, directive-name, whitespace part.  */

+

 void
 dwarf2out_define (lineno, buffer)
      register unsigned lineno;
 void
 dwarf2out_define (lineno, buffer)
      register unsigned lineno;


@@ -8506,6 +8786,7 @@ dwarf2out_define (lineno, buffer)
 /* Called from check_newline in c-parse.y.  The `buffer' parameter contains
    the tail part of the directive line, i.e. the part which is past the
    initial whitespace, #, whitespace, directive-name, whitespace part.  */
 /* Called from check_newline in c-parse.y.  The `buffer' parameter contains
    the tail part of the directive line, i.e. the part which is past the
    initial whitespace, #, whitespace, directive-name, whitespace part.  */

+

 void
 dwarf2out_undef (lineno, buffer)
      register unsigned lineno;
 void
 dwarf2out_undef (lineno, buffer)
      register unsigned lineno;


@@ -8514,6 +8795,7 @@ dwarf2out_undef (lineno, buffer)
 }
 
 /* Set up for Dwarf output at the start of compilation.  */
 }
 
 /* Set up for Dwarf output at the start of compilation.  */

+

 void
 dwarf2out_init (asm_out_file, main_input_filename)
      register FILE *asm_out_file;
 void
 dwarf2out_init (asm_out_file, main_input_filename)
      register FILE *asm_out_file;


@@ -8526,7 +8808,8 @@ dwarf2out_init (asm_out_file, main_input_filename)
   file_table = (char **) xmalloc (FILE_TABLE_INCREMENT * sizeof (char *));
   bzero ((char *) file_table, FILE_TABLE_INCREMENT * sizeof (char *));
   file_table_allocated = FILE_TABLE_INCREMENT;
   file_table = (char **) xmalloc (FILE_TABLE_INCREMENT * sizeof (char *));
   bzero ((char *) file_table, FILE_TABLE_INCREMENT * sizeof (char *));
   file_table_allocated = FILE_TABLE_INCREMENT;

-  /* skip the first entry - file numbers begin at 1 */
+
+  /* Skip the first entry - file numbers begin at 1.  */

   file_table_in_use = 1;
 
   /* Allocate the initial hunk of the decl_die_table.  */
   file_table_in_use = 1;
 
   /* Allocate the initial hunk of the decl_die_table.  */


@@ -8552,7 +8835,7 @@ dwarf2out_init (asm_out_file, main_input_filename)
   bzero ((char *) abbrev_die_table,
         ABBREV_DIE_TABLE_INCREMENT * sizeof (dw_die_ref));
   abbrev_die_table_allocated = ABBREV_DIE_TABLE_INCREMENT;
   bzero ((char *) abbrev_die_table,
         ABBREV_DIE_TABLE_INCREMENT * sizeof (dw_die_ref));
   abbrev_die_table_allocated = ABBREV_DIE_TABLE_INCREMENT;

-  /* zero-th entry is allocated, but unused */
+  /* Zero-th entry is allocated, but unused */

   abbrev_die_table_in_use = 1;
 
   /* Allocate the initial hunk of the line_info_table.  */
   abbrev_die_table_in_use = 1;
 
   /* Allocate the initial hunk of the line_info_table.  */


@@ -8562,7 +8845,7 @@ dwarf2out_init (asm_out_file, main_input_filename)
   bzero ((char *) line_info_table,
         LINE_INFO_TABLE_INCREMENT * sizeof (dw_line_info_entry));
   line_info_table_allocated = LINE_INFO_TABLE_INCREMENT;
   bzero ((char *) line_info_table,
         LINE_INFO_TABLE_INCREMENT * sizeof (dw_line_info_entry));
   line_info_table_allocated = LINE_INFO_TABLE_INCREMENT;

-  /* zero-th entry is allocated, but unused */
+  /* Zero-th entry is allocated, but unused */

   line_info_table_in_use = 1;
 
   /* Allocate the initial hunk of the fde_table.  */
   line_info_table_in_use = 1;
 
   /* Allocate the initial hunk of the fde_table.  */


@@ -8593,6 +8876,7 @@ dwarf2out_init (asm_out_file, main_input_filename)
 
 /* Output stuff that dwarf requires at the end of every file,
    and generate the DWARF-2 debugging info.  */
 
 /* Output stuff that dwarf requires at the end of every file,
    and generate the DWARF-2 debugging info.  */

+

 void
 dwarf2out_finish ()
 {
 void
 dwarf2out_finish ()
 {


@@ -8631,6 +8915,7 @@ dwarf2out_finish ()
          add_AT_lbl_id (comp_unit_die, DW_AT_low_pc, TEXT_SECTION);
          add_AT_lbl_id (comp_unit_die, DW_AT_high_pc, text_end_label);
        }
          add_AT_lbl_id (comp_unit_die, DW_AT_low_pc, TEXT_SECTION);
          add_AT_lbl_id (comp_unit_die, DW_AT_high_pc, text_end_label);
        }

+

       add_AT_section_offset (comp_unit_die, DW_AT_stmt_list, LINE_SECTION);
     }
 
       add_AT_section_offset (comp_unit_die, DW_AT_stmt_list, LINE_SECTION);
     }