Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull over rev. 1.5 of the i386 version (../../i386/resumecontext.S),

Browse Source 
quoting Matthias Drochner:

> -check for a NULL uc_link before calling setcontext(2); do a real exit(3)
>  instead with exit handlers and all that
> -If setcontext(2) returns (which it shouldn't), do an _exit(-1) rather
>  than relying on a sensible return value to use as exit code. Makes
>  it less likely that an ucontext corruption goes unnoticed.

This fixes regress/lib/libc/context for m68k.

Thanks to Steve Woodford for optimization hints.
This commit is contained in:
martin 2006-12-13 10:48:02 +00:00
parent e53d6bd175
commit 2ed5a47025
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/libc/arch/m68k/gen/resumecontext.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: resumecontext.S,v 1.3 2003/01/26 17:58:55 kleink Exp $ */
/* $NetBSD: resumecontext.S,v 1.4 2006/12/13 10:48:02 martin Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -39,7 +39,7 @@
#include <machine/asm.h>
#if defined(LIBC_SCCS) && !defined(lint)
RCSID("$NetBSD: resumecontext.S,v 1.3 2003/01/26 17:58:55 kleink Exp $")
RCSID("$NetBSD: resumecontext.S,v 1.4 2006/12/13 10:48:02 martin Exp $")
#endif /* LIBC_SCCS && !lint */
/*
@ -53,6 +53,14 @@ ENTRY(_resumecontext)
lea %sp@,%a0
movl %a0,%sp@-
jbsr PIC_PLT(_C_LABEL(_getcontext))
movl %sp@(4 + 4),%sp@
jbsr PIC_PLT(_C_LABEL(setcontext))
movl %sp@(4 + 4),%sp@ /* uc_link */
tstl %sp@ /* check for NULL */
jne 1f
jbsr PIC_PLT(_C_LABEL(exit)) /* cleanly exit(0) */
jmp 2f
1: jbsr PIC_PLT(_C_LABEL(setcontext))
/* NOTREACHED */
/* But just in case... */
2: movl #-1,%sp@
jbsr PIC_PLT(_C_LABEL(_exit))
/* NOTREACHED */