Changeset ebb1489 in mainline for kernel/arch/arm64/src/arm64.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/arm64/src/arm64.c (modified) (4 diffs)

kernel/arch/arm64/src/arm64.c

@@ -146 +146 @@
 }
 
+uintptr_t arch_get_initial_sp(uintptr_t stack_base, uintptr_t stack_size)
+{
+        return stack_base + stack_size;
+}
+
 /** Change processor mode.
  *
  * @param kernel_uarg Userspace settings (entry point, stack, ...).
  */
-void userspace(uspace_arg_t *kernel_uarg)
+void userspace(uintptr_t pc, uintptr_t sp)
 {
         /* Prepare return to EL0. */
@@ -157 +162 @@
 
         /* Set program entry. */
-        ELR_EL1_write(kernel_uarg->uspace_entry);
+        ELR_EL1_write(pc);
 
         /* Set user stack. */
-        SP_EL0_write(kernel_uarg->uspace_stack +
-            kernel_uarg->uspace_stack_size);
+        SP_EL0_write(sp);
 
         /* Clear Thread ID register. */
@@ -170 +174 @@
              * Reset the kernel stack to its base value.
              *
-             * Clear all general-purpose registers,
-             * except x0 that holds an argument for
-             * the user space.
+             * Clear all general-purpose registers.
              */
             "mov sp, %[kstack]\n"
-            "mov x0, %[uspace_uarg]\n"
+            "mov x0, #0\n"
             "mov x1, #0\n"
             "mov x2, #0\n"
@@ -207 +209 @@
             "mov x30, #0\n"
             "eret\n"
-            :: [uspace_uarg] "r" (kernel_uarg->uspace_uarg),
-              [kstack] "r" (((uint64_t) (THREAD->kstack)) +
+            :: [kstack] "r" (((uint64_t) (THREAD->kstack)) +
               MEM_STACK_SIZE - SP_DELTA)
         );