Changeset 9f52563 in mainline for arch

Timestamp:

2006-03-17T01:34:36Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8a0b0669

Parents:

5fceec7

Message:

Support for user space threads.

Location:

arch

Files:

• amd64/src/userspace.c (modified) (2 diffs)
• ia32/include/fpu_context.h (modified) (1 diff)
• ia32/src/userspace.c (modified) (2 diffs)
• ia64/src/ia64.c (modified) (3 diffs)
• mips32/src/mips32.c (modified) (2 diffs)

arch/amd64/src/userspace.c

@@ -40 +40 @@
  *
  */
-void userspace(__address entry)
+void userspace(uspace_arg_t *uarg)
 {
         ipl_t ipl;
@@ -47 +47 @@
 
         __asm__ volatile (""
-                          "movq %0, %%rax;"                    
-                          "movq %1, %%rbx;"
-                          "movq %2, %%rcx;"
-                          "movq %3, %%rdx;"
-                          "movq %4, %%rsi;"
-                          "pushq %%rax;"
-                          "pushq %%rbx;"
-                          "pushq %%rcx;"
-                          "pushq %%rdx;"
-                          "pushq %%rsi;"
-                          "iretq;"
-                          : : "i" (gdtselector(UDATA_DES) | PL_USER), 
-                          "i" (USTACK_ADDRESS+THREAD_STACK_SIZE), 
+                          "pushq %0\n"
+                          "pushq %1\n"
+                          "pushq %2\n"
+                          "pushq %3\n"
+                          "pushq %4\n"
+                          "iretq\n"
+                          : : 
+                          "i" (gdtselector(UDATA_DES) | PL_USER), 
+                          "r" (uarg->uspace_stack+THREAD_STACK_SIZE), 
                           "r" (ipl), 
                           "i" (gdtselector(UTEXT_DES) | PL_USER), 
-                          "r" (entry));
+                          "r" (uarg->uspace_entry));
         
         /* Unreachable */

arch/ia32/include/fpu_context.h

@@ -40 +40 @@
 
 struct fpu_context {
-        /* TODO: We need malloc that aligns structures on 16-byte boundary */
         __u8 fpu[512];          /* FXSAVE & FXRSTOR storage area */
 };

arch/ia32/src/userspace.c

@@ -40 +40 @@
  *
  */
-void userspace(__address entry)
+void userspace(uspace_arg_t *uarg)
 {
         ipl_t ipl;
@@ -61 +61 @@
                 "iret"
                 : 
-                : "i" (selector(UDATA_DES) | PL_USER), "r" (USTACK_ADDRESS+(THREAD_STACK_SIZE)), "r" (ipl), "i" (selector(UTEXT_DES) | PL_USER), "r" (entry)
+                : "i" (selector(UDATA_DES) | PL_USER), "r" (uarg->uspace_stack+THREAD_STACK_SIZE),
+                  "r" (ipl), "i" (selector(UTEXT_DES) | PL_USER), "r" (uarg->uspace_entry)
                 : "eax");
         

arch/ia64/src/ia64.c

@@ -42 +42 @@
 #include <userspace.h>
 #include <console/console.h>
+#include <proc/thread.h>
 
 void arch_pre_mm_init(void)
@@ -73 +74 @@
 
 /** Enter userspace and never return. */
-void userspace(__address entry)
+void userspace(uspace_arg_t *uarg)
 {
         psr_t psr;
@@ -91 +92 @@
         rsc.mode = 3;                           /* eager mode */
 
-        switch_to_userspace(entry, USTACK_ADDRESS+PAGE_SIZE-ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT), USTACK_ADDRESS, psr.value, rsc.value);
+        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);
 
         while (1) {

arch/mips32/src/mips32.c

@@ -121 +121 @@
 __address supervisor_sp __attribute__ ((section (".text")));
 
-void userspace(__address entry)
+void userspace(uspace_arg_t *uarg)
 {
         /* EXL=1, UM=1, IE=1 */
@@ -127 +127 @@
                                               cp0_status_um_bit |
                                               cp0_status_ie_enabled_bit));
-        cp0_epc_write(entry);
-        userspace_asm(USTACK_ADDRESS+PAGE_SIZE);
+        cp0_epc_write(uarg->uspace_entry);
+        userspace_asm(uarg->uspace_stack+PAGE_SIZE);
         while (1)
                 ;