Changeset e98f1c3e in mainline for kernel/arch/ia32

Timestamp:

2016-08-28T11:49:38Z (9 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

3f4c537a

Parents:

db4c43e1

Message:

cstyle (no change in functionality)

Location:

kernel/arch/ia32

Files:

• include/arch/asm.h (modified) (3 diffs)
• include/arch/cpuid.h (modified) (1 diff)
• src/context.S (modified) (1 diff)
• src/ia32.c (modified) (1 diff)
• src/smp/ap.S (modified) (2 diffs)

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

@@ -259 +259 @@
  *
  * @return Current interrupt priority level.
+ *
  */
 NO_TRACE static inline ipl_t interrupts_read(void)
@@ -270 +271 @@
  *
  * @return Old interrupt priority level.
+ *
  */
 NO_TRACE static inline ipl_t interrupts_enable(void)
@@ -285 +287 @@
  *
  * @return Old interrupt priority level.
+ *
  */
 NO_TRACE static inline ipl_t interrupts_disable(void)

kernel/arch/ia32/include/arch/cpuid.h

@@ -85 +85 @@
         
         asm volatile (
-                "pushf\n"                       /* read flags */
+                "pushf\n"                      /* read flags */
                 "popl %[ret]\n"
                 "movl %[ret], %[val]\n"
                 
-                "xorl %[eflags_id], %[val]\n"   /* swap the ID bit */
+                "xorl %[eflags_id], %[val]\n"  /* swap the ID bit */
                 
-                "pushl %[val]\n"                /* propagate the change into flags */
+                "pushl %[val]\n"               /* propagate the change into flags */
                 "popf\n"
                 "pushf\n"
                 "popl %[val]\n"
                 
-                "andl %[eflags_id], %[ret]\n"   /* interrested only in ID bit */
+                "andl %[eflags_id], %[ret]\n"  /* interrested only in ID bit */
                 "andl %[eflags_id], %[val]\n"
                 "xorl %[val], %[ret]\n"

kernel/arch/ia32/src/context.S

@@ -59 +59 @@
 FUNCTION_END(context_save_arch)
 
-
 ## Restore saved CPU context
 #

kernel/arch/ia32/src/ia32.c

@@ -143 +143 @@
                 zone_merge_all();
         }
-
 }
 

kernel/arch/ia32/src/smp/ap.S

@@ -75 +75 @@
         movw %ax, %es
         movw %ax, %ss
-        movl $KA2PA(ctx), %eax          /* KA2PA((uintptr_t) &ctx) */
+        movl $KA2PA(ctx), %eax          /* KA2PA((uintptr_t) &ctx) */
         movl CONTEXT_OFFSET_SP(%eax), %esp
-        leal KA2PA(0)(%esp), %esp       /* KA2PA(ctx.sp) */
+        leal KA2PA(0)(%esp), %esp       /* KA2PA(ctx.sp) */
 
         /*
@@ -85 +85 @@
         call map_kernel_pse
         
-        addl $PA2KA(0), %esp            /* PA2KA(ctx.sp) */
+        addl $PA2KA(0), %esp            /* PA2KA(ctx.sp) */
         
         /* create the first stack frame */