Changeset 6843a9c in mainline for uspace/lib/c/arch/mips64/src/entryjmp.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/mips64/src/entryjmp.S (moved) (moved from uspace/lib/c/arch/mips32/src/entryjmp.s ) (3 diffs)

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

@@ -27 +27 @@
 #
 
+#include <libarch/stack.h>
+
 .text
 .section .text
@@ -34 +36 @@
 ## void entry_point_jmp(void *entry_point, void *pcb);
 #
-# $a0 (=$4)     contains entry_point
-# $a1 (=$5)     contains pcb
+# $a0 (=$4) contains entry_point
+# $a1 (=$5) contains pcb
 #
 # Jump to program entry point
@@ -41 +43 @@
 entry_point_jmp:
         # tmp := entry_point
-        move $25, $a0
-
+        move $t9, $a0
+        
         # Pass pcb to the entry point in $a0
         move $a0, $a1
-        jr $25
-        nop
-.end
+        
+        jr $t9
+        addiu $sp, -ABI_STACK_FRAME
+        addiu $sp, ABI_STACK_FRAME
+.end entry_point_jmp