Changeset 1735f3e in mainline for uspace/lib/libc/include

Timestamp:

2010-01-31T18:22:37Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fc2e71e

Parents:

430de97 (diff), 2e07f62c (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 from mainline.

Location:

uspace/lib/libc/include

Files:

• inttypes.h (added)
• ipc/adb.h (added)
• stacktrace.h (modified) (2 diffs)
• stdlib.h (modified) (1 diff)
• sys/typefmt.h (added)
• udebug.h (modified) (1 diff)

uspace/lib/libc/include/stacktrace.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2009 Jakub Jermar
+ * Copyright (c) 2010 Jiri Svoboda
  * All rights reserved.
  *
@@ -39 +40 @@
 #include <bool.h>
 
-extern void stack_trace(void);
-extern void stack_trace_fp_pc(uintptr_t, uintptr_t);
+typedef struct {
+        void *op_arg;
+        int (*read_uintptr)(void *, uintptr_t, uintptr_t *);
+} stacktrace_t;
+
+extern void stacktrace_print(void);
+extern void stacktrace_print_fp_pc(uintptr_t, uintptr_t);
 
 /*
  * The following interface is to be implemented by each architecture.
  */
-extern bool frame_pointer_validate(uintptr_t);
-extern uintptr_t frame_pointer_get(void);
-extern uintptr_t frame_pointer_prev(uintptr_t);
-extern uintptr_t return_address_get(uintptr_t);
-extern uintptr_t program_counter_get();
+extern bool stacktrace_fp_valid(stacktrace_t *, uintptr_t);
+extern int stacktrace_fp_prev(stacktrace_t *, uintptr_t, uintptr_t *);
+extern int stacktrace_ra_get(stacktrace_t *, uintptr_t, uintptr_t *);
+
+extern void stacktrace_prepare(void);
+extern uintptr_t stacktrace_fp_get(void);
+extern uintptr_t stacktrace_pc_get();
 
 #endif

uspace/lib/libc/include/stdlib.h

@@ -42 +42 @@
 #define abort() \
         do { \
-                stack_trace(); \
+                stacktrace_print(); \
                 _exit(1); \
         } while (0)

uspace/lib/libc/include/udebug.h

@@ -47 +47 @@
 int udebug_thread_read(int phoneid, void *buffer, size_t n,
         size_t *copied, size_t *needed);
+int udebug_name_read(int phoneid, void *buffer, size_t n,
+        size_t *copied, size_t *needed);
+int udebug_areas_read(int phoneid, void *buffer, size_t n,
+        size_t *copied, size_t *needed);
 int udebug_mem_read(int phoneid, void *buffer, uintptr_t addr, size_t n);
 int udebug_args_read(int phoneid, thash_t tid, sysarg_t *buffer);
+int udebug_regs_read(int phoneid, thash_t tid, void *buffer);
 int udebug_go(int phoneid, thash_t tid, udebug_event_t *ev_type,
         sysarg_t *val0, sysarg_t *val1);