Changeset 3bacee1 in mainline for kernel/arch/ia32/include

Timestamp:

2018-04-12T16:27:17Z (8 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.

File:

• kernel/arch/ia32/include/arch/asm.h (modified) (19 diffs)

kernel/arch/ia32/include/arch/asm.h

@@ -52 +52 @@
         while (true) {
                 asm volatile (
-                        "hlt\n"
+                    "hlt\n"
                 );
         }
@@ -60 +60 @@
 {
         asm volatile (
-                "hlt\n"
+            "hlt\n"
         );
 }
@@ -117 +117 @@
         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
@@ -136 +136 @@
         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
@@ -155 +155 @@
         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
@@ -176 +176 @@
 
                 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)
                 );
 
@@ -200 +200 @@
 
                 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)
                 );
 
@@ -224 +224 @@
 
                 asm volatile (
-                        "inl %w[port], %[val]\n"
-                        : [val] "=a" (val)
-                        : [port] "d" (port)
+                    "inl %w[port], %[val]\n"
+                    : [val] "=a" (val)
+                    : [port] "d" (port)
                 );
 
@@ -239 +239 @@
 
         asm volatile (
-                "pushf\n"
-                "popl %[v]\n"
-                : [v] "=r" (eflags)
+            "pushf\n"
+            "popl %[v]\n"
+            : [v] "=r" (eflags)
         );
 
@@ -250 +250 @@
 {
         asm volatile (
-                "pushl %[v]\n"
-                "popf\n"
-                :: [v] "r" (eflags)
+            "pushl %[v]\n"
+            "popf\n"
+            :: [v] "r" (eflags)
         );
 }
@@ -326 +326 @@
 {
         asm volatile (
-                "wrmsr"
-                :: "c" (msr),
-                   "a" ((uint32_t) (value)),
-                   "d" ((uint32_t) (value >> 32))
+            "wrmsr"
+            :: "c" (msr),
+              "a" ((uint32_t) (value)),
+              "d" ((uint32_t) (value >> 32))
         );
 }
@@ -338 +338 @@
 
         asm volatile (
-                "rdmsr"
-                : "=a" (ax),
-                  "=d" (dx)
-                : "c" (msr)
+            "rdmsr"
+            : "=a" (ax),
+              "=d" (dx)
+            : "c" (msr)
         );
 
@@ -362 +362 @@
 
         asm volatile (
-                "andl %%esp, %[v]\n"
-                : [v] "=r" (v)
-                : "0" (~(STACK_SIZE - 1))
+            "andl %%esp, %[v]\n"
+            : [v] "=r" (v)
+            : "0" (~(STACK_SIZE - 1))
         );
 
@@ -378 +378 @@
 {
         asm volatile (
-                "invlpg %[addr]\n"
-                :: [addr] "m" (*(sysarg_t *) addr)
+            "invlpg %[addr]\n"
+            :: [addr] "m" (*(sysarg_t *) addr)
         );
 }
@@ -391 +391 @@
 {
         asm volatile (
-                "lgdtl %[gdtr_reg]\n"
-                :: [gdtr_reg] "m" (*gdtr_reg)
+            "lgdtl %[gdtr_reg]\n"
+            :: [gdtr_reg] "m" (*gdtr_reg)
         );
 }
@@ -404 +404 @@
 {
         asm volatile (
-                "sgdtl %[gdtr_reg]\n"
-                : [gdtr_reg] "=m" (*gdtr_reg)
+            "sgdtl %[gdtr_reg]\n"
+            : [gdtr_reg] "=m" (*gdtr_reg)
         );
 }
@@ -417 +417 @@
 {
         asm volatile (
-                "lidtl %[idtr_reg]\n"
-                :: [idtr_reg] "m" (*idtr_reg)
+            "lidtl %[idtr_reg]\n"
+            :: [idtr_reg] "m" (*idtr_reg)
         );
 }
@@ -430 +430 @@
 {
         asm volatile (
-                "ltr %[sel]"
-                :: [sel] "r" (sel)
+            "ltr %[sel]"
+            :: [sel] "r" (sel)
         );
 }
@@ -443 +443 @@
 {
         asm volatile (
-                "mov %[sel], %%gs"
-                :: [sel] "r" (sel)
+            "mov %[sel], %%gs"
+            :: [sel] "r" (sel)
         );
 }