Changeset a5c78a18 in mainline for uspace/lib/c/arch/ia32

Timestamp:

2019-02-03T14:35:44Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

b4f1171

Parents:

67ca359

Message:

Rename context_t to context_t

<libarch/fibril_context.h> is included from <setjmp.h> where it can interfere
with identifiers used in third-party code.
The simplest solution here is just to prefix the names with double underscore
which is reserved for use by the implementation.

Location:

uspace/lib/c/arch/ia32

Files:

• include/libarch/fibril_context.h (modified) (3 diffs)
• src/fibril.S (modified) (2 diffs)

uspace/lib/c/arch/ia32/include/libarch/fibril_context.h

@@ -30 +30 @@
 #define LIBC_ARCH_FIBRIL_CONTEXT_H_
 
-#define CONTEXT_OFFSET_SP   0x00
-#define CONTEXT_OFFSET_PC   0x04
-#define CONTEXT_OFFSET_EBX  0x08
-#define CONTEXT_OFFSET_ESI  0x0c
-#define CONTEXT_OFFSET_EDI  0x10
-#define CONTEXT_OFFSET_EBP  0x14
-#define CONTEXT_OFFSET_TLS  0x18
-#define CONTEXT_SIZE        0x1c
+#define __CONTEXT_OFFSET_SP   0x00
+#define __CONTEXT_OFFSET_PC   0x04
+#define __CONTEXT_OFFSET_EBX  0x08
+#define __CONTEXT_OFFSET_ESI  0x0c
+#define __CONTEXT_OFFSET_EDI  0x10
+#define __CONTEXT_OFFSET_EBP  0x14
+#define __CONTEXT_OFFSET_TLS  0x18
+#define __CONTEXT_SIZE        0x1c
 
 #ifndef __ASSEMBLER__
@@ -44 +44 @@
 
 /* We include only registers that must be preserved during function call. */
-typedef struct context {
+typedef struct __context {
         uint32_t sp;
         uint32_t pc;
@@ -52 +52 @@
         uint32_t ebp;
         uint32_t tls;
-} context_t;
+} __context_t;
 
 #endif

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

@@ -42 +42 @@
 
         # 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
@@ -67 +67 @@
 
         # 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