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

kernel/arch/ppc32/src/ppc32.c

@@ -49 +49 @@
 #include <mm/km.h>
 #include <time/clock.h>
-#include <abi/proc/uarg.h>
 #include <console/console.h>
 #include <sysinfo/sysinfo.h>
@@ -290 +289 @@
 }
 
-void userspace(uspace_arg_t *kernel_uarg)
-{
-        userspace_asm(kernel_uarg->uspace_uarg,
-            kernel_uarg->uspace_stack +
-            kernel_uarg->uspace_stack_size - SP_DELTA,
-            kernel_uarg->uspace_entry);
-
+uintptr_t arch_get_initial_sp(uintptr_t stack_base, uintptr_t stack_size)
+{
+        return stack_base + stack_size - SP_DELTA;
+}
+
+void userspace(uintptr_t pc, uintptr_t sp)
+{
+        userspace_asm(0, sp, pc);
         unreachable();
 }