Changeset 98abd40 in mainline for uspace/lib/c/arch/ia32/src/fibril.S

Timestamp:

2013-07-06T21:57:22Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c8bb1633, cdc8a391

Parents:

b8e72fd1 (diff), 507c6f3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/lib/c/arch/ia32/src/fibril.S (modified) (3 diffs)

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