Changeset 3bacee1 in mainline for kernel/arch/amd64

Timestamp:

2018-04-12T16:27:17Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3cf22f9

Parents:

76d0981d

git-author:

Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)

Message:

Make ccheck-fix again and commit more good files.

Location:

kernel/arch/amd64

Files:

• include/arch/asm.h (modified) (18 diffs)
• src/amd64.c (modified) (1 diff)

kernel/arch/amd64/include/arch/asm.h

@@ -55 +55 @@
 
         asm volatile (
-                "andq %%rsp, %[v]\n"
-                : [v] "=r" (v)
-                : "0" (~((uint64_t) STACK_SIZE - 1))
+            "andq %%rsp, %[v]\n"
+            : [v] "=r" (v)
+            : "0" (~((uint64_t) STACK_SIZE - 1))
         );
 
@@ -66 +66 @@
 {
         asm volatile (
-                "hlt\n"
+            "hlt\n"
         );
 }
@@ -74 +74 @@
         while (true) {
                 asm volatile (
-                        "hlt\n"
+                    "hlt\n"
                 );
         }
@@ -93 +93 @@
 
                 asm volatile (
-                        "inb %w[port], %b[val]\n"
-                        : [val] "=a" (val)
-                        : [port] "d" (port)
+                    "inb %w[port], %b[val]\n"
+                    : [val] "=a" (val)
+                    : [port] "d" (port)
                 );
 
@@ -117 +117 @@
 
                 asm volatile (
-                        "inw %w[port], %w[val]\n"
-                        : [val] "=a" (val)
-                        : [port] "d" (port)
+                    "inw %w[port], %w[val]\n"
+                    : [val] "=a" (val)
+                    : [port] "d" (port)
                 );
 
@@ -141 +141 @@
 
                 asm volatile (
-                        "inl %w[port], %[val]\n"
-                        : [val] "=a" (val)
-                        : [port] "d" (port)
+                    "inl %w[port], %[val]\n"
+                    : [val] "=a" (val)
+                    : [port] "d" (port)
                 );
 
@@ -163 +163 @@
         if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
                 asm volatile (
-                        "outb %b[val], %w[port]\n"
-                        :: [val] "a" (val), [port] "d" (port)
+                    "outb %b[val], %w[port]\n"
+                    :: [val] "a" (val), [port] "d" (port)
                 );
         } else
@@ -182 +182 @@
         if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
                 asm volatile (
-                        "outw %w[val], %w[port]\n"
-                        :: [val] "a" (val), [port] "d" (port)
+                    "outw %w[val], %w[port]\n"
+                    :: [val] "a" (val), [port] "d" (port)
                 );
         } else
@@ -201 +201 @@
         if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
                 asm volatile (
-                        "outl %[val], %w[port]\n"
-                        :: [val] "a" (val), [port] "d" (port)
+                    "outl %[val], %w[port]\n"
+                    :: [val] "a" (val), [port] "d" (port)
                 );
         } else
@@ -213 +213 @@
 
         asm volatile (
-                "pushfq\n"
-                "popq %[v]\n"
-                : [v] "=r" (rflags)
+            "pushfq\n"
+            "popq %[v]\n"
+            : [v] "=r" (rflags)
         );
 
@@ -224 +224 @@
 {
         asm volatile (
-                "pushq %[v]\n"
-                "popfq\n"
-                :: [v] "r" (rflags)
+            "pushq %[v]\n"
+            "popfq\n"
+            :: [v] "r" (rflags)
         );
 }
@@ -300 +300 @@
 {
         asm volatile (
-                "wrmsr\n"
-                :: "c" (msr),
-                   "a" ((uint32_t) (value)),
-                   "d" ((uint32_t) (value >> 32))
+            "wrmsr\n"
+            :: "c" (msr),
+              "a" ((uint32_t) (value)),
+              "d" ((uint32_t) (value >> 32))
         );
 }
@@ -312 +312 @@
 
         asm volatile (
-                "rdmsr\n"
-                : "=a" (ax), "=d" (dx)
-                : "c" (msr)
+            "rdmsr\n"
+            : "=a" (ax), "=d" (dx)
+            : "c" (msr)
         );
 
@@ -328 +328 @@
 {
         asm volatile (
-                "invlpg %[addr]\n"
-                :: [addr] "m" (*((sysarg_t *) addr))
+            "invlpg %[addr]\n"
+            :: [addr] "m" (*((sysarg_t *) addr))
         );
 }
@@ -341 +341 @@
 {
         asm volatile (
-                "lgdtq %[gdtr_reg]\n"
-                :: [gdtr_reg] "m" (*gdtr_reg)
+            "lgdtq %[gdtr_reg]\n"
+            :: [gdtr_reg] "m" (*gdtr_reg)
         );
 }
@@ -354 +354 @@
 {
         asm volatile (
-                "sgdtq %[gdtr_reg]\n"
-                :: [gdtr_reg] "m" (*gdtr_reg)
+            "sgdtq %[gdtr_reg]\n"
+            :: [gdtr_reg] "m" (*gdtr_reg)
         );
 }
@@ -367 +367 @@
 {
         asm volatile (
-                "lidtq %[idtr_reg]\n"
-                :: [idtr_reg] "m" (*idtr_reg));
+            "lidtq %[idtr_reg]\n"
+            :: [idtr_reg] "m" (*idtr_reg));
 }
 
@@ -379 +379 @@
 {
         asm volatile (
-                "ltr %[sel]"
-                :: [sel] "r" (sel)
+            "ltr %[sel]"
+            :: [sel] "r" (sel)
         );
 }

kernel/arch/amd64/src/amd64.c

@@ -215 +215 @@
         outdev_t **ns16550_out_ptr = NULL;
 #endif
-        ns16550_instance_t *ns16550_instance
-            = ns16550_init(NS16550_BASE, 0, IRQ_NS16550, NULL, NULL,
+        ns16550_instance_t *ns16550_instance =
+            ns16550_init(NS16550_BASE, 0, IRQ_NS16550, NULL, NULL,
             ns16550_out_ptr);
         if (ns16550_instance) {