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

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/sparc64

Files:

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

uspace/lib/c/arch/sparc64/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_I0  0x10
-#define CONTEXT_OFFSET_I1  0x18
-#define CONTEXT_OFFSET_I2  0x20
-#define CONTEXT_OFFSET_I3  0x28
-#define CONTEXT_OFFSET_I4  0x30
-#define CONTEXT_OFFSET_I5  0x38
-#define CONTEXT_OFFSET_FP  0x40
-#define CONTEXT_OFFSET_I7  0x48
-#define CONTEXT_OFFSET_L0  0x50
-#define CONTEXT_OFFSET_L1  0x58
-#define CONTEXT_OFFSET_L2  0x60
-#define CONTEXT_OFFSET_L3  0x68
-#define CONTEXT_OFFSET_L4  0x70
-#define CONTEXT_OFFSET_L5  0x78
-#define CONTEXT_OFFSET_L6  0x80
-#define CONTEXT_OFFSET_L7  0x88
-#define CONTEXT_OFFSET_TP  0x90
-#define CONTEXT_SIZE       0x98
+#define __CONTEXT_OFFSET_SP  0x00
+#define __CONTEXT_OFFSET_PC  0x08
+#define __CONTEXT_OFFSET_I0  0x10
+#define __CONTEXT_OFFSET_I1  0x18
+#define __CONTEXT_OFFSET_I2  0x20
+#define __CONTEXT_OFFSET_I3  0x28
+#define __CONTEXT_OFFSET_I4  0x30
+#define __CONTEXT_OFFSET_I5  0x38
+#define __CONTEXT_OFFSET_FP  0x40
+#define __CONTEXT_OFFSET_I7  0x48
+#define __CONTEXT_OFFSET_L0  0x50
+#define __CONTEXT_OFFSET_L1  0x58
+#define __CONTEXT_OFFSET_L2  0x60
+#define __CONTEXT_OFFSET_L3  0x68
+#define __CONTEXT_OFFSET_L4  0x70
+#define __CONTEXT_OFFSET_L5  0x78
+#define __CONTEXT_OFFSET_L6  0x80
+#define __CONTEXT_OFFSET_L7  0x88
+#define __CONTEXT_OFFSET_TP  0x90
+#define __CONTEXT_SIZE       0x98
 
 #ifndef __ASSEMBLER__
@@ -56 +56 @@
 #include <stdint.h>
 
-typedef struct context {
+typedef struct __context {
         uintptr_t sp;  // %o6
         uintptr_t pc;  // %o7
@@ -76 +76 @@
         uint64_t l7;
         uint64_t tp;  // %g7
-} context_t;
+} __context_t;
 
 #endif

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

@@ -37 +37 @@
         # should a thread switch occur.
         #
-        stx %sp, [%o0 + CONTEXT_OFFSET_SP]
-        stx %o7, [%o0 + CONTEXT_OFFSET_PC]
-        stx %i0, [%o0 + CONTEXT_OFFSET_I0]
-        stx %i1, [%o0 + CONTEXT_OFFSET_I1]
-        stx %i2, [%o0 + CONTEXT_OFFSET_I2]
-        stx %i3, [%o0 + CONTEXT_OFFSET_I3]
-        stx %i4, [%o0 + CONTEXT_OFFSET_I4]
-        stx %i5, [%o0 + CONTEXT_OFFSET_I5]
-        stx %fp, [%o0 + CONTEXT_OFFSET_FP]
-        stx %i7, [%o0 + CONTEXT_OFFSET_I7]
-        stx %l0, [%o0 + CONTEXT_OFFSET_L0]
-        stx %l1, [%o0 + CONTEXT_OFFSET_L1]
-        stx %l2, [%o0 + CONTEXT_OFFSET_L2]
-        stx %l3, [%o0 + CONTEXT_OFFSET_L3]
-        stx %l4, [%o0 + CONTEXT_OFFSET_L4]
-        stx %l5, [%o0 + CONTEXT_OFFSET_L5]
-        stx %l6, [%o0 + CONTEXT_OFFSET_L6]
-        stx %l7, [%o0 + CONTEXT_OFFSET_L7]
-        stx %g7, [%o0 + CONTEXT_OFFSET_TP]
+        stx %sp, [%o0 + __CONTEXT_OFFSET_SP]
+        stx %o7, [%o0 + __CONTEXT_OFFSET_PC]
+        stx %i0, [%o0 + __CONTEXT_OFFSET_I0]
+        stx %i1, [%o0 + __CONTEXT_OFFSET_I1]
+        stx %i2, [%o0 + __CONTEXT_OFFSET_I2]
+        stx %i3, [%o0 + __CONTEXT_OFFSET_I3]
+        stx %i4, [%o0 + __CONTEXT_OFFSET_I4]
+        stx %i5, [%o0 + __CONTEXT_OFFSET_I5]
+        stx %fp, [%o0 + __CONTEXT_OFFSET_FP]
+        stx %i7, [%o0 + __CONTEXT_OFFSET_I7]
+        stx %l0, [%o0 + __CONTEXT_OFFSET_L0]
+        stx %l1, [%o0 + __CONTEXT_OFFSET_L1]
+        stx %l2, [%o0 + __CONTEXT_OFFSET_L2]
+        stx %l3, [%o0 + __CONTEXT_OFFSET_L3]
+        stx %l4, [%o0 + __CONTEXT_OFFSET_L4]
+        stx %l5, [%o0 + __CONTEXT_OFFSET_L5]
+        stx %l6, [%o0 + __CONTEXT_OFFSET_L6]
+        stx %l7, [%o0 + __CONTEXT_OFFSET_L7]
+        stx %g7, [%o0 + __CONTEXT_OFFSET_TP]
         retl
         mov 0, %o0              ! __setjmp returns 0
