diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d7b9a406a02d..a7f0b779db4d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2006-11-21 Bernd Schmidt + + * config/bfin/bfin.opt (mstack-check-l1): New. + * doc/invoke.texi (Blackfin Options): Document it. + * config/bfin/bfin.c (bfin_expand_prologue): Generate code to use + stack bounds in L1 memory if the new option is enabled. + (override_options): Don't allow combinations of -fstack-limit and + -mstack-check-l1. + (add_to_reg): Renamed from add_to_sp. All callers changed. Lose some + dead code. + 2006-11-21 Ben Elliston * config/spu/spu.c (spu_expand_vector_init): Initialise x. diff --git a/gcc/config/bfin/bfin.c b/gcc/config/bfin/bfin.c index b71b12374a16..46c028b53f8f 100644 --- a/gcc/config/bfin/bfin.c +++ b/gcc/config/bfin/bfin.c @@ -547,12 +547,12 @@ frame_related_constant_load (rtx reg, HOST_WIDE_INT constant, bool related) RTX_FRAME_RELATED_P (insn) = 1; } -/* Generate efficient code to add a value to the frame pointer. We - can use P1 as a scratch register. Set RTX_FRAME_RELATED_P on the - generated insns if FRAME is nonzero. */ +/* Generate efficient code to add a value to a P register. We can use + P1 as a scratch register. Set RTX_FRAME_RELATED_P on the generated + insns if FRAME is nonzero. */ static void -add_to_sp (rtx spreg, HOST_WIDE_INT value, int frame) +add_to_reg (rtx reg, HOST_WIDE_INT value, int frame) { if (value == 0) return; @@ -568,13 +568,9 @@ add_to_sp (rtx spreg, HOST_WIDE_INT value, int frame) if (frame) frame_related_constant_load (tmpreg, value, TRUE); else - { - insn = emit_move_insn (tmpreg, GEN_INT (value)); - if (frame) - RTX_FRAME_RELATED_P (insn) = 1; - } + insn = emit_move_insn (tmpreg, GEN_INT (value)); - insn = emit_insn (gen_addsi3 (spreg, spreg, tmpreg)); + insn = emit_insn (gen_addsi3 (reg, reg, tmpreg)); if (frame) RTX_FRAME_RELATED_P (insn) = 1; } @@ -591,7 +587,7 @@ add_to_sp (rtx spreg, HOST_WIDE_INT value, int frame) it's no good. */ size = -60; - insn = emit_insn (gen_addsi3 (spreg, spreg, GEN_INT (size))); + insn = emit_insn (gen_addsi3 (reg, reg, GEN_INT (size))); if (frame) RTX_FRAME_RELATED_P (insn) = 1; value -= size; @@ -684,7 +680,7 @@ do_link (rtx spreg, HOST_WIDE_INT frame_size, bool all) rtx insn = emit_insn (pat); RTX_FRAME_RELATED_P (insn) = 1; } - add_to_sp (spreg, -frame_size, 1); + add_to_reg (spreg, -frame_size, 1); } } @@ -701,7 +697,7 @@ do_unlink (rtx spreg, HOST_WIDE_INT frame_size, bool all) { rtx postinc = gen_rtx_MEM (Pmode, gen_rtx_POST_INC (Pmode, spreg)); - add_to_sp (spreg, frame_size, 0); + add_to_reg (spreg, frame_size, 0); if (must_save_fp_p ()) { rtx fpreg = gen_rtx_REG (Pmode, REG_FP); @@ -911,16 +907,24 @@ bfin_expand_prologue (void) return; } - if (current_function_limit_stack) + if (current_function_limit_stack + || TARGET_STACK_CHECK_L1) { HOST_WIDE_INT offset = bfin_initial_elimination_offset (ARG_POINTER_REGNUM, STACK_POINTER_REGNUM); - rtx lim = stack_limit_rtx; + rtx lim = current_function_limit_stack ? stack_limit_rtx : NULL_RTX; + rtx p2reg = gen_rtx_REG (Pmode, REG_P2); + if (!lim) + { + rtx p1reg = gen_rtx_REG (Pmode, REG_P1); + emit_move_insn (p2reg, gen_int_mode (0xFFB00000, SImode)); + emit_move_insn (p2reg, gen_rtx_MEM (Pmode, p2reg)); + lim = p2reg; + } if (GET_CODE (lim) == SYMBOL_REF) { - rtx p2reg = gen_rtx_REG (Pmode, REG_P2); if (TARGET_ID_SHARED_LIBRARY) { rtx p1reg = gen_rtx_REG (Pmode, REG_P1); @@ -935,11 +939,18 @@ bfin_expand_prologue (void) } else { - rtx limit = plus_constant (stack_limit_rtx, offset); + rtx limit = plus_constant (lim, offset); emit_move_insn (p2reg, limit); lim = p2reg; } } + else + { + if (lim != p2reg) + emit_move_insn (p2reg, lim); + add_to_reg (p2reg, offset, 0); + lim = p2reg; + } emit_insn (gen_compare_lt (bfin_cc_rtx, spreg, lim)); emit_insn (gen_trapifcc ()); } @@ -2026,8 +2037,11 @@ override_options (void) if (TARGET_ID_SHARED_LIBRARY && flag_pic == 0) flag_pic = 1; + if (stack_limit_rtx && TARGET_STACK_CHECK_L1) + error ("Can't use multiple stack checking methods together."); + if (TARGET_ID_SHARED_LIBRARY && TARGET_FDPIC) - error ("ID shared libraries and FD-PIC mode can't be used together."); + error ("ID shared libraries and FD-PIC mode can't be used together."); /* Don't allow the user to specify -mid-shared-library and -msep-data together, as it makes little sense from a user's point of view... */ diff --git a/gcc/config/bfin/bfin.opt b/gcc/config/bfin/bfin.opt index 5b53fecac6bd..6c044f4388a3 100644 --- a/gcc/config/bfin/bfin.opt +++ b/gcc/config/bfin/bfin.opt @@ -60,3 +60,7 @@ Avoid generating pc-relative calls; use indirection mfdpic Target Report Mask(FDPIC) Enable Function Descriptor PIC mode + +mstack-check-l1 +Target Report Mask(STACK_CHECK_L1) +Do stack checking using bounds in L1 scratch memory diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi index 3cd8219549c9..045c5fd25571 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -429,9 +429,10 @@ Objective-C and Objective-C++ Dialects}. @emph{Blackfin Options} @gccoptlist{-momit-leaf-frame-pointer -mno-omit-leaf-frame-pointer @gol -mspecld-anomaly -mno-specld-anomaly -mcsync-anomaly -mno-csync-anomaly @gol --mlow-64k -mno-low64k -mid-shared-library @gol +-mlow-64k -mno-low64k -mstack-check-l1 -mid-shared-library @gol -mno-id-shared-library -mshared-library-id=@var{n} @gol --mlong-calls -mno-long-calls} +-mleaf-id-shared-library -mno-leaf-id-shared-library @gol +-msep-data -mno-sep-data -mlong-calls -mno-long-calls} @emph{CRIS Options} @gccoptlist{-mcpu=@var{cpu} -march=@var{cpu} -mtune=@var{cpu} @gol @@ -7845,6 +7846,11 @@ the entire program fits into the low 64k of memory. @opindex mno-low-64k Assume that the program is arbitrarily large. This is the default. +@item -mstack-check-l1 +@opindex mstack-check-l1 +Do stack checking using information placed into L1 scratchpad memory by the +uClinux kernel. + @item -mid-shared-library @opindex mid-shared-library Generate code that supports shared libraries via the library ID method. @@ -7856,6 +7862,18 @@ without virtual memory management. This option implies @option{-fPIC}. Generate code that doesn't assume ID based shared libraries are being used. This is the default. +@item -mleaf-id-shared-library +@opindex mleaf-id-shared-library +Generate code that supports shared libraries via the library ID method, +but assumes that this library or executable won't link against any other +ID shared libraries. That allows the compiler to use faster code for jumps +and calls. + +@item -mno-leaf-id-shared-library +@opindex mno-leaf-id-shared-library +Do not assume that the code being compiled won't link against any ID shared +libraries. Slower code will be generated for jump and call insns. + @item -mshared-library-id=n @opindex mshared-library-id Specified the identification number of the ID based shared library being @@ -7863,6 +7881,18 @@ compiled. Specifying a value of 0 will generate more compact code, specifying other values will force the allocation of that number to the current library but is no more space or time efficient than omitting this option. +@item -msep-data +@opindex msep-data +Generate code that allows the data segment to be located in a different +area of memory from the text segment. This allows for execute in place in +an environment without virtual memory management by eliminating relocations +against the text section. + +@item -mno-sep-data +@opindex mno-sep-data +Generate code that assumes that the data segment follows the text segment. +This is the default. + @item -mlong-calls @itemx -mno-long-calls @opindex mlong-calls