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

rtl.h (LCT_RETURNS_TWICE): New. 

* rtl.h (LCT_RETURNS_TWICE): New.
        * calls.c (emit_call_1): Set current_function_calls_setjmp for
        ECF_RETURNS_TWICE.
        (emit_library_call_value_1): Map LCT_RETURNS_TWICE
        to ECF_RETURNS_TWICE.
        * except.c (sjlj_emit_function_enter): Use LCT_RETURNS_TWICE for
        call to setjmp.

        * unwind-sjlj.c: Invent the setjmp.h declarations if inhibit_libc.

        * config/stormy16/stormy16.h (DONT_USE_BUILTIN_SETJMP): New.
        (JMP_BUF_SIZE): New.

From-SVN: r45736
This commit is contained in:
Richard Henderson 2001-09-21 13:26:44 -07:00 committed by Richard Henderson
parent 1853547e03
commit 9defc9b7ac
6 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gcc/ChangeLog
View File

@ -1,3 +1,18 @@
2001-09-21 Richard Henderson <rth@redhat.com>
* rtl.h (LCT_RETURNS_TWICE): New.
* calls.c (emit_call_1): Set current_function_calls_setjmp for
ECF_RETURNS_TWICE.
(emit_library_call_value_1): Map LCT_RETURNS_TWICE
to ECF_RETURNS_TWICE.
* except.c (sjlj_emit_function_enter): Use LCT_RETURNS_TWICE for
call to setjmp.
* unwind-sjlj.c: Invent the setjmp.h declarations if inhibit_libc.
* config/stormy16/stormy16.h (DONT_USE_BUILTIN_SETJMP): New.
(JMP_BUF_SIZE): New.
2001-09-21 Richard Henderson <rth@redhat.com>
* config/stormy16/stormy16.h (REG_CLASS_FROM_LETTER): Map 'd'

10
gcc/calls.c
View File

@ -613,8 +613,11 @@ emit_call_1 (funexp, fndecl, funtype, stack_size, rounded_stack_size,
REG_NOTES (call_insn));
if (ecf_flags & ECF_RETURNS_TWICE)
REG_NOTES (call_insn) = gen_rtx_EXPR_LIST (REG_SETJMP, const0_rtx,
REG_NOTES (call_insn));
{
REG_NOTES (call_insn) = gen_rtx_EXPR_LIST (REG_SETJMP, const0_rtx,
REG_NOTES (call_insn));
current_function_calls_setjmp = 1;
}
SIBLING_CALL_P (call_insn) = ((ecf_flags & ECF_SIBCALL) != 0);
@ -3531,6 +3534,9 @@ emit_library_call_value_1 (retval, orgfun, value, fn_type, outmode, nargs, p)
case LCT_ALWAYS_RETURN:
flags = ECF_ALWAYS_RETURN;
break;
case LCT_RETURNS_TWICE:
flags = ECF_RETURNS_TWICE;
break;
}
fun = orgfun;

4
gcc/config/stormy16/stormy16.h
View File

@ -4537,6 +4537,10 @@ do { \
instead of inline unwinders and __unwind_function in the non-setjmp case. */
#define DWARF2_UNWIND_INFO 0
/* Don't use __builtin_setjmp for unwinding, since it's tricky to get
at the high 16 bits of an address. */
#define DONT_USE_BUILTIN_SETJMP
#define JMP_BUF_SIZE 8
/* Assembler Commands for Alignment. */

2
gcc/except.c
View File

@ -2144,7 +2144,7 @@ sjlj_emit_function_enter (dispatch_label)
#ifdef DONT_USE_BUILTIN_SETJMP
{
rtx x, note;
x = emit_library_call_value (setjmp_libfunc, NULL_RTX, LCT_NORMAL,
x = emit_library_call_value (setjmp_libfunc, NULL_RTX, LCT_RETURNS_TWICE,
TYPE_MODE (integer_type_node), 1,
plus_constant (XEXP (fc, 0),
sjlj_fc_jbuf_ofs), Pmode);

3
gcc/rtl.h
View File

@ -1952,7 +1952,8 @@ enum libcall_type
LCT_PURE_MAKE_BLOCK = 4,
LCT_NORETURN = 5,
LCT_THROW = 6,
LCT_ALWAYS_RETURN = 7
LCT_ALWAYS_RETURN = 7,
LCT_RETURNS_TWICE = 8
};
extern void emit_library_call PARAMS ((rtx, enum libcall_type,

5
gcc/unwind-sjlj.c
View File

@ -26,8 +26,13 @@
#if USING_SJLJ_EXCEPTIONS
#ifdef DONT_USE_BUILTIN_SETJMP
#ifndef inhibit_libc
#include <setjmp.h>
#else
typedef void *jmp_buf[JMP_BUF_SIZE];
extern void longjmp(jmp_buf, int) __attribute__((noreturn));
#endif
#else
#define setjmp __builtin_setjmp
#define longjmp __builtin_longjmp
#endif