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

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (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.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

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

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

@@ -37 +37 @@
 # pointed by the 1st argument. Returns 0 in EAX.
 #
-FUNCTION_BEGIN(__setjmp)
+FUNCTION_BEGIN(__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 %esp, CONTEXT_OFFSET_SP(%edx)      # %esp -> ctx->sp
-        movl %eax, CONTEXT_OFFSET_PC(%edx)      # %eip -> ctx->pc
-        movl %ebx, CONTEXT_OFFSET_EBX(%edx)     # %ebx -> ctx->ebx
-        movl %esi, CONTEXT_OFFSET_ESI(%edx)     # %esi -> ctx->esi
-        movl %edi, CONTEXT_OFFSET_EDI(%edx)     # %edi -> ctx->edi
-        movl %ebp, CONTEXT_OFFSET_EBP(%edx)     # %ebp -> ctx->ebp
+        movl %esp, __CONTEXT_OFFSET_SP(%edx)    # %esp -> ctx->sp
+        movl %eax, __CONTEXT_OFFSET_PC(%edx)    # %eip -> ctx->pc
+        movl %ebx, __CONTEXT_OFFSET_EBX(%edx)   # %ebx -> ctx->ebx
+        movl %esi, __CONTEXT_OFFSET_ESI(%edx)   # %esi -> ctx->esi
+        movl %edi, __CONTEXT_OFFSET_EDI(%edx)   # %edi -> ctx->edi
+        movl %ebp, __CONTEXT_OFFSET_EBP(%edx)   # %ebp -> ctx->ebp
 
         # save TLS
         movl %gs:0, %eax
-        movl %eax, CONTEXT_OFFSET_TLS(%edx)     # tls -> ctx->tls
+        movl %eax, __CONTEXT_OFFSET_TLS(%edx)   # tls -> ctx->tls
 
-        xorl %eax, %eax         # __setjmp returns 0
+        xorl %eax, %eax         # __context_save returns 0
         ret
-FUNCTION_END(__setjmp)
+FUNCTION_END(__context_save)
 
 ## Restore saved CPU context
@@ -62 +62 @@
 # pointed by the 1st argument. Returns second argument in EAX.
 #
-FUNCTION_BEGIN(__longjmp)
+FUNCTION_BEGIN(__context_restore)
         movl 4(%esp), %eax  # address of the context variable to restore context from
         movl 8(%esp), %ecx  # return value
 
         # restore registers from the context structure
-        movl CONTEXT_OFFSET_SP(%eax),%esp       # ctx->sp -> %esp
-        movl CONTEXT_OFFSET_PC(%eax),%edx       # ctx->pc -> \pc
-        movl CONTEXT_OFFSET_EBX(%eax),%ebx      # ctx->ebx -> %ebx
-        movl CONTEXT_OFFSET_ESI(%eax),%esi      # ctx->esi -> %esi
-        movl CONTEXT_OFFSET_EDI(%eax),%edi      # ctx->edi -> %edi
-        movl CONTEXT_OFFSET_EBP(%eax),%ebp      # ctx->ebp -> %ebp
+        movl __CONTEXT_OFFSET_SP(%eax),%esp     # ctx->sp -> %esp
+        movl __CONTEXT_OFFSET_PC(%eax),%edx     # ctx->pc -> \pc
+        movl __CONTEXT_OFFSET_EBX(%eax),%ebx    # ctx->ebx -> %ebx
+        movl __CONTEXT_OFFSET_ESI(%eax),%esi    # ctx->esi -> %esi
+        movl __CONTEXT_OFFSET_EDI(%eax),%edi    # ctx->edi -> %edi
+        movl __CONTEXT_OFFSET_EBP(%eax),%ebp    # ctx->ebp -> %ebp
 
         movl %edx, 0(%esp)  # ctx->pc -> saver's return %eip
 
         # set thread local storage
-        movl CONTEXT_OFFSET_TLS(%eax), %edx     # Set arg1 to TLS addr
+        movl __CONTEXT_OFFSET_TLS(%eax), %edx   # Set arg1 to TLS addr
         movl %edx, %gs:0
 
         movl %ecx, %eax
         ret
-FUNCTION_END(__longjmp)
+FUNCTION_END(__context_restore)