Changeset 3558ba93 in mainline for uspace/lib/c

Timestamp:

2013-12-09T15:55:40Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

5b89d43b

Parents:

12735849 (diff), 9521eca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge GCC port updates

This commit includes various small changes needed to compile GCC or
dependent libraries on more architectures than ia32.

A lot of ARM EABI functions (softfloat) were added, mostly as aliases
to already existing ones.

A generic implementation of long jump was added, based on context save
and restore functions.

Examples in src/c/ were updated to be compilable again and new scripts
for compiling with GCC were added.

New uspace/overlay directory was added that is verbatim copied into the
final image. Cleaning its content is left to the user.

A small `untar' utility was implemented for unpacking tarballs (it does
not support the standard switches nor a compressed content).

Merged branch: lp:~vojtech-horky/helenos/gcc-port

Location:

uspace/lib/c

Files:

• Makefile (modified) (2 diffs)
• arch/amd64/_link.ld.in (modified) (1 diff)
• arch/ia32/Makefile.inc (modified) (1 diff)
• generic/setjmp.c (added)
• include/bitops.h (modified) (1 diff)
• include/setjmp.h (modified) (3 diffs)

uspace/lib/c/Makefile

@@ -61 +61 @@
         generic/bd.c \
         generic/bd_srv.c \
-        generic/bitops.c \
         generic/cap.c \
         generic/cfg.c \
@@ -143 +142 @@
         generic/net/socket_client.c \
         generic/net/socket_parse.c \
+        generic/setjmp.c \
         generic/stack.c \
         generic/stacktrace.c \

uspace/lib/c/arch/amd64/_link.ld.in

@@ -39 +39 @@
         .data : {
                 *(.data);
+                *(.data.rel*);
         } :data
         

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/bitops.h

@@ -107 +107 @@
 }
 
-extern int __popcountsi2(int);
-
 #endif
 

uspace/lib/c/include/setjmp.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2008 Josef Cejka
+ * Copyright (c) 2013 Vojtech Horky
  * All rights reserved.
  *
@@ -30 +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
  */
 
@@ -38 +42 @@
 #include <libarch/fibril.h>
 
-typedef context_t jmp_buf[1];
+struct jmp_buf_interal {
+        context_t context;
+        int return_value;
+};
+typedef struct jmp_buf_interal jmp_buf[1];
 
-extern int setjmp(jmp_buf env);
+/*
+ * 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));