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

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

Files:

• stacktrace.c (modified) (2 diffs)
• udebug.c (modified) (2 diffs)

uspace/lib/libc/generic/stacktrace.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2009 Jakub Jermar
+ * Copyright (c) 2010 Jiri Svoboda
  * All rights reserved.
  *
@@ -36 +37 @@
 #include <stdio.h>
 #include <sys/types.h>
+#include <errno.h>
 
-void stack_trace_fp_pc(uintptr_t fp, uintptr_t pc)
+static int stacktrace_read_uintptr(void *arg, uintptr_t addr, uintptr_t *data);
+
+void stacktrace_print_fp_pc(uintptr_t fp, uintptr_t pc)
 {
-        while (frame_pointer_validate(fp)) {
+        stacktrace_t st;
+        uintptr_t nfp;
+
+        st.op_arg = NULL;
+        st.read_uintptr = stacktrace_read_uintptr;
+
+        while (stacktrace_fp_valid(&st, fp)) {
                 printf("%p: %p()\n", fp, pc);
-                pc = return_address_get(fp);
-                fp = frame_pointer_prev(fp);
+                (void) stacktrace_ra_get(&st, fp, &pc);
+                (void) stacktrace_fp_prev(&st, fp, &nfp);
+                fp = nfp;
         }
 }
 
-void stack_trace(void)
+void stacktrace_print(void)
 {
-        stack_trace_fp_pc(frame_pointer_get(), program_counter_get());
+        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) frame_pointer_get();
+        (void) stacktrace_fp_get();
+}
+
+static int stacktrace_read_uintptr(void *arg, uintptr_t addr, uintptr_t *data)
+{
+        (void) arg;
+        *data = *((uintptr_t *) addr);
+        return EOK;
 }
 

uspace/lib/libc/generic/udebug.c

@@ -69 +69 @@
 }
 
+int udebug_name_read(int phoneid, void *buffer, size_t n,
+        size_t *copied, size_t *needed)
+{
+        ipcarg_t a_copied, a_needed;
+        int rc;
+
+        rc = async_req_3_3(phoneid, IPC_M_DEBUG_ALL, UDEBUG_M_NAME_READ,
+                (sysarg_t)buffer, n, NULL, &a_copied, &a_needed);
+
+        *copied = (size_t)a_copied;
+        *needed = (size_t)a_needed;
+
+        return rc;
+}
+
+int udebug_areas_read(int phoneid, void *buffer, size_t n,
+        size_t *copied, size_t *needed)
+{
+        ipcarg_t a_copied, a_needed;
+        int rc;
+
+        rc = async_req_3_3(phoneid, IPC_M_DEBUG_ALL, UDEBUG_M_AREAS_READ,
+                (sysarg_t)buffer, n, NULL, &a_copied, &a_needed);
+
+        *copied = (size_t)a_copied;
+        *needed = (size_t)a_needed;
+
+        return rc;
+}
+
 int udebug_mem_read(int phoneid, void *buffer, uintptr_t addr, size_t n)
 {
@@ -78 +108 @@
 {
         return async_req_3_0(phoneid, IPC_M_DEBUG_ALL, UDEBUG_M_ARGS_READ,
+            tid, (sysarg_t)buffer);
+}
+
+int udebug_regs_read(int phoneid, thash_t tid, void *buffer)
+{
+        return async_req_3_0(phoneid, IPC_M_DEBUG_ALL, UDEBUG_M_REGS_READ,
             tid, (sysarg_t)buffer);
 }