Changeset 6d123b3 in mainline for uspace/lib/c/arch/mips32/src

Timestamp:

2012-03-13T15:23:11Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

145d16f8

Parents:

df366b5e

Message:

respect the o32 ABI when calling C functions from assembler and creating contexts
(thx Adam Hraska)

Location:

uspace/lib/c/arch/mips32/src

Files:

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

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

@@ -27 +27 @@
 #
 
+#include <libarch/stack.h>
+
 .text
 .section .init, "ax"
@@ -41 +43 @@
 .ent __entry
 __entry:
-        .frame $sp, 32, $31
-        .cpload $25
+        .frame $sp, ABI_STACK_FRAME, $ra
+        .cpload $t9
         
-        # FIXME: Reflect exactly ABI specs here
+        # Allocate the stack frame.
+        addiu $sp, -ABI_STACK_FRAME
         
-        addiu $sp, -32
-        .cprestore 16   # Allow PIC code
+        # Allow PIC code
+        .cprestore 16
         
-        # Pass pcb_ptr to __main() as the first argument. pcb_ptr is already
+        # 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.
@@ -55 +58 @@
         jal __main
         nop
-.end
+        
+        #
+        # Not reached.
+        #
+        addiu $sp, ABI_STACK_FRAME
+.end __entry

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

@@ -27 +27 @@
 #
 
+#include <libarch/stack.h>
+
 .text
 .section .text
@@ -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

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