Changeset 615e83d in mainline for uspace/lib/c/include

Timestamp:

2018-03-08T18:25:31Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

55f068c

Parents:

e0a4686

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-08 17:43:06)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-08 18:25:31)

Message:

Turn context_save/context_restore into standard setjmp/longjmp.

Location:

uspace/lib/c/include

Files:

• context.h (modified) (1 diff)
• setjmp.h (modified) (2 diffs)

uspace/lib/c/include/context.h

@@ -46 +46 @@
 extern uintptr_t context_get_pc(context_t *ctx);
 
-// TODO: These should go away.
-
-extern int context_save(context_t *ctx) __attribute__((returns_twice));
-extern void context_restore(context_t *ctx) __attribute__((noreturn));
-
 #endif
 

uspace/lib/c/include/setjmp.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2008 Josef Cejka
- * Copyright (c) 2013 Vojtech Horky
+ * Copyright (c) 2018 CZ.NIC, z.s.p.o.
  * All rights reserved.
  *
@@ -31 +30 @@
  * @{
  */
-/** @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
- */
 
 #ifndef LIBC_SETJMP_H_
 #define LIBC_SETJMP_H_
 
-#include <libarch/fibril.h>
+#include <libarch/fibril_context.h>
 
-struct jmp_buf_interal {
-        context_t context;
-        int return_value;
-};
-typedef struct jmp_buf_interal jmp_buf[1];
+typedef context_t jmp_buf[1];
 
-/*
- * Specified as extern to minimize number of included headers
- * because this file is used as is in libposix too.
- */
-extern int context_save(context_t *ctx) __attribute__((returns_twice));
-
-/**
- * Save current environment (registers).
- *
- * This function may return twice.
- *
- * @param env Variable where to save the environment (of type jmp_buf).
- * @return Whether the call returned after longjmp.
- * @retval 0 Environment was saved, normal execution.
- * @retval other longjmp was executed and returned here.
- */
-#define setjmp(env) \
-        ((env)[0].return_value = 0, \
-        context_save(&(env)[0].context), \
-        (env)[0].return_value)
-
-extern void longjmp(jmp_buf env, int val) __attribute__((noreturn));
+extern int setjmp(jmp_buf) __attribute__((returns_twice));
+extern void longjmp(jmp_buf, int) __attribute__((noreturn));
+extern void __longjmp(jmp_buf, int) __attribute__((noreturn));
 
 #endif