Changeset a070eff in mainline

Timestamp:

2013-11-12T13:38:22Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4a3892b

Parents:

9ed3e1a

Message:

setjmp for all architectures (thx Jiri Zarevucky)

Generic solution instead of architecture-specific assembler.

Location:

uspace/lib/c

Files:

• Makefile (modified) (1 diff)
• arch/ia32/Makefile.inc (modified) (1 diff)
• arch/ia32/src/setjmp.S (deleted)
• generic/setjmp.c (added)
• include/setjmp.h (modified) (2 diffs)

uspace/lib/c/Makefile

@@ -143 +143 @@
         generic/net/socket_client.c \
         generic/net/socket_parse.c \
+        generic/setjmp.c \
         generic/stack.c \
         generic/stacktrace.c \

uspace/lib/c/arch/ia32/Makefile.inc

@@ -34 +34 @@
         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 \

uspace/lib/c/include/setjmp.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2008 Josef Cejka
+ * Copyright (c) 2013 Vojtech Horky
  * All rights reserved.
  *
@@ -36 +37 @@
 #define LIBC_SETJMP_H_
 
-#include <libarch/fibril.h>
-
-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);