Changeset 1c99eae in mainline

Timestamp:

2011-08-19T16:59:55Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b76a7329

Parents:

45059d6b

Message:

cstyle
(no change in functionality)

Files:

• HelenOS.config (modified) (1 diff)
• kernel/arch/ia32/Makefile.inc (modified) (2 diffs)
• kernel/arch/ia32/include/asm.h (modified) (2 diffs)
• kernel/arch/ia32/src/asm.S (modified) (1 diff)
• kernel/arch/ia32/src/syscall.c (modified) (2 diffs)
• uspace/lib/c/arch/ia32/Makefile.common (modified) (1 diff)
• uspace/lib/c/arch/ia32/src/entry.S (modified) (2 diffs)

HelenOS.config

@@ -70 +70 @@
 @ "pentium4" Pentium 4
 @ "pentium3" Pentium 3
-@ "i486" i486
 @ "core" Core Solo/Duo
 @ "athlon_xp" Athlon XP
 @ "athlon_mp" Athlon MP
+@ "i486" i486
 ! [PLATFORM=ia32] PROCESSOR (choice)
 

kernel/arch/ia32/Makefile.inc

@@ -44 +44 @@
 #
 
+ifeq ($(PROCESSOR),i486)
+        CMN2 = -march=i486
+endif
+
 ifeq ($(PROCESSOR),athlon_xp)
         CMN2 = -march=athlon-xp
@@ -62 +66 @@
         CMN2 = -march=pentium4
         SUNCC_CFLAGS += -xarch=sse2
-endif
-
-ifeq ($(PROCESSOR),i486)
-        CMN2 = -march=i486
 endif
 

kernel/arch/ia32/include/asm.h

@@ -312 +312 @@
 
 #ifndef PROCESSOR_i486
+
 /** Write to MSR */
 NO_TRACE static inline void write_msr(uint32_t msr, uint64_t value)
@@ -336 +337 @@
         return ((uint64_t) dx << 32) | ax;
 }
-#endif
+
+#endif /* PROCESSOR_i486 */
 
 

kernel/arch/ia32/src/asm.S

@@ -407 +407 @@
 #ifdef PROCESSOR_i486
         jz 0f
-        movl %eax, %ebp
-0:
+                movl %eax, %ebp
+        0:
 #else
         cmovnzl %eax, %ebp

kernel/arch/ia32/src/syscall.c

@@ -40 +40 @@
 
 #ifndef PROCESSOR_i486
+
 /** Enable & setup support for SYSENTER/SYSEXIT */
 void syscall_setup_cpu(void)
@@ -50 +51 @@
         write_msr(IA32_MSR_SYSENTER_EIP, (uint32_t) sysenter_handler);
 }
-#endif
+
+#endif /* PROCESSOR_i486 */
 
 /** @}

uspace/lib/c/arch/ia32/Makefile.common

@@ -28 +28 @@
 
 CLANG_ARCH = i386
+
 ifeq ($(PROCESSOR),i486)
-GCC_CFLAGS += -march=i486 -fno-omit-frame-pointer
+        GCC_CFLAGS += -march=i486 -fno-omit-frame-pointer
 else
-GCC_CFLAGS += -march=pentium -fno-omit-frame-pointer
+        GCC_CFLAGS += -march=pentium -fno-omit-frame-pointer
 endif
 

uspace/lib/c/arch/ia32/src/entry.S

@@ -46 +46 @@
         mov %ax, %fs
         # Do not set %gs, it contains descriptor that can see TLS
-
+        
 #ifndef PROCESSOR_i486  
         # Detect the mechanism used for making syscalls
@@ -53 +53 @@
         bt $(INTEL_SEP), %edx
         jnc 0f
-        leal __syscall_fast_func, %eax
-        movl $__syscall_fast, (%eax)
-0:
+                leal __syscall_fast_func, %eax
+                movl $__syscall_fast, (%eax)
+        0:
 #endif
+        
         #
         # Create the first stack frame.