* varasm.c (unlikely_text_section): Use assemble_align instead of

[pf3gnuchains/gcc-fork.git] / gcc / dwarf2asm.c

diff --git a/gcc/dwarf2asm.c b/gcc/dwarf2asm.c
index c2ca916..10382c9 100644 (file)
--- a/gcc/dwarf2asm.c
+++ b/gcc/dwarf2asm.c
@@ -1,5 +1,5 @@
 /* Dwarf2 assembler output helper routines.
-   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -45,9 +45,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
    to print a newline, since the caller may want to add a comment.  */
 
 void
-dw2_assemble_integer (size, x)
-     int size;
-     rtx x;
+dw2_assemble_integer (int size, rtx x)
 {
   const char *op = integer_asm_op (size, FALSE);
 
@@ -71,7 +69,7 @@ dw2_asm_output_data (int size, unsigned HOST_WIDE_INT value,
                     const char *comment, ...)
 {
   va_list ap;
-  
+
   va_start (ap, comment);
 
   if (size * 8 < HOST_BITS_PER_WIDE_INT)
@@ -100,7 +98,7 @@ dw2_asm_output_delta (int size, const char *lab1, const char *lab2,
                      const char *comment, ...)
 {
   va_list ap;
-  
+
   va_start (ap, comment);
 
 #ifdef ASM_OUTPUT_DWARF_DELTA
@@ -132,7 +130,7 @@ dw2_asm_output_offset (int size, const char *label,
                       const char *comment, ...)
 {
   va_list ap;
-  
+
   va_start (ap, comment);
 
 #ifdef ASM_OUTPUT_DWARF_OFFSET
@@ -160,7 +158,7 @@ dw2_asm_output_pcrel (int size ATTRIBUTE_UNUSED,
                      const char *comment, ...)
 {
   va_list ap;
-  
+
   va_start (ap, comment);
 
 #ifdef ASM_OUTPUT_DWARF_PCREL
@@ -189,7 +187,7 @@ dw2_asm_output_addr (int size, const char *label,
                     const char *comment, ...)
 {
   va_list ap;
-  
+
   va_start (ap, comment);
 
   dw2_assemble_integer (size, gen_rtx_SYMBOL_REF (Pmode, label));
@@ -211,7 +209,7 @@ dw2_asm_output_addr_rtx (int size, rtx addr,
                         const char *comment, ...)
 {
   va_list ap;
-  
+
   va_start (ap, comment);
 
   dw2_assemble_integer (size, addr);
@@ -226,6 +224,13 @@ dw2_asm_output_addr_rtx (int size, rtx addr,
   va_end (ap);
 }
 
+/* Output the first ORIG_LEN characters of STR as a string.
+   If ORIG_LEN is equal to -1, ignore this parameter and output
+   the entire STR instead.
+   If COMMENT is not NULL and comments in the debug information
+   have been requested by the user, append the given COMMENT
+   to the generated output.  */
+   
 void
 dw2_asm_output_nstring (const char *str, size_t orig_len,
                        const char *comment, ...)
@@ -275,8 +280,7 @@ dw2_asm_output_nstring (const char *str, size_t orig_len,
 /* Return the size of an unsigned LEB128 quantity.  */
 
 int
-size_of_uleb128 (value)
-     unsigned HOST_WIDE_INT value;
+size_of_uleb128 (unsigned HOST_WIDE_INT value)
 {
   int size = 0;
 
@@ -293,8 +297,7 @@ size_of_uleb128 (value)
 /* Return the size of a signed LEB128 quantity.  */
 
 int
-size_of_sleb128 (value)
-     HOST_WIDE_INT value;
+size_of_sleb128 (HOST_WIDE_INT value)
 {
   int size = 0, byte;
 
@@ -315,8 +318,7 @@ size_of_sleb128 (value)
    include leb128.  */
 
 int
-size_of_encoded_value (encoding)
-     int encoding;
+size_of_encoded_value (int encoding)
 {
   if (encoding == DW_EH_PE_omit)
     return 0;
@@ -338,8 +340,7 @@ size_of_encoded_value (encoding)
 /* Yield a name for a given pointer encoding.  */
 
 const char *
-eh_data_format_name (format)
-     int format;
+eh_data_format_name (int format)
 {
 #if HAVE_DESIGNATED_INITIALIZERS
 #define S(p, v)                [p] = v,
@@ -501,7 +502,7 @@ dw2_asm_output_data_uleb128 (unsigned HOST_WIDE_INT value,
                             const char *comment, ...)
 {
   va_list ap;
-  
+
   va_start (ap, comment);
 
 #ifdef HAVE_AS_LEB128
@@ -562,7 +563,7 @@ dw2_asm_output_data_sleb128 (HOST_WIDE_INT value,
                             const char *comment, ...)
 {
   va_list ap;
-  
+
   va_start (ap, comment);
 
 #ifdef HAVE_AS_LEB128
@@ -653,7 +654,7 @@ dw2_asm_output_delta_sleb128 (const char *lab1 ATTRIBUTE_UNUSED,
                              const char *comment, ...)
 {
   va_list ap;
-  
+
   va_start (ap, comment);
 
 #ifdef HAVE_AS_LEB128
@@ -675,8 +676,8 @@ dw2_asm_output_delta_sleb128 (const char *lab1 ATTRIBUTE_UNUSED,
   va_end (ap);
 }
 \f
-static rtx dw2_force_const_mem PARAMS ((rtx));
-static int dw2_output_indirect_constant_1 PARAMS ((splay_tree_node, void *));
+static rtx dw2_force_const_mem (rtx);
+static int dw2_output_indirect_constant_1 (splay_tree_node, void *);
 
 static GTY((param1_is (char *), param2_is (tree))) splay_tree indirect_pool;
 
@@ -694,8 +695,7 @@ static GTY(()) int dw2_const_labelno;
    "near" the function in any interesting sense.  */
 
 static rtx
-dw2_force_const_mem (x)
-     rtx x;
+dw2_force_const_mem (rtx x)
 {
   splay_tree_node node;
   const char *str;
@@ -707,7 +707,7 @@ dw2_force_const_mem (x)
   if (GET_CODE (x) != SYMBOL_REF)
     abort ();
 
-  str = (* targetm.strip_name_encoding) (XSTR (x, 0));
+  str = targetm.strip_name_encoding (XSTR (x, 0));
   node = splay_tree_lookup (indirect_pool, (splay_tree_key) str);
   if (node)
     decl = (tree) node->value;
@@ -755,9 +755,8 @@ dw2_force_const_mem (x)
    splay_tree_foreach.  Emit one queued constant to memory.  */
 
 static int
-dw2_output_indirect_constant_1 (node, data)
-     splay_tree_node node;
-     void* data ATTRIBUTE_UNUSED;
+dw2_output_indirect_constant_1 (splay_tree_node node,
+                               void *data ATTRIBUTE_UNUSED)
 {
   const char *sym;
   rtx sym_ref;
@@ -765,7 +764,7 @@ dw2_output_indirect_constant_1 (node, data)
   sym = (const char *) node->key;
   sym_ref = gen_rtx_SYMBOL_REF (Pmode, sym);
   if (USE_LINKONCE_INDIRECT)
-    fprintf (asm_out_file, "\t.hidden DW.ref.%s\n", sym);
+    fprintf (asm_out_file, "\t.hidden %sDW.ref.%s\n", user_label_prefix, sym);
   assemble_variable ((tree) node->value, 1, 1, 1);
   assemble_integer (sym_ref, POINTER_SIZE / BITS_PER_UNIT, POINTER_SIZE, 1);
 
@@ -775,7 +774,7 @@ dw2_output_indirect_constant_1 (node, data)
 /* Emit the constants queued through dw2_force_const_mem.  */
 
 void
-dw2_output_indirect_constants ()
+dw2_output_indirect_constants (void)
 {
   if (indirect_pool)
     splay_tree_foreach (indirect_pool, dw2_output_indirect_constant_1, NULL);
@@ -789,7 +788,7 @@ dw2_asm_output_encoded_addr_rtx (int encoding, rtx addr,
 {
   int size;
   va_list ap;
-  
+
   va_start (ap, comment);
 
   size = size_of_encoded_value (encoding);