Minor *jmp() cleanups.

This commit is contained in:
Jason Evans 2000-01-20 21:53:59 +00:00
parent 5fa5aeec53
commit beab1ec9b5
4 changed files with 14 additions and 17 deletions

View File

@ -1245,8 +1245,9 @@ int _thread_sys_msync(void *, size_t, int);
/* #include <setjmp.h> */
#ifdef _SETJMP_H_
extern void __longjmp(jmp_buf, int);
extern void __siglongjmp(sigjmp_buf, int);
extern void __siglongjmp(sigjmp_buf, int) __dead2;
extern void __longjmp(jmp_buf, int) __dead2;
extern void ___longjmp(jmp_buf, int) __dead2;
#endif
__END_DECLS

View File

@ -54,7 +54,7 @@
#endif
void
_libc_siglongjmp(sigjmp_buf env, int savemask)
siglongjmp(sigjmp_buf env, int savemask)
{
void *jmp_stackp;
void *stack_begin, *stack_end;
@ -81,7 +81,7 @@ _libc_siglongjmp(sigjmp_buf env, int savemask)
*/
if (((jmp_stackp < stack_begin) && (jmp_stackp < stack_end)) ||
((jmp_stackp > stack_begin) && (jmp_stackp > stack_end)))
PANIC("longjmp()ing between thread contexts is undefined by "
PANIC("siglongjmp()ing between thread contexts is undefined by "
"POSIX 1003.1");
memcpy(_thread_run->nested_jmp.sigjmp, env,
@ -99,10 +99,8 @@ _libc_siglongjmp(sigjmp_buf env, int savemask)
___longjmp(*_thread_run->sighandler_jmp_buf, 1);
}
__weak_reference(_libc_siglongjmp, siglongjmp);
void
_libc_longjmp(jmp_buf env, int val)
longjmp(jmp_buf env, int val)
{
void *jmp_stackp;
void *stack_begin, *stack_end;
@ -147,10 +145,8 @@ _libc_longjmp(jmp_buf env, int val)
___longjmp(*_thread_run->sighandler_jmp_buf, 1);
}
__weak_reference(_libc_longjmp, longjmp);
void
_libc__longjmp(jmp_buf env, int val)
_longjmp(jmp_buf env, int val)
{
void *jmp_stackp;
void *stack_begin, *stack_end;
@ -177,7 +173,7 @@ _libc__longjmp(jmp_buf env, int val)
*/
if (((jmp_stackp < stack_begin) && (jmp_stackp < stack_end)) ||
((jmp_stackp > stack_begin) && (jmp_stackp > stack_end)))
PANIC("longjmp()ing between thread contexts is undefined by "
PANIC("_longjmp()ing between thread contexts is undefined by "
"POSIX 1003.1");
memcpy(_thread_run->nested_jmp.jmp, env,
@ -194,6 +190,4 @@ _libc__longjmp(jmp_buf env, int val)
_thread_run->longjmp_val = val;
___longjmp(*_thread_run->sighandler_jmp_buf, 1);
}
__weak_reference(_libc__longjmp, _longjmp);
#endif

View File

@ -1245,8 +1245,9 @@ int _thread_sys_msync(void *, size_t, int);
/* #include <setjmp.h> */
#ifdef _SETJMP_H_
extern void __longjmp(jmp_buf, int);
extern void __siglongjmp(sigjmp_buf, int);
extern void __siglongjmp(sigjmp_buf, int) __dead2;
extern void __longjmp(jmp_buf, int) __dead2;
extern void ___longjmp(jmp_buf, int) __dead2;
#endif
__END_DECLS

View File

@ -1245,8 +1245,9 @@ int _thread_sys_msync(void *, size_t, int);
/* #include <setjmp.h> */
#ifdef _SETJMP_H_
extern void __longjmp(jmp_buf, int);
extern void __siglongjmp(sigjmp_buf, int);
extern void __siglongjmp(sigjmp_buf, int) __dead2;
extern void __longjmp(jmp_buf, int) __dead2;
extern void ___longjmp(jmp_buf, int) __dead2;
#endif
__END_DECLS