Changeset 15d0046 in mainline for uspace/lib/c/generic/stacktrace.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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 mainline changes

File:

• uspace/lib/c/generic/stacktrace.c (modified) (1 diff)

uspace/lib/c/generic/stacktrace.c

@@ -42 +42 @@
 static int stacktrace_read_uintptr(void *arg, uintptr_t addr, uintptr_t *data);
 
-void stacktrace_print_fp_pc(uintptr_t fp, uintptr_t pc)
+static stacktrace_ops_t basic_ops = {
+        .read_uintptr = stacktrace_read_uintptr
+};
+
+void stacktrace_print_generic(stacktrace_ops_t *ops, void *arg, uintptr_t fp,
+    uintptr_t pc)
 {
         stacktrace_t st;
         uintptr_t nfp;
+        int rc;
 
-        st.op_arg = NULL;
-        st.read_uintptr = stacktrace_read_uintptr;
+        st.op_arg = arg;
+        st.ops = ops;
 
         while (stacktrace_fp_valid(&st, fp)) {
                 printf("%p: %p()\n", (void *) fp, (void *) pc);
-                (void) stacktrace_ra_get(&st, fp, &pc);
-                (void) stacktrace_fp_prev(&st, fp, &nfp);
+                rc =  stacktrace_ra_get(&st, fp, &pc);
+                if (rc != EOK)
+                        break;
+                rc = stacktrace_fp_prev(&st, fp, &nfp);
+                if (rc != EOK)
+                        break;
                 fp = nfp;
         }
+}
+
+void stacktrace_print_fp_pc(uintptr_t fp, uintptr_t pc)
+{
+        stacktrace_print_generic(&basic_ops, NULL, fp, pc);
 }