OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rtl.h (emit_note): Remove FILE parameter. 

* rtl.h (emit_note): Remove FILE parameter.
	* emit-rtl.c (emit_line_note): Adjust emit_note call.
	(emit_note): Remove FILE parameter. Adjust.
	* builtins.c (expand_builtin_expect): Adjust emit_note call.
	* c-semantics.c (genrtl_scope_stmt): Likewise.
	(expand_stmt): Likewise.
	* cfglayout.c (reemit_insn_block_notes): Likewise.
	(duplicate_insn_chain): Likewise.
	* except.c (expand_eh_region_start, expand_eh_region_end,
	sjlj_emit_function_enter): Likewise.
	* explow.c (probe_stack_range): Likewise.
	* expr.c (emit_block_move_via_loop): Likewise.
	* function.c (init_function_start, expand_function_start,
	expand_function_end, thread_prologue_and_epilogue_insns): Likewise.
	* integrate.c (expand_inline_function, copy_insn_list): Likewise.
	* reg-stack.c (compensate_edge): Likewise.
	* reload1.c (reload): Likewise.
	* rtlanal.c (hoist_insn_to_edge): Likewise.
	* stmt.c (expand_fixup, expand_start_loop, expand_start_null_loop,
	expand_loop_continue_here, expand_end_loop, expand_continue_loop,
	expand_exit_loop_top_cond, expand_value_return,
	expand_start_bindings_and_block, expand_end_bindings,
	expand_decl_cleanup, expand_start_case): Likewise.
	* unroll.c (copy_loop_body
	* config/alpha/alpha.c (alpha_output_mi_thunk_osf): Likewise.
	* config/ia64/ia64.c (ia64_output_mi_thunk): Likewise.
	* config/rs6000/rs6000.c (rs6000_emit_eh_toc_restore,
	rs6000_emit_allocate_stack, rs6000_output_function_prologue,
	rs6000_output_function_epilogue, rs6000_output_mi_thunk): Likewise.
	* config/sh/sh.c (sh_output_mi_thunk): Likewise.
	* config/sparc/sparc.c (sparc_output_mi_thunk): Likewise.

	* ada/misc.c (record_code_position): Likewise.

From-SVN: r68561
This commit is contained in:
Nathan Sidwell 2003-06-27 09:49:44 +00:00 committed by Nathan Sidwell
parent bc4721b87e
commit 2e04021970
23 changed files with 113 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gcc/ChangeLog
View File

@ -1,3 +1,37 @@
2003-06-27 Nathan Sidwell <nathan@codesourcery.com>
* rtl.h (emit_note): Remove FILE parameter.
* emit-rtl.c (emit_line_note): Adjust emit_note call.
(emit_note): Remove FILE parameter. Adjust.
* builtins.c (expand_builtin_expect): Adjust emit_note call.
* c-semantics.c (genrtl_scope_stmt): Likewise.
(expand_stmt): Likewise.
* cfglayout.c (reemit_insn_block_notes): Likewise.
(duplicate_insn_chain): Likewise.
* except.c (expand_eh_region_start, expand_eh_region_end,
sjlj_emit_function_enter): Likewise.
* explow.c (probe_stack_range): Likewise.
* expr.c (emit_block_move_via_loop): Likewise.
* function.c (init_function_start, expand_function_start,
expand_function_end, thread_prologue_and_epilogue_insns): Likewise.
* integrate.c (expand_inline_function, copy_insn_list): Likewise.
* reg-stack.c (compensate_edge): Likewise.
* reload1.c (reload): Likewise.
* rtlanal.c (hoist_insn_to_edge): Likewise.
* stmt.c (expand_fixup, expand_start_loop, expand_start_null_loop,
expand_loop_continue_here, expand_end_loop, expand_continue_loop,
expand_exit_loop_top_cond, expand_value_return,
expand_start_bindings_and_block, expand_end_bindings,
expand_decl_cleanup, expand_start_case): Likewise.
* unroll.c (copy_loop_body
* config/alpha/alpha.c (alpha_output_mi_thunk_osf): Likewise.
* config/ia64/ia64.c (ia64_output_mi_thunk): Likewise.
* config/rs6000/rs6000.c (rs6000_emit_eh_toc_restore,
rs6000_emit_allocate_stack, rs6000_output_function_prologue,
rs6000_output_function_epilogue, rs6000_output_mi_thunk): Likewise.
* config/sh/sh.c (sh_output_mi_thunk): Likewise.
* config/sparc/sparc.c (sparc_output_mi_thunk): Likewise.
2003-06-27 Nathan Sidwell <nathan@codesourcery.com> 2003-06-27 Nathan Sidwell <nathan@codesourcery.com>
* c-tree.h (grokfield): Remove unused filename and line parameters. * c-tree.h (grokfield): Remove unused filename and line parameters.

4
gcc/ada/ChangeLog
View File

@ -1,3 +1,7 @@
2003-06-27 Nathan Sidwell <nathan@codesourcery.com>
* misc.c (record_code_position): Adjust emit_note call.
2003-06-26 Neil Booth <neil@daikokuya.co.uk> 2003-06-26 Neil Booth <neil@daikokuya.co.uk>
* misc.c (gnat_handle_option): Don't check for missing arguments. * misc.c (gnat_handle_option): Don't check for missing arguments.

2
gcc/ada/misc.c
View File

@ -719,7 +719,7 @@ record_code_position (gnat_node)
addressable needs some fixups and also for above reason. */ addressable needs some fixups and also for above reason. */
save_gnu_tree (gnat_node, save_gnu_tree (gnat_node,
build (RTL_EXPR, void_type_node, NULL_TREE, build (RTL_EXPR, void_type_node, NULL_TREE,
(tree) emit_note (0, NOTE_INSN_DELETED)), (tree) emit_note (NOTE_INSN_DELETED)),
1); 1);
} }

