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

Timestamp:

2019-02-03T14:35:44Z (6 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/amd64

Files:

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

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

@@ -30 +30 @@
 #define LIBC_ARCH_FIBRIL_CONTEXT_H_
 
-#define CONTEXT_OFFSET_SP   0x00
-#define CONTEXT_OFFSET_PC   0x08
-#define CONTEXT_OFFSET_RBX  0x10
-#define CONTEXT_OFFSET_RBP  0x18
-#define CONTEXT_OFFSET_R12  0x20
-#define CONTEXT_OFFSET_R13  0x28
-#define CONTEXT_OFFSET_R14  0x30
-#define CONTEXT_OFFSET_R15  0x38
-#define CONTEXT_OFFSET_TLS  0x40
-#define CONTEXT_SIZE        0x48
+#define __CONTEXT_OFFSET_SP   0x00
+#define __CONTEXT_OFFSET_PC   0x08
+#define __CONTEXT_OFFSET_RBX  0x10
+#define __CONTEXT_OFFSET_RBP  0x18
+#define __CONTEXT_OFFSET_R12  0x20
+#define __CONTEXT_OFFSET_R13  0x28
+#define __CONTEXT_OFFSET_R14  0x30
+#define __CONTEXT_OFFSET_R15  0x38
+#define __CONTEXT_OFFSET_TLS  0x40
+#define __CONTEXT_SIZE        0x48
 
 #ifndef __ASSEMBLER__
@@ -45 +45 @@
 #include <stdint.h>
 
-typedef struct context {
+typedef struct __context {
         /*
          * We include only registers that must be preserved
@@ -59 +59 @@
         uint64_t r15;
         uint64_t tls;
-} context_t;
+} __context_t;
 
 #endif

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

@@ -41 +41 @@
 
         # in %rdi is passed 1st argument
-        movq %rdx, CONTEXT_OFFSET_PC(%rdi)
-        movq %rsp, CONTEXT_OFFSET_SP(%rdi)
+        movq %rdx, __CONTEXT_OFFSET_PC(%rdi)
+        movq %rsp, __CONTEXT_OFFSET_SP(%rdi)
 
-        movq %rbx, CONTEXT_OFFSET_RBX(%rdi)
-        movq %rbp, CONTEXT_OFFSET_RBP(%rdi)
-        movq %r12, CONTEXT_OFFSET_R12(%rdi)
-        movq %r13, CONTEXT_OFFSET_R13(%rdi)
-        movq %r14, CONTEXT_OFFSET_R14(%rdi)
-        movq %r15, CONTEXT_OFFSET_R15(%rdi)
+        movq %rbx, __CONTEXT_OFFSET_RBX(%rdi)
+        movq %rbp, __CONTEXT_OFFSET_RBP(%rdi)
+        movq %r12, __CONTEXT_OFFSET_R12(%rdi)
+        movq %r13, __CONTEXT_OFFSET_R13(%rdi)
+        movq %r14, __CONTEXT_OFFSET_R14(%rdi)
+        movq %r15, __CONTEXT_OFFSET_R15(%rdi)
 
         movq %fs:0, %rax
-        movq %rax, CONTEXT_OFFSET_TLS(%rdi)
+        movq %rax, __CONTEXT_OFFSET_TLS(%rdi)
 
         xorq %rax, %rax                      # __setjmp returns 0
@@ -64 +64 @@
 #
 FUNCTION_BEGIN(__longjmp)
-        movq CONTEXT_OFFSET_R15(%rdi), %r15
-        movq CONTEXT_OFFSET_R14(%rdi), %r14
-        movq CONTEXT_OFFSET_R13(%rdi), %r13
-        movq CONTEXT_OFFSET_R12(%rdi), %r12
-        movq CONTEXT_OFFSET_RBP(%rdi), %rbp
-        movq CONTEXT_OFFSET_RBX(%rdi), %rbx
+        movq __CONTEXT_OFFSET_R15(%rdi), %r15
+        movq __CONTEXT_OFFSET_R14(%rdi), %r14
+        movq __CONTEXT_OFFSET_R13(%rdi), %r13
+        movq __CONTEXT_OFFSET_R12(%rdi), %r12
+        movq __CONTEXT_OFFSET_RBP(%rdi), %rbp
+        movq __CONTEXT_OFFSET_RBX(%rdi), %rbx
 
-        movq CONTEXT_OFFSET_SP(%rdi), %rsp   # ctx->sp -> %rsp
+        movq __CONTEXT_OFFSET_SP(%rdi), %rsp   # ctx->sp -> %rsp
 
-        movq CONTEXT_OFFSET_PC(%rdi), %rdx
+        movq __CONTEXT_OFFSET_PC(%rdi), %rdx
 
         movq %rdx,(%rsp)
 
-        movq CONTEXT_OFFSET_TLS(%rdi), %rdi
+        movq __CONTEXT_OFFSET_TLS(%rdi), %rdi
         movq %rdi, %fs:0