Changeset 05ae7081 in mainline for kernel/arch/sparc64/src/trap/trap_table.S

Timestamp:

2007-11-16T16:24:05Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9cc0d7c

Parents:

454889c

Message:

Support for six syscall arguments for sparc64.
There is a minor stability issue which needs to be fixed (kernel panics upon entering kconsole from the
console task).

File:

• kernel/arch/sparc64/src/trap/trap_table.S (modified) (5 diffs)

kernel/arch/sparc64/src/trap/trap_table.S

@@ -644 +644 @@
  *
  * Input registers:
- *      %g1             Address of function to call.
+ *      %g1             Address of function to call if this is not a syscall.
  *      %g2             First argument for the function.
  *      %g6             Pre-set as kernel stack base if trap from userspace.
@@ -698 +698 @@
          * Copy arguments for the syscall to the new window.
          */
-        mov %i0, %o2
-        mov %i1, %o3
-        mov %i2, %o4
-        mov %i3, %o5
+        mov %i0, %o0
+        mov %i1, %o1
+        mov %i2, %o2
+        mov %i3, %o3
+        mov %i4, %o4
+        mov %i5, %o5
 .endif
 
@@ -741 +743 @@
          */
         mov %g1, %l0
+.if NOT(\is_syscall)
         mov %g2, %o0
+.else
+        ! store the syscall number on the stack as 7th argument
+        stx %g2, [%sp + STACK_WINDOW_SAVE_AREA_SIZE + STACK_BIAS + STACK_ARG6] 
+.endif
 
         /*
@@ -768 +775 @@
         SAVE_GLOBALS
         
+.if NOT(\is_syscall)
         /*
          * Call the higher-level handler and pass istate as second parameter.
@@ -773 +781 @@
         call %l0
         add %sp, PREEMPTIBLE_HANDLER_STACK_FRAME_SIZE + STACK_BIAS + SAVED_TNPC, %o1
-
-.if \is_syscall
-        /*
-         * Copy the value returned by the syscall.
-         */
-        mov %o0, %i0
+.else
+        /*
+         * Call the higher-level syscall handler.
+         */
+        call syscall_handler
+        nop
+        mov %o0, %i0                            ! copy the value returned by the syscall
 .endif