Changeset 0f250f9 in mainline for arch/ia64/src/ia64.c

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/ia64.c (modified) (3 diffs)

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) {