Changeset 0f250f9 in mainline for arch/ia64

Timestamp:

2006-03-17T18:07:56Z (20 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.

Location:

arch/ia64

Files:

• include/asm.h (modified) (1 diff)
• include/faddr.h (modified) (2 diffs)
• src/asm.S (modified) (2 diffs)
• src/ia64.c (modified) (3 diffs)

arch/ia64/include/asm.h

@@ -259 +259 @@
 extern void asm_delay_loop(__u32 t);
 
-extern void switch_to_userspace(__address entry, __address sp, __address bsp, __u64 ipsr, __u64 rsc);
+extern void switch_to_userspace(__address entry, __address sp, __address bsp, __address uspace_uarg, __u64 ipsr, __u64 rsc);
 
 #endif

arch/ia64/include/faddr.h

@@ -32 +32 @@
 #include <arch/types.h>
 
-static __address FADDR(void (* fptr)(void));
-
 /** 
  *
@@ -42 +40 @@
  *
  */
-inline __address FADDR(void (* fptr)(void)) {
+static inline __address FADDR(void (* fptr)()) {
         __address faddr;
-
-        /*Deprecated assembler version*/
-        /*      
-        __asm__(
-                "ld8 %0 = [%1]\n\t"
-                : "=r" (faddr)
-                : "r" (fptr)
-        );
-        */
 
         faddr = *((__address *)(fptr));;

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 ;;

arch/ia64/src/ia64.c

@@ -42 +42 @@
 #include <userspace.h>
 #include <console/console.h>
-#include <proc/thread.h>
+#include <proc/uarg.h>
 
 void arch_pre_mm_init(void)
@@ -74 +74 @@
 
 /** Enter userspace and never return. */
-void userspace(uspace_arg_t *uarg)
+void userspace(uspace_arg_t *kernel_uarg)
 {
         psr_t psr;
@@ -92 +92 @@
         rsc.mode = 3;                           /* eager mode */
 
-        switch_to_userspace(uarg->uspace_entry, uarg->uspace_stack+PAGE_SIZE-ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT), uarg->uspace_stack, psr.value, rsc.value);
+        switch_to_userspace((__address) kernel_uarg->uspace_entry,
+                            ((__address) kernel_uarg->uspace_stack)+PAGE_SIZE-ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT),
+                            (__address) kernel_uarg->uspace_stack,
+                            (__address) kernel_uarg->uspace_uarg,
+                            psr.value, rsc.value);
 
         while (1) {