2
gcc/builtins.c
View File

@ -4301,7 +4301,7 @@ expand_builtin_expect (tree arglist, rtx target)
rtx_c = expand_expr (c, NULL_RTX, GET_MODE (target), EXPAND_NORMAL); rtx_c = expand_expr (c, NULL_RTX, GET_MODE (target), EXPAND_NORMAL);
note = emit_note (NULL, NOTE_INSN_EXPECTED_VALUE); note = emit_note (NOTE_INSN_EXPECTED_VALUE);
NOTE_EXPECTED_VALUE (note) = gen_rtx_EQ (VOIDmode, target, rtx_c); NOTE_EXPECTED_VALUE (note) = gen_rtx_EQ (VOIDmode, target, rtx_c);
} }

8
gcc/c-semantics.c
View File

@ -629,10 +629,8 @@ genrtl_scope_stmt (tree t)
} }
else if (!SCOPE_NULLIFIED_P (t)) else if (!SCOPE_NULLIFIED_P (t))
{ {
rtx note = emit_note (NULL, rtx note = emit_note (SCOPE_BEGIN_P (t)
(SCOPE_BEGIN_P (t) ? NOTE_INSN_BLOCK_BEG : NOTE_INSN_BLOCK_END);
? NOTE_INSN_BLOCK_BEG
: NOTE_INSN_BLOCK_END));
NOTE_BLOCK (note) = block; NOTE_BLOCK (note) = block;
} }
@ -858,7 +856,7 @@ expand_stmt (tree t)
&& TREE_CODE (GOTO_DESTINATION (t)) == LABEL_DECL && TREE_CODE (GOTO_DESTINATION (t)) == LABEL_DECL
&& flag_guess_branch_prob) && flag_guess_branch_prob)
{ {
rtx note = emit_note (NULL, NOTE_INSN_PREDICTION); rtx note = emit_note (NOTE_INSN_PREDICTION);
NOTE_PREDICTION (note) = NOTE_PREDICT (PRED_GOTO, NOT_TAKEN); NOTE_PREDICTION (note) = NOTE_PREDICT (PRED_GOTO, NOT_TAKEN);
} }

4
gcc/cfglayout.c
View File

@ -513,7 +513,7 @@ reemit_insn_block_notes (void)
} }
/* change_scope emits before the insn, not after. */ /* change_scope emits before the insn, not after. */
note = emit_note (NULL, NOTE_INSN_DELETED); note = emit_note (NOTE_INSN_DELETED);
change_scope (note, cur_block, DECL_INITIAL (cfun->decl)); change_scope (note, cur_block, DECL_INITIAL (cfun->decl));
delete_insn (note); delete_insn (note);
@ -943,7 +943,7 @@ duplicate_insn_chain (rtx from, rtx to)
/* Avoid updating of boundaries of previous basic block. The /* Avoid updating of boundaries of previous basic block. The
note will get removed from insn stream in fixup. */ note will get removed from insn stream in fixup. */
last = emit_note (NULL, NOTE_INSN_DELETED); last = emit_note (NOTE_INSN_DELETED);
/* Create copy at the end of INSN chain. The chain will /* Create copy at the end of INSN chain. The chain will
be reordered later. */ be reordered later. */

2
gcc/config/alpha/alpha.c
View File

