Changeset ebb1489 in mainline for kernel/arch/ia64/src/ia64.c

Timestamp:

2024-10-13T08:23:40Z (8 weeks ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• kernel/arch/ia64/src/ia64.c (modified) (2 diffs)

kernel/arch/ia64/src/ia64.c

@@ -218 +218 @@
 }
 
+uintptr_t arch_get_initial_sp(uintptr_t stack_base, uintptr_t stack_size)
+{
+        return ALIGN_DOWN(stack_base + stack_size / 2, STACK_ALIGNMENT);
+}
+
 /** Enter userspace and never return. */
-void userspace(uspace_arg_t *kernel_uarg)
+void userspace(uintptr_t pc, uintptr_t sp)
 {
         psr_t psr;
@@ -241 +246 @@
          *
          * When calculating stack addresses, mind the stack split between the
-         * memory stack and the RSE stack. Each occuppies
-         * uspace_stack_size / 2 bytes.
+         * memory stack and the RSE stack.
+         * Memory stack occupies area under sp, while RSE stack occupies area above.
          */
-        switch_to_userspace(kernel_uarg->uspace_entry,
-            kernel_uarg->uspace_stack +
-            kernel_uarg->uspace_stack_size / 2 -
-            ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT),
-            kernel_uarg->uspace_stack +
-            kernel_uarg->uspace_stack_size / 2,
-            kernel_uarg->uspace_uarg, psr.value, rsc.value);
+        switch_to_userspace(pc,
+            sp, sp + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT),
+            0, psr.value, rsc.value);
 
         while (true)