Changeset e28175d in mainline for kernel/arch/arm64/src/arm64.c

Timestamp:

2020-03-15T10:44:02Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

b401b33 (diff), 44dde42 (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:

heiducteam <tristanided@…> (2020-03-15 10:44:02)

git-committer:

GitHub <noreply@…> (2020-03-15 10:44:02)

Message:

Merge pull request #1 from HelenOS/master

sync

File:

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

kernel/arch/arm64/src/arm64.c

@@ -156 +156 @@
 
         /* Set program entry. */
-        ELR_EL1_write((uint64_t) kernel_uarg->uspace_entry);
+        ELR_EL1_write(kernel_uarg->uspace_entry);
 
         /* Set user stack. */
-        SP_EL0_write(((uint64_t) kernel_uarg->uspace_stack +
-            kernel_uarg->uspace_stack_size));
+        SP_EL0_write(kernel_uarg->uspace_stack +
+            kernel_uarg->uspace_stack_size);
 
         /* Clear Thread ID register. */
@@ -167 +167 @@
         asm volatile (
             /*
-             * Clear all general-purpose registers, except x0 that holds an
-             * argument for the user space.
+             * Reset the kernel stack to its base value.
+             *
+             * Clear all general-purpose registers,
+             * except x0 that holds an argument for
+             * the user space.
              */
+            "mov sp, %[kstack]\n"
             "mov x0, %[uspace_uarg]\n"
             "mov x1, #0\n"
@@ -202 +206 @@
             "mov x30, #0\n"
             "eret\n"
-            :: [uspace_uarg] "r" (kernel_uarg->uspace_uarg)
+            :: [uspace_uarg] "r" (kernel_uarg->uspace_uarg),
+              [kstack] "r" (((uint64_t) (THREAD->kstack)) +
+              MEM_STACK_SIZE - SP_DELTA)
         );