@ -7658,7 +7658,7 @@ alpha_output_mi_thunk_osf (FILE *file, tree thunk_fndecl ATTRIBUTE_UNUSED,
/* We always require a valid GP. */ /* We always require a valid GP. */
emit_insn (gen_prologue_ldgp ()); emit_insn (gen_prologue_ldgp ());
emit_note (NULL, NOTE_INSN_PROLOGUE_END); emit_note (NOTE_INSN_PROLOGUE_END);
/* Find the "this" pointer. If the function returns a structure, /* Find the "this" pointer. If the function returns a structure,
the structure return pointer is in $16. */ the structure return pointer is in $16. */

2
gcc/config/ia64/ia64.c
View File

@ -8491,7 +8491,7 @@ ia64_output_mi_thunk (file, thunk, delta, vcall_offset, function)
reg_names[IN_REG (0)] = ia64_reg_numbers[0]; reg_names[IN_REG (0)] = ia64_reg_numbers[0];
/* Mark the end of the (empty) prologue. */ /* Mark the end of the (empty) prologue. */
emit_note (NULL, NOTE_INSN_PROLOGUE_END); emit_note (NOTE_INSN_PROLOGUE_END);
this = gen_rtx_REG (Pmode, IN_REG (0)); this = gen_rtx_REG (Pmode, IN_REG (0));

18
gcc/config/rs6000/rs6000.c
View File

@ -10706,7 +10706,7 @@ rs6000_emit_eh_toc_restore (stacksize)
abort (); abort ();
emit_move_insn (opcode, insn_after_throw); emit_move_insn (opcode, insn_after_throw);
emit_note (NULL, NOTE_INSN_LOOP_BEG); emit_note (NOTE_INSN_LOOP_BEG);
emit_label (loop_start); emit_label (loop_start);
do_compare_rtx_and_jump (opcode, tocompare, NE, 1, do_compare_rtx_and_jump (opcode, tocompare, NE, 1,
@ -10733,9 +10733,9 @@ rs6000_emit_eh_toc_restore (stacksize)
emit_move_insn (opcode_addr, mem); emit_move_insn (opcode_addr, mem);
emit_move_insn (opcode, gen_rtx_MEM (SImode, opcode_addr)); emit_move_insn (opcode, gen_rtx_MEM (SImode, opcode_addr));
emit_note (NULL, NOTE_INSN_LOOP_CONT); emit_note (NOTE_INSN_LOOP_CONT);
emit_jump (loop_start); emit_jump (loop_start);
emit_note (NULL, NOTE_INSN_LOOP_END); emit_note (NOTE_INSN_LOOP_END);
emit_label (loop_exit); emit_label (loop_exit);
} }
@ -10809,7 +10809,7 @@ rs6000_emit_allocate_stack (size, copy_r12)
{ {
/* Need a note here so that try_split doesn't get confused. */ /* Need a note here so that try_split doesn't get confused. */
if (get_last_insn() == NULL_RTX) if (get_last_insn() == NULL_RTX)
emit_note (0, NOTE_INSN_DELETED); emit_note (NOTE_INSN_DELETED);
insn = emit_move_insn (tmp_reg, todec); insn = emit_move_insn (tmp_reg, todec);
try_split (PATTERN (insn), insn, 0); try_split (PATTERN (insn), insn, 0);
todec = tmp_reg; todec = tmp_reg;
@ -11536,9 +11536,9 @@ rs6000_output_function_prologue (file, size)
/* A NOTE_INSN_DELETED is supposed to be at the start and end of /* A NOTE_INSN_DELETED is supposed to be at the start and end of
the "toplevel" insn chain. */ the "toplevel" insn chain. */
emit_note (0, NOTE_INSN_DELETED); emit_note (NOTE_INSN_DELETED);
rs6000_emit_prologue (); rs6000_emit_prologue ();
emit_note (0, NOTE_INSN_DELETED); emit_note (NOTE_INSN_DELETED);
/* Expand INSN_ADDRESSES so final() doesn't crash. */ /* Expand INSN_ADDRESSES so final() doesn't crash. */
{ {
@ -11957,9 +11957,9 @@ rs6000_output_function_epilogue (file, size)
/* A NOTE_INSN_DELETED is supposed to be at the start /* A NOTE_INSN_DELETED is supposed to be at the start
and end of the "toplevel" insn chain. */ and end of the "toplevel" insn chain. */
emit_note (0, NOTE_INSN_DELETED); emit_note (NOTE_INSN_DELETED);
rs6000_emit_epilogue (FALSE); rs6000_emit_epilogue (FALSE);
emit_note (0, NOTE_INSN_DELETED); emit_note (NOTE_INSN_DELETED);
/* Expand INSN_ADDRESSES so final() doesn't crash. */ /* Expand INSN_ADDRESSES so final() doesn't crash. */
{ {
@ -12254,7 +12254,7 @@ rs6000_output_mi_thunk (file, thunk_fndecl, delta, vcall_offset, function)
no_new_pseudos = 1; no_new_pseudos = 1;
/* Mark the end of the (empty) prologue. */ /* Mark the end of the (empty) prologue. */
emit_note (NULL, NOTE_INSN_PROLOGUE_END); emit_note (NOTE_INSN_PROLOGUE_END);
/* Find the "this" pointer. If the function returns a structure, /* Find the "this" pointer. If the function returns a structure,
the structure return pointer is in r3. */ the structure return pointer is in r3. */

2
gcc/config/sh/sh.c
View File

@ -8547,7 +8547,7 @@ sh_output_mi_thunk (file, thunk_fndecl, delta, vcall_offset, function)
no_new_pseudos = 1; no_new_pseudos = 1;
current_function_uses_only_leaf_regs = 1; current_function_uses_only_leaf_regs = 1;
emit_note (NULL, NOTE_INSN_PROLOGUE_END); emit_note (NOTE_INSN_PROLOGUE_END);
/* Find the "this" pointer. We have such a wide range of ABIs for the /* Find the "this" pointer. We have such a wide range of ABIs for the
SH that it's best to do this completely machine independently. SH that it's best to do this completely machine independently.

2
gcc/config/sparc/sparc.c
View File

@ -8593,7 +8593,7 @@ sparc_output_mi_thunk (file, thunk_fndecl, delta, vcall_offset, function)
no_new_pseudos = 1; no_new_pseudos = 1;
current_function_uses_only_leaf_regs = 1; current_function_uses_only_leaf_regs = 1;
emit_note (NULL, NOTE_INSN_PROLOGUE_END); emit_note (NOTE_INSN_PROLOGUE_END);
/* Find the "this" pointer. Normally in %o0, but in ARCH64 if the function /* Find the "this" pointer. Normally in %o0, but in ARCH64 if the function
returns a structure, the structure return pointer is there instead. */ returns a structure, the structure return pointer is there instead. */

22
gcc/emit-rtl.c
View File

@ -4899,6 +4899,8 @@ emit_line_note (file, line)
const char *file; const char *file;
int line; int line;
{ {
rtx note;
if (line < 0) if (line < 0)
abort (); abort ();
@ -4916,25 +4918,25 @@ emit_line_note (file, line)
return NULL_RTX; return NULL_RTX;
} }
return emit_note (file, line); note = emit_note (line);
NOTE_SOURCE_FILE (note) = file;
return note;
} }
/* Make an insn of code NOTE /* Make an insn of code NOTE or type NOTE_NO
with data-fields specified by FILE and LINE and add it to the end of the doubly-linked list. */
and add it to the end of the doubly-linked list.
If it is a line-number NOTE, omit it if it matches the previous one. */
rtx rtx
emit_note (file, line) emit_note (note_no)
const char *file; int note_no;
int line;
{ {
rtx note; rtx note;
note = rtx_alloc (NOTE); note = rtx_alloc (NOTE);
INSN_UID (note) = cur_insn_uid++; INSN_UID (note) = cur_insn_uid++;
NOTE_SOURCE_FILE (note) = file; NOTE_LINE_NUMBER (note) = note_no;
NOTE_LINE_NUMBER (note) = line; NOTE_DATA (note) = 0;
BLOCK_FOR_INSN (note) = NULL; BLOCK_FOR_INSN (note) = NULL;
add_insn (note); add_insn (note);
return note; return note;

6
gcc/except.c
View File

@ -510,7 +510,7 @@ expand_eh_region_start ()
/* Create a note marking the start of this region. */ /* Create a note marking the start of this region. */
new_region->region_number = ++cfun->eh->last_region_number; new_region->region_number = ++cfun->eh->last_region_number;
note = emit_note (NULL, NOTE_INSN_EH_REGION_BEG); note = emit_note (NOTE_INSN_EH_REGION_BEG);
NOTE_EH_HANDLER (note) = new_region->region_number; NOTE_EH_HANDLER (note) = new_region->region_number;
} }
@ -523,7 +523,7 @@ expand_eh_region_end ()
rtx note; rtx note;
/* Create a note marking the end of this region. */ /* Create a note marking the end of this region. */
note = emit_note (NULL, NOTE_INSN_EH_REGION_END); note = emit_note (NOTE_INSN_EH_REGION_END);
NOTE_EH_HANDLER (note) = cur_region->region_number; NOTE_EH_HANDLER (note) = cur_region->region_number;
/* Pop. */ /* Pop. */
@ -2119,7 +2119,7 @@ sjlj_emit_function_enter (dispatch_label)
plus_constant (XEXP (fc, 0), plus_constant (XEXP (fc, 0),
sjlj_fc_jbuf_ofs), Pmode); sjlj_fc_jbuf_ofs), Pmode);
note = emit_note (NULL, NOTE_INSN_EXPECTED_VALUE); note = emit_note (NOTE_INSN_EXPECTED_VALUE);
NOTE_EXPECTED_VALUE (note) = gen_rtx_EQ (VOIDmode, x, const0_rtx); NOTE_EXPECTED_VALUE (note) = gen_rtx_EQ (VOIDmode, x, const0_rtx);
emit_cmp_and_jump_insns (x, const0_rtx, NE, 0, emit_cmp_and_jump_insns (x, const0_rtx, NE, 0,

6
gcc/explow.c
View File

@ -1588,13 +1588,13 @@ probe_stack_range (first, size)
|| REGNO (test_addr) < FIRST_PSEUDO_REGISTER) || REGNO (test_addr) < FIRST_PSEUDO_REGISTER)
test_addr = force_reg (Pmode, test_addr); test_addr = force_reg (Pmode, test_addr);
emit_note (NULL, NOTE_INSN_LOOP_BEG); emit_note (NOTE_INSN_LOOP_BEG);
emit_jump (test_lab); emit_jump (test_lab);
emit_label (loop_lab); emit_label (loop_lab);
emit_stack_probe (test_addr); emit_stack_probe (test_addr);
emit_note (NULL, NOTE_INSN_LOOP_CONT); emit_note (NOTE_INSN_LOOP_CONT);
#ifdef STACK_GROWS_DOWNWARD #ifdef STACK_GROWS_DOWNWARD
#define CMP_OPCODE GTU #define CMP_OPCODE GTU
@ -1613,7 +1613,7 @@ probe_stack_range (first, size)
emit_cmp_and_jump_insns (test_addr, last_addr, CMP_OPCODE, emit_cmp_and_jump_insns (test_addr, last_addr, CMP_OPCODE,
NULL_RTX, Pmode, 1, loop_lab); NULL_RTX, Pmode, 1, loop_lab);
emit_jump (end_lab); emit_jump (end_lab);
emit_note (NULL, NOTE_INSN_LOOP_END); emit_note (NOTE_INSN_LOOP_END);
emit_label (end_lab); emit_label (end_lab);
emit_stack_probe (last_addr); emit_stack_probe (last_addr);

6
gcc/expr.c
View File

@ -2146,7 +2146,7 @@ emit_block_move_via_loop (x, y, size, align)
y_addr = force_operand (XEXP (y, 0), NULL_RTX); y_addr = force_operand (XEXP (y, 0), NULL_RTX);
do_pending_stack_adjust (); do_pending_stack_adjust ();
emit_note (NULL, NOTE_INSN_LOOP_BEG); emit_note (NOTE_INSN_LOOP_BEG);
emit_jump (cmp_label); emit_jump (cmp_label);
emit_label (top_label); emit_label (top_label);
@ -2164,13 +2164,13 @@ emit_block_move_via_loop (x, y, size, align)
if (tmp != iter) if (tmp != iter)
emit_move_insn (iter, tmp); emit_move_insn (iter, tmp);
emit_note (NULL, NOTE_INSN_LOOP_CONT); emit_note (NOTE_INSN_LOOP_CONT);
emit_label (cmp_label); emit_label (cmp_label);
emit_cmp_and_jump_insns (iter, size, LT, NULL_RTX, iter_mode, emit_cmp_and_jump_insns (iter, size, LT, NULL_RTX, iter_mode,
true, top_label); true, top_label);
emit_note (NULL, NOTE_INSN_LOOP_END); emit_note (NOTE_INSN_LOOP_END);
} }
/* Copy all or part of a value X into registers starting at REGNO. /* Copy all or part of a value X into registers starting at REGNO.

17
gcc/function.c
View File

@ -6549,7 +6549,7 @@ init_function_start (subr)
/* Make sure first insn is a note even if we don't want linenums. /* Make sure first insn is a note even if we don't want linenums.
This makes sure the first insn will never be deleted. This makes sure the first insn will never be deleted.
Also, final expects a note to appear there. */ Also, final expects a note to appear there. */
emit_note (NULL, NOTE_INSN_DELETED); emit_note (NOTE_INSN_DELETED);
/* Set flags used by final.c. */ /* Set flags used by final.c. */
if (aggregate_value_p (DECL_RESULT (subr))) if (aggregate_value_p (DECL_RESULT (subr)))
@ -6791,10 +6791,10 @@ expand_function_start (subr, parms_have_cleanups)
The move is supposed to make sdb output more accurate. */ The move is supposed to make sdb output more accurate. */
/* Indicate the beginning of the function body, /* Indicate the beginning of the function body,
as opposed to parm setup. */ as opposed to parm setup. */
emit_note (NULL, NOTE_INSN_FUNCTION_BEG); emit_note (NOTE_INSN_FUNCTION_BEG);
if (GET_CODE (get_last_insn ()) != NOTE) if (GET_CODE (get_last_insn ()) != NOTE)
emit_note (NULL, NOTE_INSN_DELETED); emit_note (NOTE_INSN_DELETED);
parm_birth_insn = get_last_insn (); parm_birth_insn = get_last_insn ();
context_display = 0; context_display = 0;
@ -6868,7 +6868,7 @@ expand_function_start (subr, parms_have_cleanups)
/* After the display initializations is where the tail-recursion label /* After the display initializations is where the tail-recursion label
should go, if we end up needing one. Ensure we have a NOTE here should go, if we end up needing one. Ensure we have a NOTE here
since some things (like trampolines) get placed before this. */ since some things (like trampolines) get placed before this. */
tail_recursion_reentry = emit_note (NULL, NOTE_INSN_DELETED); tail_recursion_reentry = emit_note (NOTE_INSN_DELETED);
/* Evaluate now the sizes of any types declared among the arguments. */ /* Evaluate now the sizes of any types declared among the arguments. */
expand_pending_sizes (nreverse (get_pending_sizes ())); expand_pending_sizes (nreverse (get_pending_sizes ()));
@ -7080,7 +7080,7 @@ expand_function_end ()
/* Mark the end of the function body. /* Mark the end of the function body.
If control reaches this insn, the function can drop through If control reaches this insn, the function can drop through
without returning a value. */ without returning a value. */
emit_note (NULL, NOTE_INSN_FUNCTION_END); emit_note (NOTE_INSN_FUNCTION_END);
/* Must mark the last line number note in the function, so that the test /* Must mark the last line number note in the function, so that the test
coverage code can avoid counting the last line twice. This just tells coverage code can avoid counting the last line twice. This just tells
@ -7088,10 +7088,11 @@ expand_function_end ()
already exists a copy of this note somewhere above. This line number already exists a copy of this note somewhere above. This line number
note is still needed for debugging though, so we can't delete it. */ note is still needed for debugging though, so we can't delete it. */
if (flag_test_coverage) if (flag_test_coverage)
emit_note (NULL, NOTE_INSN_REPEATED_LINE_NUMBER); emit_note (NOTE_INSN_REPEATED_LINE_NUMBER);
/* Output a linenumber for the end of the function. /* Output a linenumber for the end of the function.
SDB depends on this. */ SDB depends on this. */
emit_line_note_force (input_filename, input_line); emit_line_note_force (input_filename, input_line);
/* Before the return label (if any), clobber the return /* Before the return label (if any), clobber the return
@ -7753,7 +7754,7 @@ thread_prologue_and_epilogue_insns (f)
/* Retain a map of the prologue insns. */ /* Retain a map of the prologue insns. */
record_insns (seq, &prologue); record_insns (seq, &prologue);
prologue_end = emit_note (NULL, NOTE_INSN_PROLOGUE_END); prologue_end = emit_note (NOTE_INSN_PROLOGUE_END);
seq = get_insns (); seq = get_insns ();
end_sequence (); end_sequence ();
@ -7889,7 +7890,7 @@ thread_prologue_and_epilogue_insns (f)
goto epilogue_done; goto epilogue_done;
start_sequence (); start_sequence ();
epilogue_end = emit_note (NULL, NOTE_INSN_EPILOGUE_BEG); epilogue_end = emit_note (NOTE_INSN_EPILOGUE_BEG);
seq = gen_epilogue (); seq = gen_epilogue ();

6
gcc/integrate.c
View File

@ -897,7 +897,7 @@ expand_inline_function (fndecl, parms, target, ignore, type,
insn that can be used as an insertion point. */ insn that can be used as an insertion point. */
map->insns_at_start = get_last_insn (); map->insns_at_start = get_last_insn ();
if (map->insns_at_start == 0) if (map->insns_at_start == 0)
map->insns_at_start = emit_note (NULL, NOTE_INSN_DELETED); map->insns_at_start = emit_note (NOTE_INSN_DELETED);
map->regno_pointer_align = inl_f->emit->regno_pointer_align; map->regno_pointer_align = inl_f->emit->regno_pointer_align;
map->x_regno_reg_rtx = inl_f->emit->x_regno_reg_rtx; map->x_regno_reg_rtx = inl_f->emit->x_regno_reg_rtx;
@ -1304,7 +1304,7 @@ expand_inline_function (fndecl, parms, target, ignore, type,
This line number note is still needed for debugging though, so we can't This line number note is still needed for debugging though, so we can't
delete it. */ delete it. */
if (flag_test_coverage) if (flag_test_coverage)
emit_note (NULL, NOTE_INSN_REPEATED_LINE_NUMBER); emit_note (NOTE_INSN_REPEATED_LINE_NUMBER);
emit_line_note (input_filename, input_line); emit_line_note (input_filename, input_line);
@ -1689,7 +1689,7 @@ copy_insn_list (insns, map, static_chain_value)
&& NOTE_LINE_NUMBER (insn) != NOTE_INSN_FUNCTION_BEG && NOTE_LINE_NUMBER (insn) != NOTE_INSN_FUNCTION_BEG
&& NOTE_LINE_NUMBER (insn) != NOTE_INSN_DELETED) && NOTE_LINE_NUMBER (insn) != NOTE_INSN_DELETED)
{ {
copy = emit_note (NULL, NOTE_LINE_NUMBER (insn)); copy = emit_note (NOTE_LINE_NUMBER (insn));
NOTE_DATA (copy) = NOTE_DATA (insn); NOTE_DATA (copy) = NOTE_DATA (insn);
if ((NOTE_LINE_NUMBER (copy) == NOTE_INSN_BLOCK_BEG if ((NOTE_LINE_NUMBER (copy) == NOTE_INSN_BLOCK_BEG
|| NOTE_LINE_NUMBER (copy) == NOTE_INSN_BLOCK_END) || NOTE_LINE_NUMBER (copy) == NOTE_INSN_BLOCK_END)

2
gcc/reg-stack.c
View File

@ -2671,7 +2671,7 @@ compensate_edge (e, file)
start_sequence (); start_sequence ();
/* ??? change_stack needs some point to emit insns after. */ /* ??? change_stack needs some point to emit insns after. */
after = emit_note (NULL, NOTE_INSN_DELETED); after = emit_note (NOTE_INSN_DELETED);
tmpstack = regstack; tmpstack = regstack;
change_stack (after, &tmpstack, target_stack, EMIT_BEFORE); change_stack (after, &tmpstack, target_stack, EMIT_BEFORE);

2
gcc/reload1.c
View File

@ -669,7 +669,7 @@ reload (first, global)
/* Make sure that the last insn in the chain /* Make sure that the last insn in the chain
is not something that needs reloading. */ is not something that needs reloading. */
emit_note (NULL, NOTE_INSN_DELETED); emit_note (NOTE_INSN_DELETED);
/* Enable find_equiv_reg to distinguish insns made by reload. */ /* Enable find_equiv_reg to distinguish insns made by reload. */
reload_first_uid = get_max_uid (); reload_first_uid = get_max_uid ();

2
gcc/rtl.h
View File

@ -1541,7 +1541,7 @@ extern rtx emit_call_insn PARAMS ((rtx));
extern rtx emit_label PARAMS ((rtx)); extern rtx emit_label PARAMS ((rtx));
extern rtx emit_barrier PARAMS ((void)); extern rtx emit_barrier PARAMS ((void));
extern rtx emit_line_note PARAMS ((const char *, int)); extern rtx emit_line_note PARAMS ((const char *, int));
extern rtx emit_note PARAMS ((const char *, int)); extern rtx emit_note PARAMS ((int));
extern rtx emit_line_note_force PARAMS ((const char *, int)); extern rtx emit_line_note_force PARAMS ((const char *, int));
extern rtx make_insn_raw PARAMS ((rtx)); extern rtx make_insn_raw PARAMS ((rtx));
extern void add_function_usage_to PARAMS ((rtx, rtx)); extern void add_function_usage_to PARAMS ((rtx, rtx));

2
gcc/rtlanal.c
View File

@ -3838,7 +3838,7 @@ hoist_insn_to_edge (insn, e, val, new)
if (e->insns == NULL_RTX) if (e->insns == NULL_RTX)
{ {
start_sequence (); start_sequence ();
emit_note (NULL, NOTE_INSN_DELETED); emit_note (NOTE_INSN_DELETED);
} }
else else
push_to_sequence (e->insns); push_to_sequence (e->insns);

32
gcc/stmt.c
View File

@ -918,11 +918,11 @@ expand_fixup (tree_label, rtl_label, last_insn)
} }
start_sequence (); start_sequence ();
start = emit_note (NULL, NOTE_INSN_BLOCK_BEG); start = emit_note (NOTE_INSN_BLOCK_BEG);
if (cfun->x_whole_function_mode_p) if (cfun->x_whole_function_mode_p)
NOTE_BLOCK (start) = block; NOTE_BLOCK (start) = block;
fixup->before_jump = emit_note (NULL, NOTE_INSN_DELETED); fixup->before_jump = emit_note (NOTE_INSN_DELETED);
end = emit_note (NULL, NOTE_INSN_BLOCK_END); end = emit_note (NOTE_INSN_BLOCK_END);
if (cfun->x_whole_function_mode_p) if (cfun->x_whole_function_mode_p)
NOTE_BLOCK (end) = block; NOTE_BLOCK (end) = block;
fixup->context = block; fixup->context = block;
@ -2562,7 +2562,7 @@ expand_start_loop (exit_flag)
do_pending_stack_adjust (); do_pending_stack_adjust ();
emit_queue (); emit_queue ();
emit_note (NULL, NOTE_INSN_LOOP_BEG); emit_note (NOTE_INSN_LOOP_BEG);
emit_label (thisloop->data.loop.start_label); emit_label (thisloop->data.loop.start_label);
return thisloop; return thisloop;
@ -2594,7 +2594,7 @@ expand_start_null_loop ()
thisloop->next = loop_stack; thisloop->next = loop_stack;
thisloop->all = nesting_stack; thisloop->all = nesting_stack;
thisloop->depth = ++nesting_depth; thisloop->depth = ++nesting_depth;
thisloop->data.loop.start_label = emit_note (NULL, NOTE_INSN_DELETED); thisloop->data.loop.start_label = emit_note (NOTE_INSN_DELETED);
thisloop->data.loop.end_label = gen_label_rtx (); thisloop->data.loop.end_label = gen_label_rtx ();
thisloop->data.loop.continue_label = thisloop->data.loop.end_label; thisloop->data.loop.continue_label = thisloop->data.loop.end_label;
thisloop->exit_label = thisloop->data.loop.end_label; thisloop->exit_label = thisloop->data.loop.end_label;
@ -2613,7 +2613,7 @@ void
expand_loop_continue_here () expand_loop_continue_here ()
{ {
do_pending_stack_adjust (); do_pending_stack_adjust ();
emit_note (NULL, NOTE_INSN_LOOP_CONT); emit_note (NOTE_INSN_LOOP_CONT);
emit_label (loop_stack->data.loop.continue_label); emit_label (loop_stack->data.loop.continue_label);
} }
@ -2765,7 +2765,7 @@ expand_end_loop ()
} }
emit_jump (start_label); emit_jump (start_label);
emit_note (NULL, NOTE_INSN_LOOP_END); emit_note (NOTE_INSN_LOOP_END);
emit_label (loop_stack->data.loop.end_label); emit_label (loop_stack->data.loop.end_label);
POPSTACK (loop_stack); POPSTACK (loop_stack);
@ -2800,7 +2800,7 @@ expand_continue_loop (whichloop)
if (flag_guess_branch_prob) if (flag_guess_branch_prob)
{ {
note = emit_note (NULL, NOTE_INSN_PREDICTION); note = emit_note (NOTE_INSN_PREDICTION);
NOTE_PREDICTION (note) = NOTE_PREDICT (PRED_CONTINUE, IS_TAKEN); NOTE_PREDICTION (note) = NOTE_PREDICT (PRED_CONTINUE, IS_TAKEN);
} }
clear_last_expr (); clear_last_expr ();
@ -2883,7 +2883,7 @@ expand_exit_loop_top_cond (whichloop, cond)
if (! expand_exit_loop_if_false (whichloop, cond)) if (! expand_exit_loop_if_false (whichloop, cond))
return 0; return 0;
emit_note (NULL, NOTE_INSN_LOOP_END_TOP_COND); emit_note (NOTE_INSN_LOOP_END_TOP_COND);
return 1; return 1;
} }
@ -3000,7 +3000,7 @@ expand_value_return (val)
/* Emit information for branch prediction. */ /* Emit information for branch prediction. */
rtx note; rtx note;
note = emit_note (NULL, NOTE_INSN_PREDICTION); note = emit_note (NOTE_INSN_PREDICTION);
NOTE_PREDICTION (note) = NOTE_PREDICT (pred, NOT_TAKEN); NOTE_PREDICTION (note) = NOTE_PREDICT (pred, NOT_TAKEN);
@ -3420,11 +3420,11 @@ expand_start_bindings_and_block (flags, block)
/* Create a note to mark the beginning of the block. */ /* Create a note to mark the beginning of the block. */
if (block_flag) if (block_flag)
{ {
note = emit_note (NULL, NOTE_INSN_BLOCK_BEG); note = emit_note (NOTE_INSN_BLOCK_BEG);
NOTE_BLOCK (note) = block; NOTE_BLOCK (note) = block;
} }
else else
note = emit_note (NULL, NOTE_INSN_DELETED); note = emit_note (NOTE_INSN_DELETED);
/* Make an entry on block_stack for the block we are entering. */ /* Make an entry on block_stack for the block we are entering. */
@ -3445,7 +3445,7 @@ expand_start_bindings_and_block (flags, block)
fix this is to just insert another instruction here, so that the fix this is to just insert another instruction here, so that the
instructions inserted after the last unconditional cleanup are instructions inserted after the last unconditional cleanup are
never the last instruction. */ never the last instruction. */
emit_note (NULL, NOTE_INSN_DELETED); emit_note (NOTE_INSN_DELETED);
if (block_stack if (block_stack
&& !(block_stack->data.block.cleanups == NULL_TREE && !(block_stack->data.block.cleanups == NULL_TREE
@ -3847,7 +3847,7 @@ expand_end_bindings (vars, mark_ends, dont_jump_in)
if (mark_ends) if (mark_ends)
{ {
rtx note = emit_note (NULL, NOTE_INSN_BLOCK_END); rtx note = emit_note (NOTE_INSN_BLOCK_END);
NOTE_BLOCK (note) = NOTE_BLOCK (thisblock->data.block.first_insn); NOTE_BLOCK (note) = NOTE_BLOCK (thisblock->data.block.first_insn);
} }
else else
@ -4189,7 +4189,7 @@ expand_decl_cleanup (decl, cleanup)
fix this is to just insert another instruction here, so that the fix this is to just insert another instruction here, so that the
instructions inserted after the last unconditional cleanup are instructions inserted after the last unconditional cleanup are
never the last instruction. */ never the last instruction. */
emit_note (NULL, NOTE_INSN_DELETED); emit_note (NOTE_INSN_DELETED);
} }
} }
return 1; return 1;
@ -4446,7 +4446,7 @@ expand_start_case (exit_flag, expr, type, printname)
/* Make sure case_stmt.start points to something that won't /* Make sure case_stmt.start points to something that won't
need any transformation before expand_end_case. */ need any transformation before expand_end_case. */
if (GET_CODE (get_last_insn ()) != NOTE) if (GET_CODE (get_last_insn ()) != NOTE)
emit_note (NULL, NOTE_INSN_DELETED); emit_note (NOTE_INSN_DELETED);
thiscase->data.case_stmt.start = get_last_insn (); thiscase->data.case_stmt.start = get_last_insn ();

