Changeset e405228 in mainline

Timestamp:

2010-01-02T18:52:06Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8786aa5

Parents:

a7a0417 (diff), c6d130c (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 stack tracing support for ppc32 userspace.

Location:

uspace/lib/libc

Files:

• arch/ppc32/src/entry.s (modified) (1 diff)
• arch/ppc32/src/stacktrace.S (modified) (1 diff)
• arch/ppc32/src/thread_entry.s (modified) (1 diff)
• generic/stacktrace.c (modified) (1 diff)

uspace/lib/libc/arch/ppc32/src/entry.s

@@ -38 +38 @@
 #
 __entry:
+        #
+        # Create the first stack frame.
+        #
+        li %r3, 0
+        stw %r3, 0(%r1)
+        stwu %r1, -16(%r1)
+
         # Pass the PCB pointer to __main() as the first argument.
         # The first argument is passed in r3.

uspace/lib/libc/arch/ppc32/src/stacktrace.S

@@ -38 +38 @@
 
 frame_pointer_get:
+        mr r3, sp
+        blr
+
 frame_pointer_prev:
+        lwz r3, 0(r3)
+        blr
+
 frame_pointer_validate:
+        blr
+
 return_address_get:
+        lwz r3, 4(r3)
+        blr
+
 program_counter_get:
-        li r3, 0
+        mflr r3
         blr

uspace/lib/libc/arch/ppc32/src/thread_entry.s

@@ -35 +35 @@
 #
 __thread_entry:
+        #
+        # Create the first stack frame.
+        #
+        li %r4, 0
+        stw %r4, 0(%r1)
+        stwu %r1, -16(%r1)
+
         b __thread_main
 

uspace/lib/libc/generic/stacktrace.c

@@ -52 +52 @@
 {
         stack_trace_fp_pc(frame_pointer_get(), program_counter_get());
+        /*
+         * Prevent the tail call optimization of the previous call by
+         * making it a non-tail call.
+         */
+        (void) frame_pointer_get();
 }