X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2Ffinal.c;h=6ee13a604f8e67f3037343fc5c4be267f2ceb814;hp=e8edf19854356d81775c157ed7182c5ac78b9db0;hb=80c02bec544b4130d6eb5de7dc7188288cbeffa9;hpb=a1657b9503b2bb2757a1a44de16747af6a14e10a diff --git a/gcc/final.c b/gcc/final.c index e8edf198543..6ee13a604f8 100644 --- a/gcc/final.c +++ b/gcc/final.c @@ -1,6 +1,6 @@ /* Convert RTL to assembler code and output it, for GNU compiler. Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, - 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GCC. @@ -46,6 +46,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "tree.h" #include "rtl.h" @@ -68,6 +70,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "target.h" #include "debug.h" #include "expr.h" +#include "cfglayout.h" #ifdef XCOFF_DEBUGGING_INFO #include "xcoffout.h" /* Needed for external data @@ -78,6 +81,10 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "dwarf2out.h" #endif +#ifdef DBX_DEBUGGING_INFO +#include "dbxout.h" +#endif + /* If we aren't using cc0, CC_STATUS_INIT shouldn't exist. So define a null default for it to save conditionalization later. */ #ifndef CC_STATUS_INIT @@ -98,6 +105,12 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #define JUMP_TABLES_IN_TEXT_SECTION 0 #endif +#if defined(READONLY_DATA_SECTION) || defined(READONLY_DATA_SECTION_ASM_OP) +#define HAVE_READONLY_DATA_SECTION 1 +#else +#define HAVE_READONLY_DATA_SECTION 0 +#endif + /* Last insn processed by final_scan_insn. */ static rtx debug_insn; rtx current_output_insn; @@ -114,15 +127,12 @@ static int high_function_linenum; /* Filename of last NOTE. */ static const char *last_filename; -/* Number of instrumented arcs when profile_arc_flag is set. */ -extern int count_instrumented_edges; - extern int length_unit_log; /* This is defined in insn-attrtab.c. */ /* Nonzero while outputting an `asm' with operands. This means that inconsistencies are the user's fault, so don't abort. The precise value is the insn being output, to pass to error_for_asm. */ -static rtx this_is_asm_operands; +rtx this_is_asm_operands; /* Number of operands of this insn, for an `asm' with operands. */ static unsigned int insn_noperands; @@ -131,10 +141,6 @@ static unsigned int insn_noperands; static rtx last_ignored_compare = 0; -/* Flag indicating this insn is the start of a new basic block. */ - -static int new_block = 1; - /* Assign a unique number to each insn that is output. This can be used to generate unique local labels. */ @@ -170,10 +176,6 @@ char regs_ever_live[FIRST_PSEUDO_REGISTER]; int frame_pointer_needed; -/* Assign unique numbers to labels generated for profiling. */ - -int profile_label_no; - /* Number of unmatched NOTE_INSN_BLOCK_BEG notes we have seen. */ static int block_depth; @@ -203,34 +205,34 @@ rtx current_insn_predicate; #endif #ifdef HAVE_ATTR_length -static int asm_insn_count PARAMS ((rtx)); -#endif -static void profile_function PARAMS ((FILE *)); -static void profile_after_prologue PARAMS ((FILE *)); -static void notice_source_line PARAMS ((rtx)); -static rtx walk_alter_subreg PARAMS ((rtx *)); -static void output_asm_name PARAMS ((void)); -static tree get_mem_expr_from_op PARAMS ((rtx, int *)); -static void output_asm_operand_names PARAMS ((rtx *, int *, int)); -static void output_operand PARAMS ((rtx, int)); +static int asm_insn_count (rtx); +#endif +static void profile_function (FILE *); +static void profile_after_prologue (FILE *); +static bool notice_source_line (rtx); +static rtx walk_alter_subreg (rtx *); +static void output_asm_name (void); +static void output_alternate_entry_point (FILE *, rtx); +static tree get_mem_expr_from_op (rtx, int *); +static void output_asm_operand_names (rtx *, int *, int); +static void output_operand (rtx, int); #ifdef LEAF_REGISTERS -static void leaf_renumber_regs PARAMS ((rtx)); +static void leaf_renumber_regs (rtx); #endif #ifdef HAVE_cc0 -static int alter_cond PARAMS ((rtx)); +static int alter_cond (rtx); #endif #ifndef ADDR_VEC_ALIGN -static int final_addr_vec_align PARAMS ((rtx)); +static int final_addr_vec_align (rtx); #endif #ifdef HAVE_ATTR_length -static int align_fuzz PARAMS ((rtx, rtx, int, unsigned)); +static int align_fuzz (rtx, rtx, int, unsigned); #endif /* Initialize data in final at the beginning of a compilation. */ void -init_final (filename) - const char *filename ATTRIBUTE_UNUSED; +init_final (const char *filename ATTRIBUTE_UNUSED) { app_on = 0; final_sequence = 0; @@ -240,156 +242,19 @@ init_final (filename) #endif } -/* Called at end of source file, - to output the block-profiling table for this entire compilation. */ - -void -end_final (filename) - const char *filename; -{ - if (profile_arc_flag) - { - char name[20]; - int align = exact_log2 (BIGGEST_ALIGNMENT / BITS_PER_UNIT); - int size, rounded; - int long_bytes = LONG_TYPE_SIZE / BITS_PER_UNIT; - int gcov_type_bytes = GCOV_TYPE_SIZE / BITS_PER_UNIT; - int pointer_bytes = POINTER_SIZE / BITS_PER_UNIT; - unsigned int align2 = LONG_TYPE_SIZE; - - size = gcov_type_bytes * count_instrumented_edges; - rounded = size; - - rounded += (BIGGEST_ALIGNMENT / BITS_PER_UNIT) - 1; - rounded = (rounded / (BIGGEST_ALIGNMENT / BITS_PER_UNIT) - * (BIGGEST_ALIGNMENT / BITS_PER_UNIT)); - - /* ??? This _really_ ought to be done with a structure layout - and with assemble_constructor. If long_bytes != pointer_bytes - we'll be emitting unaligned data at some point. */ - if (long_bytes != pointer_bytes) - abort (); - - data_section (); - - /* Output the main header, of 11 words: - 0: 1 if this file is initialized, else 0. - 1: address of file name (LPBX1). - 2: address of table of counts (LPBX2). - 3: number of counts in the table. - 4: always 0, for compatibility with Sun. - - The following are GNU extensions: - - 5: address of table of start addrs of basic blocks (LPBX3). - 6: Number of bytes in this header. - 7: address of table of function names (LPBX4). - 8: address of table of line numbers (LPBX5) or 0. - 9: address of table of file names (LPBX6) or 0. - 10: space reserved for basic block profiling. */ - - ASM_OUTPUT_ALIGN (asm_out_file, align); - - ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "LPBX", 0); - - /* Zero word. */ - assemble_integer (const0_rtx, long_bytes, align2, 1); - - /* Address of filename. */ - ASM_GENERATE_INTERNAL_LABEL (name, "LPBX", 1); - assemble_integer (gen_rtx_SYMBOL_REF (Pmode, name), pointer_bytes, - align2, 1); - - /* Address of count table. */ - ASM_GENERATE_INTERNAL_LABEL (name, "LPBX", 2); - assemble_integer (gen_rtx_SYMBOL_REF (Pmode, name), pointer_bytes, - align2, 1); - - /* Count of the # of instrumented arcs. */ - assemble_integer (GEN_INT (count_instrumented_edges), - long_bytes, align2, 1); - - /* Zero word (link field). */ - assemble_integer (const0_rtx, pointer_bytes, align2, 1); - - assemble_integer (const0_rtx, pointer_bytes, align2, 1); - - /* Byte count for extended structure. */ - assemble_integer (GEN_INT (11 * UNITS_PER_WORD), long_bytes, align2, 1); - - /* Address of function name table. */ - assemble_integer (const0_rtx, pointer_bytes, align2, 1); - - /* Address of line number and filename tables if debugging. */ - assemble_integer (const0_rtx, pointer_bytes, align2, 1); - assemble_integer (const0_rtx, pointer_bytes, align2, 1); - - /* Space for extension ptr (link field). */ - assemble_integer (const0_rtx, UNITS_PER_WORD, align2, 1); - - /* Output the file name changing the suffix to .d for - Sun tcov compatibility. */ - ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "LPBX", 1); - { - char *cwd = getpwd (); - int len = strlen (filename) + strlen (cwd) + 1; - char *data_file = (char *) alloca (len + 4); - - strcpy (data_file, cwd); - strcat (data_file, "/"); - strcat (data_file, filename); - strip_off_ending (data_file, len); - strcat (data_file, ".da"); - assemble_string (data_file, strlen (data_file) + 1); - } - - /* Make space for the table of counts. */ - if (size == 0) - { - /* Realign data section. */ - ASM_OUTPUT_ALIGN (asm_out_file, align); - ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "LPBX", 2); - if (size != 0) - assemble_zeros (size); - } - else - { - ASM_GENERATE_INTERNAL_LABEL (name, "LPBX", 2); -#ifdef ASM_OUTPUT_SHARED_LOCAL - if (flag_shared_data) - ASM_OUTPUT_SHARED_LOCAL (asm_out_file, name, size, rounded); - else -#endif -#ifdef ASM_OUTPUT_ALIGNED_DECL_LOCAL - ASM_OUTPUT_ALIGNED_DECL_LOCAL (asm_out_file, NULL_TREE, name, - size, BIGGEST_ALIGNMENT); -#else -#ifdef ASM_OUTPUT_ALIGNED_LOCAL - ASM_OUTPUT_ALIGNED_LOCAL (asm_out_file, name, size, - BIGGEST_ALIGNMENT); -#else - ASM_OUTPUT_LOCAL (asm_out_file, name, size, rounded); -#endif -#endif - } - } -} - /* Default target function prologue and epilogue assembler output. If not overridden for epilogue code, then the function body itself contains return instructions wherever needed. */ void -default_function_pro_epilogue (file, size) - FILE *file ATTRIBUTE_UNUSED; - HOST_WIDE_INT size ATTRIBUTE_UNUSED; +default_function_pro_epilogue (FILE *file ATTRIBUTE_UNUSED, + HOST_WIDE_INT size ATTRIBUTE_UNUSED) { } /* Default target hook that outputs nothing to a stream. */ void -no_asm_to_stream (file) - FILE *file ATTRIBUTE_UNUSED; +no_asm_to_stream (FILE *file ATTRIBUTE_UNUSED) { } @@ -397,7 +262,7 @@ no_asm_to_stream (file) Used before the output from an `asm' statement. */ void -app_enable () +app_enable (void) { if (! app_on) { @@ -410,7 +275,7 @@ app_enable () Called from varasm.c before most kinds of output. */ void -app_disable () +app_disable (void) { if (app_on) { @@ -425,7 +290,7 @@ app_disable () #ifdef DELAY_SLOTS int -dbr_sequence_length () +dbr_sequence_length (void) { if (final_sequence != 0) return XVECLEN (final_sequence, 0) - 1; @@ -442,9 +307,7 @@ dbr_sequence_length () static int *insn_lengths; -#ifdef HAVE_ATTR_length varray_type insn_addresses_; -#endif /* Max uid for which the above arrays are valid. */ static int insn_lengths_max_uid; @@ -480,7 +343,7 @@ static struct label_alignment *label_align; /* Indicate that branch shortening hasn't yet been done. */ void -init_insn_lengths () +init_insn_lengths (void) { if (uid_shuid) { @@ -507,8 +370,7 @@ init_insn_lengths () get its actual length. Otherwise, get its maximum length. */ int -get_attr_length (insn) - rtx insn ATTRIBUTE_UNUSED; +get_attr_length (rtx insn ATTRIBUTE_UNUSED) { #ifdef HAVE_ATTR_length rtx body; @@ -531,7 +393,7 @@ get_attr_length (insn) case JUMP_INSN: body = PATTERN (insn); - if (GET_CODE (body) == ADDR_VEC || GET_CODE (body) == ADDR_DIFF_VEC) + if (GET_CODE (body) == ADDR_VEC || GET_CODE (body) == ADDR_DIFF_VEC) { /* Alignment is machine-dependent and should be handled by ADDR_VEC_ALIGN. */ @@ -642,8 +504,7 @@ get_attr_length (insn) #ifndef ADDR_VEC_ALIGN static int -final_addr_vec_align (addr_vec) - rtx addr_vec; +final_addr_vec_align (rtx addr_vec) { int align = GET_MODE_SIZE (GET_MODE (PATTERN (addr_vec))); @@ -673,8 +534,7 @@ static int min_labelno, max_labelno; /* For the benefit of port specific code do this also as a function. */ int -label_to_alignment (label) - rtx label; +label_to_alignment (rtx label) { return LABEL_TO_ALIGNMENT (label); } @@ -709,10 +569,7 @@ label_to_alignment (label) The return value is undefined for any other value of GROWTH. */ static int -align_fuzz (start, end, known_align_log, growth) - rtx start, end; - int known_align_log; - unsigned growth; +align_fuzz (rtx start, rtx end, int known_align_log, unsigned int growth) { int uid = INSN_UID (start); rtx align_label; @@ -751,8 +608,7 @@ align_fuzz (start, end, known_align_log, growth) to exclude the branch size. */ int -insn_current_reference_address (branch) - rtx branch; +insn_current_reference_address (rtx branch) { rtx dest, seq; int seq_uid; @@ -789,10 +645,10 @@ insn_current_reference_address (branch) #endif /* HAVE_ATTR_length */ void -compute_alignments () +compute_alignments (void) { - int i; int log, max_skip, max_log; + basic_block bb; if (label_align) { @@ -802,21 +658,21 @@ compute_alignments () max_labelno = max_label_num (); min_labelno = get_first_label_num (); - label_align = (struct label_alignment *) - xcalloc (max_labelno - min_labelno + 1, sizeof (struct label_alignment)); + label_align = xcalloc (max_labelno - min_labelno + 1, + sizeof (struct label_alignment)); /* If not optimizing or optimizing for size, don't assign any alignments. */ if (! optimize || optimize_size) return; - for (i = 0; i < n_basic_blocks; i++) + FOR_EACH_BB (bb) { - basic_block bb = BASIC_BLOCK (i); rtx label = bb->head; int fallthru_frequency = 0, branch_frequency = 0, has_fallthru = 0; edge e; - if (GET_CODE (label) != CODE_LABEL) + if (GET_CODE (label) != CODE_LABEL + || probably_never_executed_bb_p (bb)) continue; max_log = LABEL_ALIGN (label); max_skip = LABEL_ALIGN_MAX_SKIP; @@ -841,8 +697,8 @@ compute_alignments () if (!has_fallthru && (branch_frequency > BB_FREQ_MAX / 10 - || (bb->frequency > BASIC_BLOCK (i - 1)->frequency * 10 - && (BASIC_BLOCK (i - 1)->frequency + || (bb->frequency > bb->prev_bb->frequency * 10 + && (bb->prev_bb->frequency <= ENTRY_BLOCK_PTR->frequency / 2)))) { log = JUMP_ALIGN (label); @@ -853,10 +709,11 @@ compute_alignments () } } /* In case block is frequent and reached mostly by non-fallthru edge, - align it. It is most likely an first block of loop. */ + align it. It is most likely a first block of loop. */ if (has_fallthru + && maybe_hot_bb_p (bb) && branch_frequency + fallthru_frequency > BB_FREQ_MAX / 10 - && branch_frequency > fallthru_frequency * 5) + && branch_frequency > fallthru_frequency * 2) { log = LOOP_ALIGN (label); if (max_log < log) @@ -888,8 +745,7 @@ compute_alignments () slots. */ void -shorten_branches (first) - rtx first ATTRIBUTE_UNUSED; +shorten_branches (rtx first ATTRIBUTE_UNUSED) { rtx insn; int max_uid; @@ -910,7 +766,7 @@ shorten_branches (first) /* Compute maximum UID and allocate label_align / uid_shuid. */ max_uid = get_max_uid (); - uid_shuid = (int *) xmalloc (max_uid * sizeof *uid_shuid); + uid_shuid = xmalloc (max_uid * sizeof *uid_shuid); if (max_labelno != max_label_num ()) { @@ -923,8 +779,8 @@ shorten_branches (first) n_labels = max_labelno - min_labelno + 1; n_old_labels = old - min_labelno + 1; - label_align = (struct label_alignment *) xrealloc - (label_align, n_labels * sizeof (struct label_alignment)); + label_align = xrealloc (label_align, + n_labels * sizeof (struct label_alignment)); /* Range of labels grows monotonically in the function. Abort here means that the initialization of array got lost. */ @@ -978,11 +834,7 @@ shorten_branches (first) next = NEXT_INSN (insn); /* ADDR_VECs only take room if read-only data goes into the text section. */ - if (JUMP_TABLES_IN_TEXT_SECTION -#if !defined(READONLY_DATA_SECTION) - || 1 -#endif - ) + if (JUMP_TABLES_IN_TEXT_SECTION || !HAVE_READONLY_DATA_SECTION) if (next && GET_CODE (next) == JUMP_INSN) { rtx nextbody = PATTERN (next); @@ -1023,20 +875,20 @@ shorten_branches (first) #ifdef HAVE_ATTR_length /* Allocate the rest of the arrays. */ - insn_lengths = (int *) xmalloc (max_uid * sizeof (*insn_lengths)); + insn_lengths = xmalloc (max_uid * sizeof (*insn_lengths)); insn_lengths_max_uid = max_uid; /* Syntax errors can lead to labels being outside of the main insn stream. Initialize insn_addresses, so that we get reproducible results. */ INSN_ADDRESSES_ALLOC (max_uid); - varying_length = (char *) xcalloc (max_uid, sizeof (char)); + varying_length = xcalloc (max_uid, sizeof (char)); /* Initialize uid_align. We scan instructions from end to start, and keep in align_tab[n] the last seen insn that does an alignment of at least n+1, i.e. the successor in the alignment chain for an insn that does / has a known alignment of n. */ - uid_align = (rtx *) xcalloc (max_uid, sizeof *uid_align); + uid_align = xcalloc (max_uid, sizeof *uid_align); for (i = MAX_CODE_ALIGN; --i >= 0;) align_tab[i] = NULL_RTX; @@ -1132,7 +984,7 @@ shorten_branches (first) } } - INSN_ADDRESSES (uid) = insn_current_address; + INSN_ADDRESSES (uid) = insn_current_address + insn_lengths[uid]; if (GET_CODE (insn) == NOTE || GET_CODE (insn) == BARRIER || GET_CODE (insn) == CODE_LABEL) @@ -1145,11 +997,7 @@ shorten_branches (first) { /* This only takes room if read-only data goes into the text section. */ - if (JUMP_TABLES_IN_TEXT_SECTION -#if !defined(READONLY_DATA_SECTION) - || 1 -#endif - ) + if (JUMP_TABLES_IN_TEXT_SECTION || !HAVE_READONLY_DATA_SECTION) insn_lengths[uid] = (XVECLEN (body, GET_CODE (body) == ADDR_DIFF_VEC) * GET_MODE_SIZE (GET_MODE (body))); @@ -1350,11 +1198,7 @@ shorten_branches (first) PUT_MODE (body, CASE_VECTOR_SHORTEN_MODE (min_addr - rel_addr, max_addr - rel_addr, body)); - if (JUMP_TABLES_IN_TEXT_SECTION -#if !defined(READONLY_DATA_SECTION) - || 1 -#endif - ) + if (JUMP_TABLES_IN_TEXT_SECTION || !HAVE_READONLY_DATA_SECTION) { insn_lengths[uid] = (XVECLEN (body, 1) * GET_MODE_SIZE (GET_MODE (body))); @@ -1384,7 +1228,7 @@ shorten_branches (first) insn_current_address += insn_lengths[inner_uid]; } - } + } else insn_current_address += insn_lengths[uid]; @@ -1456,8 +1300,7 @@ shorten_branches (first) This is used to compute its length. */ static int -asm_insn_count (body) - rtx body; +asm_insn_count (rtx body) { const char *template; int count = 1; @@ -1486,10 +1329,8 @@ asm_insn_count (body) test and compare insns. */ void -final_start_function (first, file, optimize) - rtx first; - FILE *file; - int optimize ATTRIBUTE_UNUSED; +final_start_function (rtx first ATTRIBUTE_UNUSED, FILE *file, + int optimize ATTRIBUTE_UNUSED) { block_depth = 0; @@ -1508,8 +1349,9 @@ final_start_function (first, file, optimize) } #endif - if (NOTE_LINE_NUMBER (first) != NOTE_INSN_DELETED) - notice_source_line (first); + last_filename = locator_file (prologue_locator); + last_linenum = locator_line (prologue_locator); + high_block_linenum = high_function_linenum = last_linenum; (*debug_hooks->begin_prologue) (last_linenum, last_filename); @@ -1541,7 +1383,7 @@ final_start_function (first, file, optimize) if (write_symbols) { remove_unnecessary_notes (); - reorder_blocks (); + reemit_insn_block_notes (); number_blocks (current_function_decl); /* We never actually put out begin/end notes for the top-level block in the function. But, conceptually, that block is @@ -1552,25 +1394,16 @@ final_start_function (first, file, optimize) /* First output the function prologue: code to set up the stack frame. */ (*targetm.asm_out.function_prologue) (file, get_frame_size ()); -#ifdef VMS_DEBUGGING_INFO - /* Output label after the prologue of the function. */ - if (write_symbols == VMS_DEBUG || write_symbols == VMS_AND_DWARF2_DEBUG) - vmsdbgout_after_prologue (); -#endif - /* If the machine represents the prologue as RTL, the profiling code must be emitted when NOTE_INSN_PROLOGUE_END is scanned. */ #ifdef HAVE_prologue if (! HAVE_prologue) #endif profile_after_prologue (file); - - profile_label_no++; } static void -profile_after_prologue (file) - FILE *file ATTRIBUTE_UNUSED; +profile_after_prologue (FILE *file ATTRIBUTE_UNUSED) { #ifndef PROFILE_BEFORE_PROLOGUE if (current_function_profile) @@ -1579,40 +1412,33 @@ profile_after_prologue (file) } static void -profile_function (file) - FILE *file ATTRIBUTE_UNUSED; +profile_function (FILE *file ATTRIBUTE_UNUSED) { #ifndef NO_PROFILE_COUNTERS - int align = MIN (BIGGEST_ALIGNMENT, LONG_TYPE_SIZE); +# define NO_PROFILE_COUNTERS 0 #endif #if defined(ASM_OUTPUT_REG_PUSH) -#if defined(STRUCT_VALUE_INCOMING_REGNUM) || defined(STRUCT_VALUE_REGNUM) int sval = current_function_returns_struct; -#endif + rtx svrtx = targetm.calls.struct_value_rtx (TREE_TYPE (current_function_decl), 1); #if defined(STATIC_CHAIN_INCOMING_REGNUM) || defined(STATIC_CHAIN_REGNUM) int cxt = current_function_needs_context; #endif #endif /* ASM_OUTPUT_REG_PUSH */ -#ifndef NO_PROFILE_COUNTERS - data_section (); - ASM_OUTPUT_ALIGN (file, floor_log2 (align / BITS_PER_UNIT)); - ASM_OUTPUT_INTERNAL_LABEL (file, "LP", profile_label_no); - assemble_integer (const0_rtx, LONG_TYPE_SIZE / BITS_PER_UNIT, align, 1); -#endif + if (! NO_PROFILE_COUNTERS) + { + int align = MIN (BIGGEST_ALIGNMENT, LONG_TYPE_SIZE); + data_section (); + ASM_OUTPUT_ALIGN (file, floor_log2 (align / BITS_PER_UNIT)); + (*targetm.asm_out.internal_label) (file, "LP", current_function_funcdef_no); + assemble_integer (const0_rtx, LONG_TYPE_SIZE / BITS_PER_UNIT, align, 1); + } function_section (current_function_decl); -#if defined(STRUCT_VALUE_INCOMING_REGNUM) && defined(ASM_OUTPUT_REG_PUSH) - if (sval) - ASM_OUTPUT_REG_PUSH (file, STRUCT_VALUE_INCOMING_REGNUM); -#else -#if defined(STRUCT_VALUE_REGNUM) && defined(ASM_OUTPUT_REG_PUSH) - if (sval) - { - ASM_OUTPUT_REG_PUSH (file, STRUCT_VALUE_REGNUM); - } -#endif +#if defined(ASM_OUTPUT_REG_PUSH) + if (sval && GET_CODE (svrtx) == REG) + ASM_OUTPUT_REG_PUSH (file, REGNO (svrtx)); #endif #if defined(STATIC_CHAIN_INCOMING_REGNUM) && defined(ASM_OUTPUT_REG_PUSH) @@ -1627,7 +1453,7 @@ profile_function (file) #endif #endif - FUNCTION_PROFILER (file, profile_label_no); + FUNCTION_PROFILER (file, current_function_funcdef_no); #if defined(STATIC_CHAIN_INCOMING_REGNUM) && defined(ASM_OUTPUT_REG_PUSH) if (cxt) @@ -1641,16 +1467,9 @@ profile_function (file) #endif #endif -#if defined(STRUCT_VALUE_INCOMING_REGNUM) && defined(ASM_OUTPUT_REG_PUSH) - if (sval) - ASM_OUTPUT_REG_POP (file, STRUCT_VALUE_INCOMING_REGNUM); -#else -#if defined(STRUCT_VALUE_REGNUM) && defined(ASM_OUTPUT_REG_PUSH) - if (sval) - { - ASM_OUTPUT_REG_POP (file, STRUCT_VALUE_REGNUM); - } -#endif +#if defined(ASM_OUTPUT_REG_PUSH) + if (sval && GET_CODE (svrtx) == REG) + ASM_OUTPUT_REG_POP (file, REGNO (svrtx)); #endif } @@ -1659,7 +1478,7 @@ profile_function (file) even though not all of them are needed. */ void -final_end_function () +final_end_function (void) { app_disable (); @@ -1670,12 +1489,12 @@ final_end_function () (*targetm.asm_out.function_epilogue) (asm_out_file, get_frame_size ()); /* And debug output. */ - (*debug_hooks->end_epilogue) (); + (*debug_hooks->end_epilogue) (last_linenum, last_filename); #if defined (DWARF2_UNWIND_INFO) if (write_symbols != DWARF2_DEBUG && write_symbols != VMS_AND_DWARF2_DEBUG && dwarf2out_do_frame ()) - dwarf2out_end_epilogue (); + dwarf2out_end_epilogue (last_linenum, last_filename); #endif } @@ -1691,18 +1510,13 @@ final_end_function () Prescanning is done only on certain machines. */ void -final (first, file, optimize, prescan) - rtx first; - FILE *file; - int optimize; - int prescan; +final (rtx first, FILE *file, int optimize, int prescan) { rtx insn; int max_line = 0; int max_uid = 0; last_ignored_compare = 0; - new_block = 1; /* Make a map indicating which line numbers appear in this function. When producing SDB debugging info, delete troublesome line number @@ -1737,11 +1551,11 @@ final (first, file, optimize, prescan) max_line = NOTE_LINE_NUMBER (insn); } - line_note_exists = (char *) xcalloc (max_line + 1, sizeof (char)); + line_note_exists = xcalloc (max_line + 1, sizeof (char)); for (insn = first; insn; insn = NEXT_INSN (insn)) { - if (INSN_UID (insn) > max_uid) /* find largest UID */ + if (INSN_UID (insn) > max_uid) /* Find largest UID. */ max_uid = INSN_UID (insn); if (GET_CODE (insn) == NOTE && NOTE_LINE_NUMBER (insn) > 0) line_note_exists[NOTE_LINE_NUMBER (insn)] = 1; @@ -1769,16 +1583,12 @@ final (first, file, optimize, prescan) #ifdef HAVE_ATTR_length if ((unsigned) INSN_UID (insn) >= INSN_ADDRESSES_SIZE ()) { -#ifdef STACK_REGS - /* Irritatingly, the reg-stack pass is creating new instructions - and because of REG_DEAD note abuse it has to run after - shorten_branches. Fake address of -1 then. */ - insn_current_address = -1; -#else /* This can be triggered by bugs elsewhere in the compiler if new insns are created after init_insn_lengths is called. */ - abort (); -#endif + if (GET_CODE (insn) == NOTE) + insn_current_address = -1; + else + abort (); } else insn_current_address = INSN_ADDRESSES (INSN_UID (insn)); @@ -1792,9 +1602,7 @@ final (first, file, optimize, prescan) } const char * -get_insn_template (code, insn) - int code; - rtx insn; +get_insn_template (int code, rtx insn) { const void *output = insn_data[code].output; switch (insn_data[code].output_format) @@ -1813,6 +1621,37 @@ get_insn_template (code, insn) } } +/* Emit the appropriate declaration for an alternate-entry-point + symbol represented by INSN, to FILE. INSN is a CODE_LABEL with + LABEL_KIND != LABEL_NORMAL. + + The case fall-through in this function is intentional. */ +static void +output_alternate_entry_point (FILE *file, rtx insn) +{ + const char *name = LABEL_NAME (insn); + + switch (LABEL_KIND (insn)) + { + case LABEL_WEAK_ENTRY: +#ifdef ASM_WEAKEN_LABEL + ASM_WEAKEN_LABEL (file, name); +#endif + case LABEL_GLOBAL_ENTRY: + (*targetm.asm_out.globalize_label) (file, name); + case LABEL_STATIC_ENTRY: +#ifdef ASM_OUTPUT_TYPE_DIRECTIVE + ASM_OUTPUT_TYPE_DIRECTIVE (file, name, "function"); +#endif + ASM_OUTPUT_LABEL (file, name); + break; + + case LABEL_NORMAL: + default: + abort (); + } +} + /* The final scan for one insn, INSN. Args are same as in `final', except that INSN is the insn being scanned. @@ -1822,12 +1661,8 @@ get_insn_template (code, insn) used for within delayed branch sequence output). */ rtx -final_scan_insn (insn, file, optimize, prescan, nopeepholes) - rtx insn; - FILE *file; - int optimize ATTRIBUTE_UNUSED; - int prescan; - int nopeepholes ATTRIBUTE_UNUSED; +final_scan_insn (rtx insn, FILE *file, int optimize ATTRIBUTE_UNUSED, + int prescan, int nopeepholes ATTRIBUTE_UNUSED) { #ifdef HAVE_cc0 rtx set; @@ -1856,9 +1691,6 @@ final_scan_insn (insn, file, optimize, prescan, nopeepholes) case NOTE_INSN_LOOP_VTOP: case NOTE_INSN_FUNCTION_END: case NOTE_INSN_REPEATED_LINE_NUMBER: - case NOTE_INSN_RANGE_BEG: - case NOTE_INSN_RANGE_END: - case NOTE_INSN_LIVE: case NOTE_INSN_EXPECTED_VALUE: break; @@ -1892,7 +1724,7 @@ final_scan_insn (insn, file, optimize, prescan, nopeepholes) case NOTE_INSN_FUNCTION_BEG: app_disable (); - (*debug_hooks->end_prologue) (last_linenum); + (*debug_hooks->end_prologue) (last_linenum, last_filename); break; case NOTE_INSN_BLOCK_BEG: @@ -1951,51 +1783,6 @@ final_scan_insn (insn, file, optimize, prescan, nopeepholes) default: if (NOTE_LINE_NUMBER (insn) <= 0) abort (); - - /* This note is a line-number. */ - { - rtx note; - int note_after = 0; - - /* If there is anything real after this note, output it. - If another line note follows, omit this one. */ - for (note = NEXT_INSN (insn); note; note = NEXT_INSN (note)) - { - if (GET_CODE (note) != NOTE && GET_CODE (note) != CODE_LABEL) - break; - - /* These types of notes can be significant - so make sure the preceding line number stays. */ - else if (GET_CODE (note) == NOTE - && (NOTE_LINE_NUMBER (note) == NOTE_INSN_BLOCK_BEG - || NOTE_LINE_NUMBER (note) == NOTE_INSN_BLOCK_END - || NOTE_LINE_NUMBER (note) == NOTE_INSN_FUNCTION_BEG)) - break; - else if (GET_CODE (note) == NOTE && NOTE_LINE_NUMBER (note) > 0) - { - /* Another line note follows; we can delete this note - if no intervening line numbers have notes elsewhere. */ - int num; - for (num = NOTE_LINE_NUMBER (insn) + 1; - num < NOTE_LINE_NUMBER (note); - num++) - if (line_note_exists[num]) - break; - - if (num >= NOTE_LINE_NUMBER (note)) - note_after = 1; - break; - } - } - - /* Output this line note if it is the first or the last line - note in a row. */ - if (!note_after) - { - notice_source_line (insn); - (*debug_hooks->source_line) (last_linenum, last_filename); - } - } break; } break; @@ -2022,8 +1809,12 @@ final_scan_insn (insn, file, optimize, prescan, nopeepholes) #ifdef ASM_OUTPUT_MAX_SKIP_ALIGN ASM_OUTPUT_MAX_SKIP_ALIGN (file, align, max_skip); #else +#ifdef ASM_OUTPUT_ALIGN_WITH_NOP + ASM_OUTPUT_ALIGN_WITH_NOP (file, align); +#else ASM_OUTPUT_ALIGN (file, align); #endif +#endif } } #ifdef HAVE_cc0 @@ -2055,7 +1846,6 @@ final_scan_insn (insn, file, optimize, prescan, nopeepholes) #endif if (prescan > 0) break; - new_block = 1; #ifdef FINAL_PRESCAN_LABEL FINAL_PRESCAN_INSN (insn, NULL, 0); @@ -2106,19 +1896,16 @@ final_scan_insn (insn, file, optimize, prescan, nopeepholes) ASM_OUTPUT_CASE_LABEL (file, "L", CODE_LABEL_NUMBER (insn), NEXT_INSN (insn)); #else - if (LABEL_ALTERNATE_NAME (insn)) - ASM_OUTPUT_ALTERNATE_LABEL_NAME (file, insn); - else - ASM_OUTPUT_INTERNAL_LABEL (file, "L", CODE_LABEL_NUMBER (insn)); + (*targetm.asm_out.internal_label) (file, "L", CODE_LABEL_NUMBER (insn)); #endif #endif break; } } - if (LABEL_ALTERNATE_NAME (insn)) - ASM_OUTPUT_ALTERNATE_LABEL_NAME (file, insn); + if (LABEL_ALT_ENTRY_P (insn)) + output_alternate_entry_point (file, insn); else - ASM_OUTPUT_INTERNAL_LABEL (file, "L", CODE_LABEL_NUMBER (insn)); + (*targetm.asm_out.internal_label) (file, "L", CODE_LABEL_NUMBER (insn)); break; default: @@ -2221,6 +2008,12 @@ final_scan_insn (insn, file, optimize, prescan, nopeepholes) break; } + /* Output this line note if it is the first or the last line + note in a row. */ + if (notice_source_line (insn)) + { + (*debug_hooks->source_line) (last_linenum, last_filename); + } if (GET_CODE (body) == ASM_INPUT) { @@ -2247,7 +2040,7 @@ final_scan_insn (insn, file, optimize, prescan, nopeepholes) if (asm_noperands (body) >= 0) { unsigned int noperands = asm_noperands (body); - rtx *ops = (rtx *) alloca (noperands * sizeof (rtx)); + rtx *ops = alloca (noperands * sizeof (rtx)); const char *string; /* There's no telling what that did to the condition codes. */ @@ -2292,6 +2085,14 @@ final_scan_insn (insn, file, optimize, prescan, nopeepholes) break; final_sequence = body; + /* Record the delay slots' frame information before the branch. + This is needed for delayed calls: see execute_cfa_program(). */ +#if defined (DWARF2_UNWIND_INFO) + if (dwarf2out_do_frame ()) + for (i = 1; i < XVECLEN (body, 0); i++) + dwarf2out_frame_debug (XVECEXP (body, 0, i)); +#endif + /* The first insn in this SEQUENCE might be a JUMP_INSN that will force the restoration of a comparison that was previously thought unnecessary. If that happens, cancel this sequence @@ -2545,13 +2346,13 @@ final_scan_insn (insn, file, optimize, prescan, nopeepholes) insn_code_number = recog_memoized (insn); cleanup_subreg_operands (insn); - /* Dump the insn in the assembly for debugging. */ - if (flag_dump_rtl_in_asm) - { - print_rtx_head = ASM_COMMENT_START; - print_rtl_single (asm_out_file, insn); - print_rtx_head = ""; - } + /* Dump the insn in the assembly for debugging. */ + if (flag_dump_rtl_in_asm) + { + print_rtx_head = ASM_COMMENT_START; + print_rtl_single (asm_out_file, insn); + print_rtx_head = ""; + } if (! constrain_operands_cached (1)) fatal_insn_not_found (insn); @@ -2600,7 +2401,6 @@ final_scan_insn (insn, file, optimize, prescan, nopeepholes) if (prev_nonnote_insn (insn) != last_ignored_compare) abort (); - new_block = 0; /* We have already processed the notes between the setter and the user. Make sure we don't process them again, this is @@ -2634,7 +2434,6 @@ final_scan_insn (insn, file, optimize, prescan, nopeepholes) abort (); #endif - new_block = 0; return new; } @@ -2648,22 +2447,23 @@ final_scan_insn (insn, file, optimize, prescan, nopeepholes) output_asm_insn (template, recog_data.operand); + /* If necessary, report the effect that the instruction has on + the unwind info. We've already done this for delay slots + and call instructions. */ #if defined (DWARF2_UNWIND_INFO) -#if defined (HAVE_prologue) - if (GET_CODE (insn) == INSN && dwarf2out_do_frame ()) - dwarf2out_frame_debug (insn); -#else - if (!ACCUMULATE_OUTGOING_ARGS - && GET_CODE (insn) == INSN + if (GET_CODE (insn) == INSN +#if !defined (HAVE_prologue) + && !ACCUMULATE_OUTGOING_ARGS +#endif + && final_sequence == 0 && dwarf2out_do_frame ()) dwarf2out_frame_debug (insn); #endif -#endif #if 0 - /* It's not at all clear why we did this and doing so interferes - with tests we'd like to do to use REG_WAS_0 notes, so let's try - with this out. */ + /* It's not at all clear why we did this and doing so used to + interfere with tests that used REG_WAS_0 notes, which are + now gone, so let's try with this out. */ /* Mark this insn as having been output. */ INSN_DELETED_P (insn) = 1; @@ -2671,9 +2471,6 @@ final_scan_insn (insn, file, optimize, prescan, nopeepholes) /* Emit information for vtable gc. */ note = find_reg_note (insn, REG_VTABLE_REF, NULL_RTX); - if (note) - assemble_vtable_entry (XEXP (XEXP (note, 0), 0), - INTVAL (XEXP (XEXP (note, 0), 1))); current_output_insn = debug_insn = 0; } @@ -2684,24 +2481,28 @@ final_scan_insn (insn, file, optimize, prescan, nopeepholes) /* Output debugging info to the assembler file FILE based on the NOTE-insn INSN, assumed to be a line number. */ -static void -notice_source_line (insn) - rtx insn; +static bool +notice_source_line (rtx insn) { - const char *filename = NOTE_SOURCE_FILE (insn); + const char *filename = insn_file (insn); + int linenum = insn_line (insn); - last_filename = filename; - last_linenum = NOTE_LINE_NUMBER (insn); - high_block_linenum = MAX (last_linenum, high_block_linenum); - high_function_linenum = MAX (last_linenum, high_function_linenum); + if (filename && (filename != last_filename || last_linenum != linenum)) + { + last_filename = filename; + last_linenum = linenum; + high_block_linenum = MAX (last_linenum, high_block_linenum); + high_function_linenum = MAX (last_linenum, high_function_linenum); + return true; + } + return false; } /* For each operand in INSN, simplify (subreg (reg)) so that it refers directly to the desired hard register. */ void -cleanup_subreg_operands (insn) - rtx insn; +cleanup_subreg_operands (rtx insn) { int i; extract_insn_cached (insn); @@ -2735,8 +2536,7 @@ cleanup_subreg_operands (insn) based on the thing it is a subreg of. */ rtx -alter_subreg (xp) - rtx *xp; +alter_subreg (rtx *xp) { rtx x = *xp; rtx y = SUBREG_REG (x); @@ -2756,12 +2556,7 @@ alter_subreg (xp) else if (GET_CODE (y) == REG) { unsigned int regno = subreg_hard_regno (x, 1); - PUT_CODE (x, REG); - REGNO (x) = regno; - ORIGINAL_REGNO (x) = ORIGINAL_REGNO (y); - /* This field has a different meaning for REGs and SUBREGs. Make - sure to clear it! */ - x->used = 0; + *xp = gen_rtx_REG_offset (y, GET_MODE (x), regno, SUBREG_BYTE (x)); } else abort (); @@ -2773,8 +2568,7 @@ alter_subreg (xp) /* Do alter_subreg on all the SUBREGs contained in X. */ static rtx -walk_alter_subreg (xp) - rtx *xp; +walk_alter_subreg (rtx *xp) { rtx x = *xp; switch (GET_CODE (x)) @@ -2811,8 +2605,7 @@ walk_alter_subreg (xp) 2 means that COND has been altered. */ static int -alter_cond (cond) - rtx cond; +alter_cond (rtx cond) { int value = 0; @@ -2965,18 +2758,19 @@ alter_cond (cond) In an `asm', it's the user's fault; otherwise, the compiler's fault. */ void -output_operand_lossage VPARAMS ((const char *msgid, ...)) +output_operand_lossage (const char *msgid, ...) { char *fmt_string; char *new_message; - char *pfx_str; - VA_OPEN (ap, msgid); - VA_FIXEDARG (ap, const char *, msgid); + const char *pfx_str; + va_list ap; + + va_start (ap, msgid); pfx_str = this_is_asm_operands ? _("invalid `asm': ") : "output_operand: "; asprintf (&fmt_string, "%s%s", pfx_str, _(msgid)); vasprintf (&new_message, fmt_string, ap); - + if (this_is_asm_operands) error_for_asm (this_is_asm_operands, "%s", new_message); else @@ -2984,7 +2778,7 @@ output_operand_lossage VPARAMS ((const char *msgid, ...)) free (fmt_string); free (new_message); - VA_CLOSE (ap); + va_end (ap); } /* Output of assembler code from a template, and its subroutines. */ @@ -2993,7 +2787,7 @@ output_operand_lossage VPARAMS ((const char *msgid, ...)) alternative used. */ static void -output_asm_name () +output_asm_name (void) { if (debug_insn) { @@ -3018,17 +2812,15 @@ output_asm_name () corresponds to the address of the object and 0 if to the object. */ static tree -get_mem_expr_from_op (op, paddressp) - rtx op; - int *paddressp; +get_mem_expr_from_op (rtx op, int *paddressp) { tree expr; int inner_addressp; *paddressp = 0; - if (GET_CODE (op) == REG && ORIGINAL_REGNO (op) >= FIRST_PSEUDO_REGISTER) - return REGNO_DECL (ORIGINAL_REGNO (op)); + if (GET_CODE (op) == REG) + return REG_EXPR (op); else if (GET_CODE (op) != MEM) return 0; @@ -3061,10 +2853,7 @@ get_mem_expr_from_op (op, paddressp) is the number of operands to write. */ static void -output_asm_operand_names (operands, oporder, nops) - rtx *operands; - int *oporder; - int nops; +output_asm_operand_names (rtx *operands, int *oporder, int nops) { int wrote = 0; int i; @@ -3072,16 +2861,22 @@ output_asm_operand_names (operands, oporder, nops) for (i = 0; i < nops; i++) { int addressp; - tree expr = get_mem_expr_from_op (operands[oporder[i]], &addressp); + rtx op = operands[oporder[i]]; + tree expr = get_mem_expr_from_op (op, &addressp); + fprintf (asm_out_file, "%c%s", + wrote ? ',' : '\t', wrote ? "" : ASM_COMMENT_START); + wrote = 1; if (expr) { - fprintf (asm_out_file, "%c%s %s", - wrote ? ',' : '\t', wrote ? "" : ASM_COMMENT_START, + fprintf (asm_out_file, "%s", addressp ? "*" : ""); print_mem_expr (asm_out_file, expr); wrote = 1; } + else if (REG_P (op) && ORIGINAL_REGNO (op) + && ORIGINAL_REGNO (op) != REGNO (op)) + fprintf (asm_out_file, " tmp%i", ORIGINAL_REGNO (op)); } } @@ -3102,9 +2897,7 @@ output_asm_operand_names (operands, oporder, nops) of the operand, with no other punctuation. */ void -output_asm_insn (template, operands) - const char *template; - rtx *operands; +output_asm_insn (const char *template, rtx *operands) { const char *p; int c; @@ -3310,8 +3103,7 @@ output_asm_insn (template, operands) /* Output a LABEL_REF, or a bare CODE_LABEL, as an assembler symbol. */ void -output_asm_label (x) - rtx x; +output_asm_label (rtx x) { char buf[256]; @@ -3338,9 +3130,7 @@ output_asm_label (x) by PRINT_OPERAND. */ static void -output_operand (x, code) - rtx x; - int code ATTRIBUTE_UNUSED; +output_operand (rtx x, int code ATTRIBUTE_UNUSED) { if (x && GET_CODE (x) == SUBREG) x = alter_subreg (&x); @@ -3359,8 +3149,7 @@ output_operand (x, code) The macro PRINT_OPERAND_ADDRESS exists just to control this function. */ void -output_address (x) - rtx x; +output_address (rtx x) { walk_alter_subreg (&x); PRINT_OPERAND_ADDRESS (asm_out_file, x); @@ -3371,9 +3160,7 @@ output_address (x) that may appear in these expressions. */ void -output_addr_const (file, x) - FILE *file; - rtx x; +output_addr_const (FILE *file, rtx x) { char buf[256]; @@ -3495,19 +3282,18 @@ output_addr_const (file, x) %U prints the value of USER_LABEL_PREFIX. %I prints the value of IMMEDIATE_PREFIX. %O runs ASM_OUTPUT_OPCODE to transform what follows in the string. - Also supported are %d, %x, %s, %e, %f, %g and %%. + Also supported are %d, %i, %u, %x, %X, %o, %c, %s and %%. We handle alternate assembler dialects here, just like output_asm_insn. */ void -asm_fprintf VPARAMS ((FILE *file, const char *p, ...)) +asm_fprintf (FILE *file, const char *p, ...) { char buf[10]; char *q, c; + va_list argptr; - VA_OPEN (argptr, p); - VA_FIXEDARG (argptr, FILE *, file); - VA_FIXEDARG (argptr, const char *, p); + va_start (argptr, p); buf[0] = '%'; @@ -3545,6 +3331,11 @@ asm_fprintf VPARAMS ((FILE *file, const char *p, ...)) case '%': c = *p++; q = &buf[1]; + while (strchr ("-+ #0", c)) + { + *q++ = c; + c = *p++; + } while (ISDIGIT (c) || c == '.') { *q++ = c; @@ -3553,32 +3344,24 @@ asm_fprintf VPARAMS ((FILE *file, const char *p, ...)) switch (c) { case '%': - fprintf (file, "%%"); + putc ('%', file); break; case 'd': case 'i': case 'u': - case 'x': case 'p': case 'X': - case 'o': + case 'x': case 'X': case 'o': + case 'c': *q++ = c; *q = 0; fprintf (file, buf, va_arg (argptr, int)); break; case 'w': - /* This is a prefix to the 'd', 'i', 'u', 'x', 'p', and 'X' cases, - but we do not check for those cases. It means that the value - is a HOST_WIDE_INT, which may be either `int' or `long'. */ - -#if HOST_BITS_PER_WIDE_INT == HOST_BITS_PER_INT -#else -#if HOST_BITS_PER_WIDE_INT == HOST_BITS_PER_LONG - *q++ = 'l'; -#else - *q++ = 'l'; - *q++ = 'l'; -#endif -#endif - + /* This is a prefix to the 'd', 'i', 'u', 'x', 'X', and + 'o' cases, but we do not check for those cases. It + means that the value is a HOST_WIDE_INT, which may be + either `long' or `long long'. */ + memcpy (q, HOST_WIDE_INT_PRINT, strlen (HOST_WIDE_INT_PRINT)); + q += strlen (HOST_WIDE_INT_PRINT); *q++ = *p++; *q = 0; fprintf (file, buf, va_arg (argptr, HOST_WIDE_INT)); @@ -3586,17 +3369,22 @@ asm_fprintf VPARAMS ((FILE *file, const char *p, ...)) case 'l': *q++ = c; - *q++ = *p++; - *q = 0; - fprintf (file, buf, va_arg (argptr, long)); - break; +#ifdef HAVE_LONG_LONG + if (*p == 'l') + { + *q++ = *p++; + *q++ = *p++; + *q = 0; + fprintf (file, buf, va_arg (argptr, long long)); + } + else +#endif + { + *q++ = *p++; + *q = 0; + fprintf (file, buf, va_arg (argptr, long)); + } - case 'e': - case 'f': - case 'g': - *q++ = c; - *q = 0; - fprintf (file, buf, va_arg (argptr, double)); break; case 's': @@ -3653,9 +3441,9 @@ asm_fprintf VPARAMS ((FILE *file, const char *p, ...)) break; default: - fputc (c, file); + putc (c, file); } - VA_CLOSE (argptr); + va_end (argptr); } /* Split up a CONST_DOUBLE or integer constant rtx @@ -3664,9 +3452,7 @@ asm_fprintf VPARAMS ((FILE *file, const char *p, ...)) and in *SECOND the other. */ void -split_double (value, first, second) - rtx value; - rtx *first, *second; +split_double (rtx value, rtx *first, rtx *second) { if (GET_CODE (value) == CONST_INT) { @@ -3771,7 +3557,6 @@ split_double (value, first, second) } else { -#ifdef REAL_ARITHMETIC REAL_VALUE_TYPE r; long l[2]; REAL_VALUE_FROM_CONST_DOUBLE (r, value); @@ -3800,37 +3585,13 @@ split_double (value, first, second) *first = GEN_INT ((HOST_WIDE_INT) l[0]); *second = GEN_INT ((HOST_WIDE_INT) l[1]); -#else - if ((HOST_FLOAT_FORMAT != TARGET_FLOAT_FORMAT - || HOST_BITS_PER_WIDE_INT != BITS_PER_WORD) - && ! flag_pretend_float) - abort (); - - if ( -#ifdef HOST_WORDS_BIG_ENDIAN - WORDS_BIG_ENDIAN -#else - ! WORDS_BIG_ENDIAN -#endif - ) - { - /* Host and target agree => no need to swap. */ - *first = GEN_INT (CONST_DOUBLE_LOW (value)); - *second = GEN_INT (CONST_DOUBLE_HIGH (value)); - } - else - { - *second = GEN_INT (CONST_DOUBLE_LOW (value)); - *first = GEN_INT (CONST_DOUBLE_HIGH (value)); - } -#endif /* no REAL_ARITHMETIC */ } } /* Return nonzero if this function has no function calls. */ int -leaf_function_p () +leaf_function_p (void) { rtx insn; rtx link; @@ -3868,13 +3629,12 @@ leaf_function_p () return 1; } -/* Return 1 if branch is an forward branch. +/* Return 1 if branch is a forward branch. Uses insn_shuid array, so it works only in the final pass. May be used by output templates to customary add branch prediction hints. */ int -final_forward_branch_p (insn) - rtx insn; +final_forward_branch_p (rtx insn) { int insn_id, label_id; if (!uid_shuid) @@ -3902,10 +3662,10 @@ final_forward_branch_p (insn) safely renumbered. */ int -only_leaf_regs_used () +only_leaf_regs_used (void) { int i; - char *permitted_reg_in_leaf_functions = LEAF_REGISTERS; + const char *const permitted_reg_in_leaf_functions = LEAF_REGISTERS; for (i = 0; i < FIRST_PSEUDO_REGISTER; i++) if ((regs_ever_live[i] || global_regs[i]) @@ -3925,8 +3685,7 @@ only_leaf_regs_used () available in leaf functions. */ static void -leaf_renumber_regs (first) - rtx first; +leaf_renumber_regs (rtx first) { rtx insn; @@ -3947,8 +3706,7 @@ leaf_renumber_regs (first) available in leaf functions. */ void -leaf_renumber_regs_insn (in_rtx) - rtx in_rtx; +leaf_renumber_regs_insn (rtx in_rtx) { int i, j; const char *format_ptr; @@ -4025,3 +3783,85 @@ leaf_renumber_regs_insn (in_rtx) } } #endif + + +/* When -gused is used, emit debug info for only used symbols. But in + addition to the standard intercepted debug_hooks there are some direct + calls into this file, i.e., dbxout_symbol, dbxout_parms, and dbxout_reg_params. + Those routines may also be called from a higher level intercepted routine. So + to prevent recording data for an inner call to one of these for an intercept, + we maintain a intercept nesting counter (debug_nesting). We only save the + intercepted arguments if the nesting is 1. */ +int debug_nesting = 0; + +static tree *symbol_queue; +int symbol_queue_index = 0; +static int symbol_queue_size = 0; + +/* Generate the symbols for any queued up type symbols we encountered + while generating the type info for some originally used symbol. + This might generate additional entries in the queue. Only when + the nesting depth goes to 0 is this routine called. */ + +void +debug_flush_symbol_queue (void) +{ + int i; + + /* Make sure that additionally queued items are not flushed + prematurely. */ + + ++debug_nesting; + + for (i = 0; i < symbol_queue_index; ++i) + { + /* If we pushed queued symbols then such symbols are must be + output no matter what anyone else says. Specifically, + we need to make sure dbxout_symbol() thinks the symbol was + used and also we need to override TYPE_DECL_SUPPRESS_DEBUG + which may be set for outside reasons. */ + int saved_tree_used = TREE_USED (symbol_queue[i]); + int saved_suppress_debug = TYPE_DECL_SUPPRESS_DEBUG (symbol_queue[i]); + TREE_USED (symbol_queue[i]) = 1; + TYPE_DECL_SUPPRESS_DEBUG (symbol_queue[i]) = 0; + +#ifdef DBX_DEBUGGING_INFO + dbxout_symbol (symbol_queue[i], 0); +#endif + + TREE_USED (symbol_queue[i]) = saved_tree_used; + TYPE_DECL_SUPPRESS_DEBUG (symbol_queue[i]) = saved_suppress_debug; + } + + symbol_queue_index = 0; + --debug_nesting; +} + +/* Queue a type symbol needed as part of the definition of a decl + symbol. These symbols are generated when debug_flush_symbol_queue() + is called. */ + +void +debug_queue_symbol (tree decl) +{ + if (symbol_queue_index >= symbol_queue_size) + { + symbol_queue_size += 10; + symbol_queue = xrealloc (symbol_queue, + symbol_queue_size * sizeof (tree)); + } + + symbol_queue[symbol_queue_index++] = decl; +} + +/* Free symbol queue. */ +void +debug_free_queue (void) +{ + if (symbol_queue) + { + free (symbol_queue); + symbol_queue = NULL; + symbol_queue_size = 0; + } +}