Changeset 0f250f9 in mainline for arch/ia64/src/asm.S

Timestamp:

2006-03-17T18:07:56Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

69f293e

Parents:

6c6a19e6

Message:

Improved uspace threads.
ia64 needs fixing.

File:

• arch/ia64/src/asm.S (modified) (2 diffs)

arch/ia64/src/asm.S

@@ -55 +55 @@
  * @param in1 Userspace stack pointer address.
  * @param in2 Userspace register stack pointer address.
- * @param in3 Value to be stored in IPSR.
- * @param in4 Value to be stored in RSC.
+ * @param in3 Userspace address of thread uspace_arg_t structure.
+ * @param in4 Value to be stored in IPSR.
+ * @param in5 Value to be stored in RSC.
  */
 .global switch_to_userspace
 switch_to_userspace:
-        alloc loc0 = ar.pfs, 5, 3, 0, 0
+        alloc loc0 = ar.pfs, 6, 3, 0, 0
         rsm (PSR_IC_MASK | PSR_I_MASK)          /* disable interruption collection and interrupts */
         srlz.d ;;
         srlz.i ;;
         
-        mov cr.ipsr = in3
+        mov cr.ipsr = in4
         mov cr.iip = in0
         mov r12 = in1
@@ -85 +86 @@
         
         mov ar.bspstore = in2 ;;
-        mov ar.rsc = in4 ;;
+        mov ar.rsc = in5 ;;
+        
+        mov r8 = in3
         
         rfi ;;