Changeset 91e22dc in mainline

Timestamp:

2013-11-15T08:39:36Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6a5b999

Parents:

8797bae

Message:

setjmp() shall be a macro according to C standard

As a matter of fact, when it is a function, the context that was
saved may no longer exist. Excerpt from IRC follows:

vhotspur: jermar, hi: what makes you think setjmp needs to be macro
vhotspur: hmmmm, C99 states that setjmp is macro and longjmp is function,

POSIX states that setjmp can be either macro or function

jermar: from what we have learned about context_save over the years
jermar: you basically capture the stack pointer in context_save()
jermar: if it is a function, you immediately deallocate part of that stack
jermar: so later to return to something which has once been a stack,

but is not anymore

jermar: for instance, you could expect to find the return address from

the call to setjmp() on it, but that could have been overwritten
by some further use of the stack

Also fixed bad definition of buffer type.

Location:

uspace/lib/c

Files:

• generic/setjmp.c (modified) (1 diff)
• include/setjmp.h (modified) (2 diffs)

uspace/lib/c/generic/setjmp.c

@@ -40 +40 @@
 #include <fibril.h>
 
-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.

uspace/lib/c/include/setjmp.h

@@ -31 +31 @@
  * @{
  */
-/** @file
+/** @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
  */
 
@@ -37 +40 @@
 #define LIBC_SETJMP_H_
 
+#include <libarch/fibril.h>
+
+struct jmp_buf_interal {
+        context_t context;
+        int return_value;
+};
+typedef struct jmp_buf_interal 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).
+ * Specified as extern to minimize number of included headers
+ * because this file is used as is in libposix too.
  */
-struct jmp_buf_interal;
-typedef struct jmp_buf_interal *jmp_buf;
+extern int context_save(context_t *ctx) __attribute__((returns_twice));
 
-extern int setjmp(jmp_buf env);
+/**
+ * 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));