From 632b09212386db8c68978befb8dc0d2745988b7c Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Mon, 16 Nov 2015 12:19:22 +0000 Subject: [PATCH] sparc.c (sparc_emit_probe_stack_range): Adjust. * config/sparc/sparc.c (sparc_emit_probe_stack_range): Adjust. (output_probe_stack_range): Rotate the loop and simplify. From-SVN: r230414 --- gcc/ChangeLog | 5 +++++ gcc/config/sparc/sparc.c | 32 ++++++++++++-------------------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 04c4d5e5fc1..889f434c049 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-11-16 Eric Botcazou + + * config/sparc/sparc.c (sparc_emit_probe_stack_range): Adjust. + (output_probe_stack_range): Rotate the loop and simplify. + 2015-11-16 Eric Botcazou * config/rs6000/rs6000.c (rs6000_emit_probe_stack_rang): Adjust. diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c index 23f112583c2..93287235b8f 100644 --- a/gcc/config/sparc/sparc.c +++ b/gcc/config/sparc/sparc.c @@ -5058,9 +5058,9 @@ sparc_emit_probe_stack_range (HOST_WIDE_INT first, HOST_WIDE_INT size) emit_stack_probe (plus_constant (Pmode, g1, -size)); } - /* The run-time loop is made up of 10 insns in the generic case while the + /* The run-time loop is made up of 9 insns in the generic case while the compile-time loop is made up of 4+2*(n-2) insns for n # of intervals. */ - else if (size <= 5 * PROBE_INTERVAL) + else if (size <= 4 * PROBE_INTERVAL) { HOST_WIDE_INT i; @@ -5147,41 +5147,33 @@ const char * output_probe_stack_range (rtx reg1, rtx reg2) { static int labelno = 0; - char loop_lab[32], end_lab[32]; + char loop_lab[32]; rtx xops[2]; - ASM_GENERATE_INTERNAL_LABEL (loop_lab, "LPSRL", labelno); - ASM_GENERATE_INTERNAL_LABEL (end_lab, "LPSRE", labelno++); + ASM_GENERATE_INTERNAL_LABEL (loop_lab, "LPSRL", labelno++); + /* Loop. */ ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, loop_lab); - /* Jump to END_LAB if TEST_ADDR == LAST_ADDR. */ + /* TEST_ADDR = TEST_ADDR + PROBE_INTERVAL. */ xops[0] = reg1; + xops[1] = GEN_INT (-PROBE_INTERVAL); + output_asm_insn ("add\t%0, %1, %0", xops); + + /* Test if TEST_ADDR == LAST_ADDR. */ xops[1] = reg2; output_asm_insn ("cmp\t%0, %1", xops); - if (TARGET_ARCH64) - fputs ("\tbe,pn\t%xcc,", asm_out_file); - else - fputs ("\tbe\t", asm_out_file); - assemble_name_raw (asm_out_file, end_lab); - fputc ('\n', asm_out_file); - - /* TEST_ADDR = TEST_ADDR + PROBE_INTERVAL. */ - xops[1] = GEN_INT (-PROBE_INTERVAL); - output_asm_insn (" add\t%0, %1, %0", xops); /* Probe at TEST_ADDR and branch. */ if (TARGET_ARCH64) - fputs ("\tba,pt\t%xcc,", asm_out_file); + fputs ("\tbne,pt\t%xcc,", asm_out_file); else - fputs ("\tba\t", asm_out_file); + fputs ("\tbne\t", asm_out_file); assemble_name_raw (asm_out_file, loop_lab); fputc ('\n', asm_out_file); xops[1] = GEN_INT (SPARC_STACK_BIAS); output_asm_insn (" st\t%%g0, [%0+%1]", xops); - ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, end_lab); - return ""; } -- 2.30.2