Changeset 2b903ca in mainline

Timestamp:

2013-05-30T22:26:46Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

9ce0683

Parents:

45b4300

Message:

cstyle

Location:

uspace/lib/c/arch/ia32/src

Files:

• entry.S (modified) (1 diff)
• entryjmp.s (modified) (1 diff)
• fibril.S (modified) (3 diffs)
• setjmp.S (modified) (2 diffs)
• thread_entry.s (modified) (2 diffs)

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

@@ -47 +47 @@
         # Do not set %gs, it contains descriptor that can see TLS
         
-#ifndef PROCESSOR_i486  
+#ifndef PROCESSOR_i486
         # Detect the mechanism used for making syscalls
         movl $(INTEL_CPUID_STANDARD), %eax

uspace/lib/c/arch/ia32/src/entryjmp.s

@@ -36 +36 @@
         push %ebp
         movl %esp, %ebp
-
+        
         # %eax := entry_point
         movl 0x8(%ebp), %eax
-
+        
         # %edi := pcb
         # pcb is passed to the entry point in %edi
         mov 0xc(%ebp), %edi
-
+        
         # Save a tiny bit of stack space
         pop %ebp
-
+        
         jmp *%eax

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

@@ -34 +34 @@
 .global context_restore
 
-
 ## Save current CPU context
 #
@@ -41 +40 @@
 #
 context_save:
-        movl 0(%esp),%eax       # the caller's return %eip
-        movl 4(%esp),%edx       # address of the context variable to save context to
-
-                # save registers to the context structure
+        movl 0(%esp), %eax  # the caller's return %eip
+        movl 4(%esp), %edx  # address of the context variable to save context to
+        
+        # save registers to the context structure
         CONTEXT_SAVE_ARCH_CORE %edx %eax
-
-        # Save TLS
+        
+        # save TLS
         movl %gs:0, %eax
         movl %eax, OFFSET_TLS(%edx)     # tls -> ctx->tls
         
-        xorl %eax,%eax          # context_save returns 1
+        xorl %eax, %eax     # context_save returns 1
         incl %eax
         ret
-
 
 ## Restore saved CPU context
@@ -62 +60 @@
 #
 context_restore:
-        movl 4(%esp),%eax       # address of the context variable to restore context from
-
-                # restore registers from the context structure
+        movl 4(%esp), %eax  # address of the context variable to restore context from
+        
+        # restore registers from the context structure
         CONTEXT_RESTORE_ARCH_CORE %eax %edx
-
-        movl %edx,0(%esp)       # ctx->pc -> saver's return %eip
-
-        # Set thread local storage
+        
+        movl %edx, 0(%esp)  # ctx->pc -> saver's return %eip
+        
+        # set thread local storage
         pushl %edx
-        movl OFFSET_TLS(%eax), %edx   # Set arg1 to TLS addr
-        movl $1, %eax         # Syscall SYS_TLS_SET
+        movl OFFSET_TLS(%eax), %edx  # Set arg1 to TLS addr
+        movl $1, %eax                # Syscall SYS_TLS_SET
         int $0x30
         popl %edx
         
-        xorl %eax,%eax          # context_restore returns 0
+        xorl %eax, %eax     # context_restore returns 0
         ret

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

@@ -35 +35 @@
 .type setjmp,@function
 setjmp:
-        movl 0(%esp),%eax  # save pc value into eax
-        movl 4(%esp),%edx  # address of the jmp_buf structure to save context to
+        movl 0(%esp), %eax  # save pc value into eax
+        movl 4(%esp), %edx  # address of the jmp_buf structure to save context to
         
         # save registers to the jmp_buf structure
         CONTEXT_SAVE_ARCH_CORE %edx %eax
         
-        xorl %eax,%eax  # set_jmp returns 0
+        xorl %eax, %eax     # set_jmp returns 0
         ret
 
@@ -52 +52 @@
         CONTEXT_RESTORE_ARCH_CORE %ecx %edx
         
-        movl %edx,0(%esp)  # put saved pc on stack
+        movl %edx, 0(%esp)  # put saved pc on stack
         ret

uspace/lib/c/arch/ia32/src/thread_entry.s

@@ -40 +40 @@
         mov %dx, %fs
         # Do not set %gs, it contains descriptor that can see TLS
-
+        
         #
         # Create the first stack frame.
@@ -46 +46 @@
         pushl $0
         mov %esp, %ebp
-
+        
         #
         # EAX contains address of uarg.