4
gcc/unroll.c
View File

@ -2274,7 +2274,7 @@ copy_loop_body (loop, copy_start, copy_end, map, exit_label, last_iteration,
|| (last_iteration || (last_iteration
&& unroll_type != UNROLL_COMPLETELY))) && unroll_type != UNROLL_COMPLETELY)))
{ {
copy = emit_note (NULL, NOTE_LINE_NUMBER (insn)); copy = emit_note (NOTE_LINE_NUMBER (insn));
NOTE_DATA (copy) = NOTE_DATA (insn); NOTE_DATA (copy) = NOTE_DATA (insn);
} }
else else
@ -2330,7 +2330,7 @@ copy_loop_body (loop, copy_start, copy_end, map, exit_label, last_iteration,
&& NOTE_LINE_NUMBER (insn) != NOTE_INSN_LOOP_VTOP && NOTE_LINE_NUMBER (insn) != NOTE_INSN_LOOP_VTOP
&& NOTE_LINE_NUMBER (insn) != NOTE_INSN_LOOP_CONT) && NOTE_LINE_NUMBER (insn) != NOTE_INSN_LOOP_CONT)
{ {
rtx copy = emit_note (NULL, NOTE_LINE_NUMBER (insn)); rtx copy = emit_note (NOTE_LINE_NUMBER (insn));
NOTE_DATA (copy) = NOTE_DATA (insn); NOTE_DATA (copy) = NOTE_DATA (insn);
} }
} }