Changeset c6588ce in mainline for uspace/lib/c/arch/mips64/src/entry.S

Timestamp:

2012-05-05T08:12:17Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ee04c28

Parents:

2cc7f16 (diff), d21e935c (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/arch/mips64/src/entry.S (moved) (moved from uspace/lib/c/arch/mips32/src/entry.s ) (2 diffs)

uspace/lib/c/arch/mips64/src/entry.S

@@ -27 +27 @@
 #
 
+#include <libarch/stack.h>
+
 .text
 .section .init, "ax"
@@ -41 +43 @@
 .ent __entry
 __entry:
-        .frame $sp, 32, $31
-        .cpload $25
-
-        # Mips o32 may store its arguments on stack, make space (16 bytes),
-        # so that it could work with -O0
-        # Make space additional 16 bytes for the stack frame
-
-        addiu $sp, -32
-        .cprestore 16   # Allow PIC code
-
-        # Pass pcb_ptr to __main() as the first argument. pcb_ptr is already
+        .frame $sp, ABI_STACK_FRAME, $ra
+        .cpload $t9
+        
+        # Allocate the stack frame.
+        addiu $sp, -ABI_STACK_FRAME
+        
+        # Allow PIC code
+        .cprestore 16
+        
+        # Pass pcb_ptr to __main() as the first argument. It is already
         # in $a0. As the first argument is passed in $a0, no operation
         # is needed.
-
+        
         jal __main
         nop
-.end
+        
+        #
+        # Not reached.
+        #
+        addiu $sp, ABI_STACK_FRAME
+.end __entry