git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* dwarf2cfi.c (scan_trace): Handle annulled branch-taken delay slots. 

From-SVN: r188391
This commit is contained in:
Richard Henderson 2012-06-11 11:04:25 -07:00 committed by Richard Henderson
parent f35aed4938
commit bf27c43e07
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/ChangeLog
View File

@ -1,3 +1,7 @@
2012-06-11 Richard Henderson <rth@redhat.com>
* dwarf2cfi.c (scan_trace): Handle annulled branch-taken delay slots.
2012-06-11 Olivier Hainque <hainque@adacore.com> 2012-06-11 Olivier Hainque <hainque@adacore.com>
* Makefile.in (GNATLIBCFLAGS_FOR_C): Remove $(PIC_FLAG_FOR_TARGET). * Makefile.in (GNATLIBCFLAGS_FOR_C): Remove $(PIC_FLAG_FOR_TARGET).

24
gcc/dwarf2cfi.c
View File

@ -2429,18 +2429,20 @@ scan_trace (dw_trace_info *trace)
elt = XVECEXP (pat, 0, 1); elt = XVECEXP (pat, 0, 1);
/* If ELT is an instruction from target of an annulled branch,
the effects are for the target only and so the args_size
and CFA along the current path shouldn't change. */
if (INSN_FROM_TARGET_P (elt)) if (INSN_FROM_TARGET_P (elt))
{ {
HOST_WIDE_INT restore_args_size; HOST_WIDE_INT restore_args_size;
cfi_vec save_row_reg_save; cfi_vec save_row_reg_save;
/* If ELT is an instruction from target of an annulled
branch, the effects are for the target only and so
the args_size and CFA along the current path
shouldn't change. */
add_cfi_insn = NULL; add_cfi_insn = NULL;
restore_args_size = cur_trace->end_true_args_size; restore_args_size = cur_trace->end_true_args_size;
cur_cfa = &cur_row->cfa; cur_cfa = &cur_row->cfa;
save_row_reg_save = VEC_copy (dw_cfi_ref, gc, cur_row->reg_save); save_row_reg_save
= VEC_copy (dw_cfi_ref, gc, cur_row->reg_save);
scan_insn_after (elt); scan_insn_after (elt);
@ -2453,8 +2455,20 @@ scan_trace (dw_trace_info *trace)
cur_row->cfa = this_cfa; cur_row->cfa = this_cfa;
cur_row->reg_save = save_row_reg_save; cur_row->reg_save = save_row_reg_save;
cur_cfa = &this_cfa; cur_cfa = &this_cfa;
continue;
} }
else
{
/* If ELT is a annulled branch-taken instruction (i.e.
executed only when branch is not taken), the args_size
and CFA should not change through the jump. */
create_trace_edges (control);
/* Update and continue with the trace. */
add_cfi_insn = insn;
scan_insn_after (elt);
def_cfa_1 (&this_cfa);
}
continue;
} }
/* The insns in the delay slot should all be considered to happen /* The insns in the delay slot should all be considered to happen