Changes in kernel/arch/arm64/src/arm64.c [db17889:3fcea34] in mainline

File:

• kernel/arch/arm64/src/arm64.c (modified) (6 diffs)

kernel/arch/arm64/src/arm64.c

@@ -40 +40 @@
 #include <arch/exception.h>
 #include <arch/machine_func.h>
+#include <console/console.h>
 #include <interrupt.h>
 #include <proc/scheduler.h>
@@ -145 +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. */
@@ -156 +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. */
@@ -169 +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"
@@ -206 +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)
         );
@@ -256 +258 @@
 }
 
+void early_putuchar(char32_t c)
+{
+#ifdef CONFIG_DEBUG_EARLY_PRINT
+        if (c == '\n')
+                machine_early_uart_output('\r');
+
+        machine_early_uart_output(c);
+#endif
+}
+
 /** @}
  */