Changes in / [010be476:7da90cd] in mainline

Location:

uspace

Files:

• lib/block/libblock.c (modified) (1 diff)
• lib/c/Makefile (modified) (1 diff)
• lib/c/arch/ia32/include/config.h (modified) (1 diff)
• lib/c/arch/ia32/include/ddi.h (modified) (1 diff)
• lib/c/arch/ia32/include/faddr.h (modified) (1 diff)
• lib/c/arch/ia32/include/fibril.h (modified) (2 diffs)
• lib/c/arch/ia32/src/stacktrace.c (modified) (1 diff)
• lib/c/generic/assert.c (added)
• lib/c/generic/async.c (modified) (1 diff)
• lib/c/generic/async_sess.c (modified) (1 diff)
• lib/c/generic/errno.c (modified) (1 diff)
• lib/c/generic/fibril_synch.c (modified) (1 diff)
• lib/c/generic/malloc.c (modified) (1 diff)
• lib/c/generic/stacktrace.c (modified) (1 diff)
• lib/c/include/assert.h (modified) (3 diffs)
• lib/c/include/errno.h (modified) (1 diff)
• lib/c/include/fibril_synch.h (modified) (2 diffs)
• srv/devman/devman.c (modified) (1 diff)
• srv/fs/fat/fat_fat.c (modified) (1 diff)
• srv/fs/fat/fat_idx.c (modified) (1 diff)
• srv/fs/fat/fat_ops.c (modified) (1 diff)
• srv/hw/netif/ne2000/dp8390.c (modified) (1 diff)
• srv/ns/clonable.c (modified) (1 diff)
• srv/ns/service.c (modified) (1 diff)
• srv/ns/task.c (modified) (1 diff)

uspace/lib/block/libblock.c

@@ -51 +51 @@
 #include <macros.h>
 #include <mem.h>
+#include <malloc.h>
+#include <stdio.h>
 #include <sys/typefmt.h>
 #include <stacktrace.h>

uspace/lib/c/Makefile

@@ -113 +113 @@
         generic/arg_parse.c \
         generic/sort.c \
-        generic/stats.c
+        generic/stats.c \
+        generic/assert.c \
 
 SOURCES = \

uspace/lib/c/arch/ia32/include/config.h

@@ -36 +36 @@
 #define LIBC_ia32_CONFIG_H_
 
-#define PAGE_WIDTH      12
-#define PAGE_SIZE       (1 << PAGE_WIDTH)
+#define PAGE_WIDTH  12
+#define PAGE_SIZE   (1 << PAGE_WIDTH)
+
+#define USER_ADDRESS_SPACE_START_ARCH  UINT32_C(0x00000000)
+#define USER_ADDRESS_SPACE_END_ARCH    UINT32_C(0x7fffffff)
 
 #endif

uspace/lib/c/arch/ia32/include/ddi.h

@@ -37 +37 @@
 #include <libarch/types.h>
 
-#define IO_SPACE_BOUNDARY       ((void *) (64 * 1024))
+#define IO_SPACE_BOUNDARY  ((void *) (64 * 1024))
 
 static inline uint8_t pio_read_8(ioport8_t *port)

uspace/lib/c/arch/ia32/include/faddr.h

@@ -38 +38 @@
 #include <libarch/types.h>
 
-#define FADDR(fptr)             ((uintptr_t) (fptr))
+#define FADDR(fptr)  ((uintptr_t) (fptr))
 
 #endif

uspace/lib/c/arch/ia32/include/fibril.h

@@ -42 +42 @@
  * panic sooner or later
  */
-#define SP_DELTA     (12)
+#define SP_DELTA  12
 
 #define context_set(c, _pc, stack, size, ptls) \
@@ -51 +51 @@
                 (c)->ebp = 0; \
         } while (0)
-        
-/* We include only registers that must be preserved
+
+/*
+ * We include only registers that must be preserved
  * during function call
  */

uspace/lib/c/arch/ia32/src/stacktrace.c

@@ -35 +35 @@
  */
 
+#include <libarch/config.h>
 #include <sys/types.h>
 #include <bool.h>
-
 #include <stacktrace.h>
 
-#define FRAME_OFFSET_FP_PREV    0
-#define FRAME_OFFSET_RA         4
+#define FRAME_OFFSET_FP_PREV  0
+#define FRAME_OFFSET_RA       4
 
 bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp)
 {
         (void) st;
-        return fp != 0;
+        return (fp != 0) && (fp <= USER_ADDRESS_SPACE_END_ARCH);
 }
 

uspace/lib/c/generic/async.c

@@ -102 +102 @@
 #include <arch/barrier.h>
 #include <bool.h>
+#include <stdlib.h>
+#include <malloc.h>
 #include "private/async.h"
 

uspace/lib/c/generic/async_sess.c

@@ -105 +105 @@
 #include <errno.h>
 #include <assert.h>