@@ -69 +69 @@
         flushw
 
-        ldx [%o0 + CONTEXT_OFFSET_SP], %sp
-        ldx [%o0 + CONTEXT_OFFSET_PC], %o7
-        ldx [%o0 + CONTEXT_OFFSET_I0], %i0
-        ldx [%o0 + CONTEXT_OFFSET_I1], %i1
-        ldx [%o0 + CONTEXT_OFFSET_I2], %i2
-        ldx [%o0 + CONTEXT_OFFSET_I3], %i3
-        ldx [%o0 + CONTEXT_OFFSET_I4], %i4
-        ldx [%o0 + CONTEXT_OFFSET_I5], %i5
-        ldx [%o0 + CONTEXT_OFFSET_FP], %fp
-        ldx [%o0 + CONTEXT_OFFSET_I7], %i7
-        ldx [%o0 + CONTEXT_OFFSET_L0], %l0
-        ldx [%o0 + CONTEXT_OFFSET_L1], %l1
-        ldx [%o0 + CONTEXT_OFFSET_L2], %l2
-        ldx [%o0 + CONTEXT_OFFSET_L3], %l3
-        ldx [%o0 + CONTEXT_OFFSET_L4], %l4
-        ldx [%o0 + CONTEXT_OFFSET_L5], %l5
-        ldx [%o0 + CONTEXT_OFFSET_L6], %l6
-        ldx [%o0 + CONTEXT_OFFSET_L7], %l7
-        ldx [%o0 + CONTEXT_OFFSET_TP], %g7
+        ldx [%o0 + __CONTEXT_OFFSET_SP], %sp
+        ldx [%o0 + __CONTEXT_OFFSET_PC], %o7
+        ldx [%o0 + __CONTEXT_OFFSET_I0], %i0
+        ldx [%o0 + __CONTEXT_OFFSET_I1], %i1
+        ldx [%o0 + __CONTEXT_OFFSET_I2], %i2
+        ldx [%o0 + __CONTEXT_OFFSET_I3], %i3
+        ldx [%o0 + __CONTEXT_OFFSET_I4], %i4
+        ldx [%o0 + __CONTEXT_OFFSET_I5], %i5
+        ldx [%o0 + __CONTEXT_OFFSET_FP], %fp
+        ldx [%o0 + __CONTEXT_OFFSET_I7], %i7
+        ldx [%o0 + __CONTEXT_OFFSET_L0], %l0
+        ldx [%o0 + __CONTEXT_OFFSET_L1], %l1
+        ldx [%o0 + __CONTEXT_OFFSET_L2], %l2
+        ldx [%o0 + __CONTEXT_OFFSET_L3], %l3
+        ldx [%o0 + __CONTEXT_OFFSET_L4], %l4
+        ldx [%o0 + __CONTEXT_OFFSET_L5], %l5
+        ldx [%o0 + __CONTEXT_OFFSET_L6], %l6
+        ldx [%o0 + __CONTEXT_OFFSET_L7], %l7
+        ldx [%o0 + __CONTEXT_OFFSET_TP], %g7
         retl
         mov %o1, %o0    ! __longjmp returns second argument