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

rtl.h (REG_NON_LOCAL_GOTO): New. 

* rtl.h (REG_NON_LOCAL_GOTO): New.
        * rtl.c (reg_note_name): Update.
        * stmt.c (expand_goto): Emit a REG_NON_LOCAL_GOTO note.
        * builtins.c (expand_builtin_longjmp): Likewise.
        * flow.c (make_edges): Check for REG_NON_LOCAL_GOTO and do
        not emit an edge.

From-SVN: r38408
This commit is contained in:
Richard Henderson 2000-12-20 17:11:31 -08:00 committed by Richard Henderson
parent 1e248ee387
commit 4b01bd1658
6 changed files with 49 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/ChangeLog
View File

@ -1,3 +1,12 @@
2000-12-20 Richard Henderson <rth@redhat.com>
* rtl.h (REG_NON_LOCAL_GOTO): New.
* rtl.c (reg_note_name): Update.
* stmt.c (expand_goto): Emit a REG_NON_LOCAL_GOTO note.
* builtins.c (expand_builtin_longjmp): Likewise.
* flow.c (make_edges): Check for REG_NON_LOCAL_GOTO and do
not emit an edge.
2000-12-20 Marek Michalkiewicz <marekm@linux.org.pl>
* config/avr/avr.c (out_movsi_r_mr, out_movsi_mr_r, out_movhi_mr_r):

14
gcc/builtins.c
View File

@ -649,7 +649,7 @@ void
expand_builtin_longjmp (buf_addr, value)
rtx buf_addr, value;
{
rtx fp, lab, stack;
rtx fp, lab, stack, insn;
enum machine_mode sa_mode = STACK_SAVEAREA_MODE (SAVE_NONLOCAL);
if (setjmp_alias_set == -1)
@ -706,6 +706,18 @@ expand_builtin_longjmp (buf_addr, value)
emit_indirect_jump (lab);
}
}
/* Search backwards and mark the jump insn as a non-local goto.
Note that this precludes the use of __builtin_longjmp to a
__builtin_setjmp target in the same function. However, we've
already cautioned the user that these functions are for
internal exception handling use only. */
for (insn = get_last_insn ();
GET_CODE (insn) != JUMP_INSN;
insn = PREV_INSN (insn))
continue;
REG_NOTES (insn) = alloc_EXPR_LIST (REG_NON_LOCAL_GOTO, const0_rtx,
REG_NOTES (insn));
}
/* Get a MEM rtx for expression EXP which is the address of an operand

15
gcc/flow.c
View File

@ -1094,12 +1094,17 @@ make_edges (label_value_list)
{
rtx tmp;
/* Recognize a non-local goto as a branch outside the
current function. */
if (find_reg_note (insn, REG_NON_LOCAL_GOTO, NULL_RTX))
;
/* ??? Recognize a tablejump and do the right thing. */
if ((tmp = JUMP_LABEL (insn)) != NULL_RTX
&& (tmp = NEXT_INSN (tmp)) != NULL_RTX
&& GET_CODE (tmp) == JUMP_INSN
&& (GET_CODE (PATTERN (tmp)) == ADDR_VEC
|| GET_CODE (PATTERN (tmp)) == ADDR_DIFF_VEC))
else if ((tmp = JUMP_LABEL (insn)) != NULL_RTX
&& (tmp = NEXT_INSN (tmp)) != NULL_RTX
&& GET_CODE (tmp) == JUMP_INSN
&& (GET_CODE (PATTERN (tmp)) == ADDR_VEC
|| GET_CODE (PATTERN (tmp)) == ADDR_DIFF_VEC))
{
rtvec vec;
int j;

3
gcc/rtl.c
View File

@ -288,7 +288,8 @@ const char * const reg_note_name[] =
"REG_LABEL", "REG_DEP_ANTI", "REG_DEP_OUTPUT", "REG_BR_PROB",
"REG_EXEC_COUNT", "REG_NOALIAS", "REG_SAVE_AREA", "REG_BR_PRED",
"REG_FRAME_RELATED_EXPR", "REG_EH_CONTEXT", "REG_EH_REGION",
"REG_EH_RETHROW", "REG_SAVE_NOTE", "REG_MAYBE_DEAD", "REG_NORETURN"
"REG_EH_RETHROW", "REG_SAVE_NOTE", "REG_MAYBE_DEAD", "REG_NORETURN",
"REG_NON_LOCAL_GOTO"
};
static htab_t md_constants;

6
gcc/rtl.h
View File

@ -549,7 +549,11 @@ enum reg_note
REG_MAYBE_DEAD,
/* Indicates that a call does not return. */
REG_NORETURN
REG_NORETURN,
/* Indicates that an indirect jump is a non-local goto instead of a
computed goto. */
REG_NON_LOCAL_GOTO
};
/* The base value for branch probability notes. */

11
gcc/stmt.c
View File

@ -783,7 +783,7 @@ expand_goto (label)
{
struct function *p = find_function_data (context);
rtx label_ref = gen_rtx_LABEL_REF (Pmode, label_rtx (label));
rtx handler_slot, static_chain, save_area;
rtx handler_slot, static_chain, save_area, insn;
tree link;
/* Find the corresponding handler slot for this label. */
@ -836,6 +836,15 @@ expand_goto (label)
emit_insn (gen_rtx_USE (VOIDmode, stack_pointer_rtx));
emit_indirect_jump (handler_slot);
}
/* Search backwards to the jump insn and mark it as a
non-local goto. */
for (insn = get_last_insn ();
GET_CODE (insn) != JUMP_INSN;
insn = PREV_INSN (insn))
continue;
REG_NOTES (insn) = alloc_EXPR_LIST (REG_NON_LOCAL_GOTO, const0_rtx,
REG_NOTES (insn));
}
else
expand_goto_internal (label, label_rtx (label), NULL_RTX);