Changeset c7bbf029 in mainline for uspace/lib/c

Timestamp:

2011-04-21T15:45:31Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7da90cd

Parents:

d161715

Message:

improve stack traces and assertions
reduce header files pollution

Location:

uspace/lib/c

Files:

• Makefile (modified) (1 diff)
• arch/ia32/include/config.h (modified) (1 diff)
• arch/ia32/src/stacktrace.c (modified) (1 diff)
• generic/assert.c (added)
• generic/async.c (modified) (1 diff)
• generic/stacktrace.c (modified) (1 diff)
• include/assert.h (modified) (3 diffs)

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/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/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