+#include <async.h>
 #include "private/async_sess.h"
 

uspace/lib/c/generic/errno.c

@@ -36 +36 @@
 #include <fibril.h>
 
-int _errno;
+static fibril_local int fibril_errno;
+
+int *__errno(void)
+{
+        return &fibril_errno;
+}
 
 /** @}

uspace/lib/c/generic/fibril_synch.c

@@ -43 +43 @@
 #include <stacktrace.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include "private/async.h"
 

uspace/lib/c/generic/malloc.c

@@ -44 +44 @@
 #include <mem.h>
 #include <futex.h>
+#include <stdlib.h>
 #include <adt/gcdlcm.h>
 #include "private/malloc.h"

uspace/lib/c/generic/stacktrace.c

@@ -61 +61 @@
         stacktrace_prepare();
         stacktrace_print_fp_pc(stacktrace_fp_get(), stacktrace_pc_get());
+        
         /*
          * Prevent the tail call optimization of the previous call by
          * making it a non-tail call.
          */
-        (void) stacktrace_fp_get();
+        
+        printf("-- end of stack trace --\n");
 }
 

uspace/lib/c/include/assert.h

@@ -40 +40 @@
  *
  * If NDEBUG is not set, the assert() macro
- * evaluates expr and if it is false prints 
+ * evaluates expr and if it is false prints
  * error message and terminate program.
  *
@@ -47 +47 @@
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #ifndef NDEBUG
 
 #define assert(expr) \
         do { \
-                if (!(expr)) { \
-                        printf("Assertion failed (%s) at file '%s', " \
-                            "line %d.\n", #expr, __FILE__, __LINE__); \
-                        abort(); \
-                } \
+                if (!(expr)) \
+                        assert_abort(#expr, __FILE__, __LINE__); \
         } while (0)
 
@@ -67 +61 @@
 #endif /* NDEBUG */
 
+extern void assert_abort(const char *, const char *, unsigned int)
+    __attribute__((noreturn));
+
 #endif
 

uspace/lib/c/include/errno.h

@@ -39 +39 @@
 #include <fibril.h>
 
-#define errno _errno
+#define errno  (*(__errno()))
 
-extern int _errno;
+extern int *__errno(void) __attribute__((const));
 
 #define EMFILE        (-18)

uspace/lib/c/include/fibril_synch.h

@@ -36 +36 @@
 #define LIBC_FIBRIL_SYNCH_H_
 
-#include <async.h>
 #include <fibril.h>
 #include <adt/list.h>
 #include <libarch/tls.h>
 #include <sys/time.h>
+#include <bool.h>
 
 typedef struct {
-        fibril_owner_info_t oi;         /* Keep this the first thing. */
+        fibril_owner_info_t oi;  /**< Keep this the first thing. */
         int counter;
         link_t waiters;
@@ -64 +64 @@
 
 typedef struct {
-        fibril_owner_info_t oi; /* Keep this the first thing. */
+        fibril_owner_info_t oi;  /**< Keep this the first thing. */
         unsigned writers;
         unsigned readers;

uspace/srv/devman/devman.c

@@ -39 +39 @@
 #include <devmap.h>
 #include <str_error.h>
+#include <stdio.h>
 
 #include "devman.h"

uspace/srv/fs/fat/fat_fat.c

@@ -47 +47 @@
 #include <assert.h>
 #include <fibril_synch.h>
+#include <malloc.h>
 #include <mem.h>
 

uspace/srv/fs/fat/fat_idx.c

@@ -44 +44 @@
 #include <assert.h>
 #include <fibril_synch.h>
+#include <malloc.h>
 
 /** Each instance of this type describes one interval of freed VFS indices. */

uspace/srv/fs/fat/fat_ops.c

@@ -55 +55 @@
 #include <sys/mman.h>
 #include <align.h>
+#include <malloc.h>
 
 #define FAT_NODE(node)  ((node) ? (fat_node_t *) (node)->data : NULL)

uspace/srv/hw/netif/ne2000/dp8390.c

@@ -53 +53 @@
 #include <byteorder.h>
 #include <errno.h>
+#include <stdio.h>
 #include <libarch/ddi.h>
 #include <net/packet.h>

uspace/srv/ns/clonable.c

@@ -78 +78 @@
         if (list_empty(&cs_req)) {
                 /* There was no pending connection request. */
-                printf(NAME ": Unexpected clonable server.\n");
+                printf("%s: Unexpected clonable server.\n", NAME);
                 ipc_answer_0(callid, EBUSY);
                 return;

uspace/srv/ns/service.c

@@ -35 +35 @@
 #include <assert.h>
 #include <errno.h>
+#include <stdio.h>
+#include <malloc.h>
 #include "service.h"
 #include "ns.h"

uspace/srv/ns/task.c

@@ -39 +39 @@
 #include <stdio.h>
 #include <macros.h>
+#include <malloc.h>
 #include "task.h"
 #include "ns.h"