Changeset 6843a9c in mainline for uspace/lib/c/arch/mips32/src/thread_entry.S

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/lib/c/arch/mips32/src/thread_entry.S (moved) (moved from uspace/lib/c/arch/mips64/src/thread_entry.s ) (3 diffs)

uspace/lib/c/arch/mips32/src/thread_entry.S

@@ -27 +27 @@
 #
 
+#include <libarch/stack.h>
+
 .text
 
@@ -40 +42 @@
 .ent __thread_entry
 __thread_entry:
-        .frame $sp, 32, $31
-        .cpload $25
+        .frame $sp, ABI_STACK_FRAME, $ra
+        .cpload $t9
         
         #
         # v0 contains address of uarg.
         #
-        add $4, $2, 0
+        add $a0, $v0, 0
         
-        addiu $sp, -32
+        # Allocate the stack frame.
+        addiu $sp, -ABI_STACK_FRAME
+        
+        # Allow PIC code
         .cprestore 16
         
@@ -57 +62 @@
         # Not reached.
         #
+        addiu $sp, ABI_STACK_FRAME
 .end __thread_entry