Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision 34cb6c8d2f3e38a59a0232921b3ef17208862064) +++ uspace/lib/c/Makefile (revision a070eff0c14323221d796a553c09aa4ecb4db008) @@ -143,4 +143,5 @@ generic/net/socket_client.c \ generic/net/socket_parse.c \ + generic/setjmp.c \ generic/stack.c \ generic/stacktrace.c \ Index: uspace/lib/c/arch/ia32/Makefile.inc =================================================================== --- uspace/lib/c/arch/ia32/Makefile.inc (revision 34cb6c8d2f3e38a59a0232921b3ef17208862064) +++ uspace/lib/c/arch/ia32/Makefile.inc (revision a070eff0c14323221d796a553c09aa4ecb4db008) @@ -34,5 +34,4 @@ arch/$(UARCH)/src/fibril.S \ arch/$(UARCH)/src/tls.c \ - arch/$(UARCH)/src/setjmp.S \ arch/$(UARCH)/src/stacktrace.c \ arch/$(UARCH)/src/stacktrace_asm.S \ Index: uspace/lib/c/arch/ia32/src/setjmp.S =================================================================== --- uspace/lib/c/arch/ia32/src/setjmp.S (revision 34cb6c8d2f3e38a59a0232921b3ef17208862064) +++ (revision ) @@ -1,55 +1,0 @@ -# -# Copyright (c) 2008 Josef Cejka -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -#include - -.text -.global setjmp -.global longjmp - -.type setjmp,@function -setjmp: - movl 0(%esp), %eax # save pc value into eax - movl 4(%esp), %edx # address of the jmp_buf structure to save context to - - # save registers to the jmp_buf structure - CONTEXT_SAVE_ARCH_CORE %edx %eax - - xorl %eax, %eax # set_jmp returns 0 - ret - -.type longjmp,@function -longjmp: - movl 4(%esp), %ecx # put address of jmp_buf into ecx - movl 8(%esp), %eax # put return value into eax - - # restore registers from the jmp_buf structure - CONTEXT_RESTORE_ARCH_CORE %ecx %edx - - movl %edx, 0(%esp) # put saved pc on stack - ret Index: uspace/lib/c/generic/setjmp.c =================================================================== --- uspace/lib/c/generic/setjmp.c (revision a070eff0c14323221d796a553c09aa4ecb4db008) +++ uspace/lib/c/generic/setjmp.c (revision a070eff0c14323221d796a553c09aa4ecb4db008) @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2013 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file Long jump implementation. + * + * Implementation inspired by Jiri Zarevucky's code from + * http://bazaar.launchpad.net/~zarevucky-jiri/helenos/stdc/revision/1544/uspace/lib/posix/setjmp.h + */ + +#include +#include +#include + +struct jmp_buf_interal { + context_t context; + int return_value; +}; + +/** + * Save current environment (registers). + * + * This function may return twice. + * + * @param env Variable where to save the environment. + * @return Whether the call returned after longjmp. + * @retval 0 Environment was saved, normal execution. + * @retval other longjmp was executed and returned here. + */ +int setjmp(jmp_buf env) { + env->return_value = 0; + context_save(&env[0].context); + return env->return_value; +} + +/** + * Restore environment previously stored by setjmp. + * + * This function never returns. + * + * @param env Variable with the environment previously stored by call + * to setjmp. + * @param val Value to fake when returning from setjmp (0 is transformed to 1). + */ +void longjmp(jmp_buf env, int val) { + env[0].return_value = (val == 0) ? 1 : val; + context_restore(&env[0].context); + __builtin_unreachable(); +} + +/** @} + */ Index: uspace/lib/c/include/setjmp.h =================================================================== --- uspace/lib/c/include/setjmp.h (revision 34cb6c8d2f3e38a59a0232921b3ef17208862064) +++ uspace/lib/c/include/setjmp.h (revision a070eff0c14323221d796a553c09aa4ecb4db008) @@ -1,4 +1,5 @@ /* * Copyright (c) 2008 Josef Cejka + * Copyright (c) 2013 Vojtech Horky * All rights reserved. * @@ -36,7 +37,10 @@ #define LIBC_SETJMP_H_ -#include - -typedef context_t jmp_buf[1]; +/* + * We hide the structure to allow smooth inclusion from libposix + * as no other types are necessary (and thus no includes are needed). + */ +struct jmp_buf_interal; +typedef struct jmp_buf_interal *jmp_buf; extern int setjmp(jmp_buf env);