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

Timestamp:

2024-10-13T08:23:40Z (2 months 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/mips32/src/mips32.c (modified) (1 diff)

kernel/arch/mips32/src/mips32.c

@@ -163 +163 @@
 }
 
-void userspace(uspace_arg_t *kernel_uarg)
+uintptr_t arch_get_initial_sp(uintptr_t stack_base, uintptr_t stack_size)
+{
+        return stack_base + stack_size;
+}
+
+void userspace(uintptr_t pc, uintptr_t sp)
 {
         /* EXL = 1, UM = 1, IE = 1 */
         cp0_status_write(cp0_status_read() | (cp0_status_exl_exception_bit |
             cp0_status_um_bit | cp0_status_ie_enabled_bit));
-        cp0_epc_write(kernel_uarg->uspace_entry);
-        userspace_asm(kernel_uarg->uspace_stack +
-            kernel_uarg->uspace_stack_size,
-            kernel_uarg->uspace_uarg,
-            kernel_uarg->uspace_entry);
+        cp0_epc_write(pc);
+        userspace_asm(sp, pc);
 
         while (true)