From 792005aed55b765a042ebd74a538c4e9447f099a Mon Sep 17 00:00:00 2001 From: ebotcazou Date: Fri, 3 Sep 2004 22:23:32 +0000 Subject: [PATCH] * final.c (output_in_slot): New global variable. (final_scan_insn): Add new state '2' to the 'nopeepholes' parameter. Pass 2 as 'nopeepholes' to self for insns in a SEQUENCE. Set 'output_in_slot' before invoking output_asm_insn. (output_asm_insn): Add a space after the tab if 'output_in_slot' is set. * config/sparc/sparc.c (output_return): Pass 2 as 'nopeepholes' to final_scan_insn. (output_sibcall): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@87056 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 12 ++++++++++++ gcc/config/sparc/sparc.c | 6 +++--- gcc/final.c | 20 +++++++++++++++----- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0ee169c..175598c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,15 @@ +2004-09-03 Eric Botcazou + + * final.c (output_in_slot): New global variable. + (final_scan_insn): Add new state '2' to the 'nopeepholes' parameter. + Pass 2 as 'nopeepholes' to self for insns in a SEQUENCE. Set + 'output_in_slot' before invoking output_asm_insn. + (output_asm_insn): Add a space after the tab if 'output_in_slot' + is set. + * config/sparc/sparc.c (output_return): Pass 2 as 'nopeepholes' to + final_scan_insn. + (output_sibcall): Likewise. + 2004-09-03 Jan Hubicka * tree-ssa-operands.c (fini_ssa_operands): ggc_free unused arrays. diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c index ac1a434..cf7ac04 100644 --- a/gcc/config/sparc/sparc.c +++ b/gcc/config/sparc/sparc.c @@ -4707,7 +4707,7 @@ output_return (rtx insn) if (! delay) abort (); - final_scan_insn (delay, asm_out_file, 1, 0, 1, NULL); + final_scan_insn (delay, asm_out_file, 1, 0, 2, NULL); PATTERN (delay) = gen_blockage (); INSN_CODE (delay) = -1; } @@ -4756,7 +4756,7 @@ output_return (rtx insn) epilogue_renumber (&pat, 0); fprintf (asm_out_file, "\treturn\t%%i7+%d\n", sparc_skip_caller_unimp ? 12 : 8); - final_scan_insn (delay, asm_out_file, 1, 0, 1, NULL); + final_scan_insn (delay, asm_out_file, 1, 0, 2, NULL); } else { @@ -4817,7 +4817,7 @@ output_sibcall (rtx insn, rtx call_operand) output_asm_insn ("sethi\t%%hi(%a0), %%g1", operands); output_asm_insn ("jmp\t%%g1 + %%lo(%a0)", operands); - final_scan_insn (delay, asm_out_file, 1, 0, 1, NULL); + final_scan_insn (delay, asm_out_file, 1, 0, 2, NULL); PATTERN (delay) = gen_blockage (); INSN_CODE (delay) = -1; diff --git a/gcc/final.c b/gcc/final.c index fe4eaa6..e1c0148 100644 --- a/gcc/final.c +++ b/gcc/final.c @@ -200,6 +200,10 @@ static int app_on; rtx final_sequence; +/* True if we are outputting insns in a delay slot. This is used + to prettify the assembly. */ +static bool output_in_slot; + #ifdef ASSEMBLER_DIALECT /* Number of the assembler dialect to use, starting at 0. */ @@ -1663,8 +1667,11 @@ scan_ahead_for_unlikely_executed_note (rtx insn) is the insn being scanned. Value returned is the next insn to be scanned. - NOPEEPHOLES is the flag to disallow peephole processing (currently - used for within delayed branch sequence output). + NOPEEPHOLES is used to disallow peephole processing: + - 0: peepholes are allowed, + - 1: peepholes are not allowed, + - 2: peepholes are not allowed and we are in the + slot of a delayed branch. SEEN is used to track the end of the prologue, for emitting debug information. We force the emission of a line note after @@ -1674,8 +1681,7 @@ scan_ahead_for_unlikely_executed_note (rtx insn) rtx final_scan_insn (rtx insn, FILE *file, int optimize ATTRIBUTE_UNUSED, - int prescan, int nopeepholes ATTRIBUTE_UNUSED, - int *seen) + int prescan, int nopeepholes, int *seen) { #ifdef HAVE_cc0 rtx set; @@ -2195,7 +2201,7 @@ final_scan_insn (rtx insn, FILE *file, int optimize ATTRIBUTE_UNUSED, /* We loop in case any instruction in a delay slot gets split. */ do - insn = final_scan_insn (insn, file, 0, prescan, 1, seen); + insn = final_scan_insn (insn, file, 0, prescan, 2, seen); while (insn != next); } #ifdef DBR_OUTPUT_SEQEND @@ -2527,7 +2533,9 @@ final_scan_insn (rtx insn, FILE *file, int optimize ATTRIBUTE_UNUSED, #endif /* Output assembler code from the template. */ + output_in_slot = (nopeepholes > 1); output_asm_insn (template, recog_data.operand); + output_in_slot = false; /* If necessary, report the effect that the instruction has on the unwind info. We've already done this for delay slots @@ -2988,6 +2996,8 @@ output_asm_insn (const char *template, rtx *operands) memset (opoutput, 0, sizeof opoutput); p = template; putc ('\t', asm_out_file); + if (output_in_slot) + putc (' ', asm_out_file); #ifdef ASM_OUTPUT_OPCODE ASM_OUTPUT_OPCODE (asm_out_file, p); -- 2.7.4