Changeset ae7d03c in mainline for kernel/arch/amd64/src/userspace.c

Timestamp:

2018-05-10T13:39:19Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e8975278

Parents:

b277bef

git-author:

Jiri Svoboda <jiri@…> (2018-05-10 07:38:12)

git-committer:

Jiri Svoboda <jiri@…> (2018-05-10 13:39:19)

Message:

Selected ccheck-proposed comment fixes.

File:

• kernel/arch/amd64/src/userspace.c (modified) (1 diff)

kernel/arch/amd64/src/userspace.c

@@ -55 +55 @@
 
         asm volatile (
-                "pushq %[udata_des]\n"
-                "pushq %[stack_top]\n"
-                "pushq %[rflags]\n"
-                "pushq %[utext_des]\n"
-                "pushq %[entry]\n"
-                "movq %[uarg], %%rax\n"
+            "pushq %[udata_des]\n"
+            "pushq %[stack_top]\n"
+            "pushq %[rflags]\n"
+            "pushq %[utext_des]\n"
+            "pushq %[entry]\n"
+            "movq %[uarg], %%rax\n"
 
-                /* %rdi is defined to hold pcb_ptr - set it to 0 */
-                "xorq %%rdi, %%rdi\n"
-                "iretq\n"
-                :: [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
-                   [stack_top] "r" ((uint8_t *) kernel_uarg->uspace_stack +
-                       kernel_uarg->uspace_stack_size),
-                   [rflags] "r" (rflags),
-                   [utext_des] "i" (GDT_SELECTOR(UTEXT_DES) | PL_USER),
-                   [entry] "r" (kernel_uarg->uspace_entry),
-                   [uarg] "r" (kernel_uarg->uspace_uarg)
-                : "rax"
+            /* %rdi is defined to hold pcb_ptr - set it to 0 */
+            "xorq %%rdi, %%rdi\n"
+            "iretq\n"
+            :: [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
+              [stack_top] "r" ((uint8_t *) kernel_uarg->uspace_stack +
+              kernel_uarg->uspace_stack_size),
+              [rflags] "r" (rflags),
+              [utext_des] "i" (GDT_SELECTOR(UTEXT_DES) | PL_USER),
+              [entry] "r" (kernel_uarg->uspace_entry),
+              [uarg] "r" (kernel_uarg->uspace_uarg)
+            : "rax"
         );
 
         /* Unreachable */
-        while (true);
+        while (true)
+                ;
 }