Changeset a5c78a18 in mainline for uspace/lib/c/arch/ppc32/src/fibril.S

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.

File:

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

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

@@ -34 +34 @@
 
 FUNCTION_BEGIN(__setjmp)
-        stw sp, CONTEXT_OFFSET_SP(r3)
-        stw r2, CONTEXT_OFFSET_TLS(r3)
-        stw r13, CONTEXT_OFFSET_R13(r3)
-        stw r14, CONTEXT_OFFSET_R14(r3)
-        stw r15, CONTEXT_OFFSET_R15(r3)
-        stw r16, CONTEXT_OFFSET_R16(r3)
-        stw r17, CONTEXT_OFFSET_R17(r3)
-        stw r18, CONTEXT_OFFSET_R18(r3)
-        stw r19, CONTEXT_OFFSET_R19(r3)
-        stw r20, CONTEXT_OFFSET_R20(r3)
-        stw r21, CONTEXT_OFFSET_R21(r3)
-        stw r22, CONTEXT_OFFSET_R22(r3)
-        stw r23, CONTEXT_OFFSET_R23(r3)
-        stw r24, CONTEXT_OFFSET_R24(r3)
-        stw r25, CONTEXT_OFFSET_R25(r3)
-        stw r26, CONTEXT_OFFSET_R26(r3)
-        stw r27, CONTEXT_OFFSET_R27(r3)
-        stw r28, CONTEXT_OFFSET_R28(r3)
-        stw r29, CONTEXT_OFFSET_R29(r3)
-        stw r30, CONTEXT_OFFSET_R30(r3)
-        stw r31, CONTEXT_OFFSET_R31(r3)
+        stw sp, __CONTEXT_OFFSET_SP(r3)
+        stw r2, __CONTEXT_OFFSET_TLS(r3)
+        stw r13, __CONTEXT_OFFSET_R13(r3)
+        stw r14, __CONTEXT_OFFSET_R14(r3)
+        stw r15, __CONTEXT_OFFSET_R15(r3)
+        stw r16, __CONTEXT_OFFSET_R16(r3)
+        stw r17, __CONTEXT_OFFSET_R17(r3)
+        stw r18, __CONTEXT_OFFSET_R18(r3)
+        stw r19, __CONTEXT_OFFSET_R19(r3)
+        stw r20, __CONTEXT_OFFSET_R20(r3)
+        stw r21, __CONTEXT_OFFSET_R21(r3)
+        stw r22, __CONTEXT_OFFSET_R22(r3)
+        stw r23, __CONTEXT_OFFSET_R23(r3)
+        stw r24, __CONTEXT_OFFSET_R24(r3)
+        stw r25, __CONTEXT_OFFSET_R25(r3)
+        stw r26, __CONTEXT_OFFSET_R26(r3)
+        stw r27, __CONTEXT_OFFSET_R27(r3)
+        stw r28, __CONTEXT_OFFSET_R28(r3)
+        stw r29, __CONTEXT_OFFSET_R29(r3)
+        stw r30, __CONTEXT_OFFSET_R30(r3)
+        stw r31, __CONTEXT_OFFSET_R31(r3)
 
         mflr r4
-        stw r4, CONTEXT_OFFSET_PC(r3)
+        stw r4, __CONTEXT_OFFSET_PC(r3)
 
         mfcr r4
-        stw r4, CONTEXT_OFFSET_CR(r3)
+        stw r4, __CONTEXT_OFFSET_CR(r3)
 
         # __setjmp returns 0
@@ -68 +68 @@
 
 FUNCTION_BEGIN(__longjmp)
-        lwz sp, CONTEXT_OFFSET_SP(r3)
-        lwz r2, CONTEXT_OFFSET_TLS(r3)
-        lwz r13, CONTEXT_OFFSET_R13(r3)
-        lwz r14, CONTEXT_OFFSET_R14(r3)
-        lwz r15, CONTEXT_OFFSET_R15(r3)
-        lwz r16, CONTEXT_OFFSET_R16(r3)
-        lwz r17, CONTEXT_OFFSET_R17(r3)
-        lwz r18, CONTEXT_OFFSET_R18(r3)
-        lwz r19, CONTEXT_OFFSET_R19(r3)
-        lwz r20, CONTEXT_OFFSET_R20(r3)
-        lwz r21, CONTEXT_OFFSET_R21(r3)
-        lwz r22, CONTEXT_OFFSET_R22(r3)
-        lwz r23, CONTEXT_OFFSET_R23(r3)
-        lwz r24, CONTEXT_OFFSET_R24(r3)
-        lwz r25, CONTEXT_OFFSET_R25(r3)
-        lwz r26, CONTEXT_OFFSET_R26(r3)
-        lwz r27, CONTEXT_OFFSET_R27(r3)
-        lwz r28, CONTEXT_OFFSET_R28(r3)
-        lwz r29, CONTEXT_OFFSET_R29(r3)
-        lwz r30, CONTEXT_OFFSET_R30(r3)
-        lwz r31, CONTEXT_OFFSET_R31(r3)
+        lwz sp, __CONTEXT_OFFSET_SP(r3)
+        lwz r2, __CONTEXT_OFFSET_TLS(r3)
+        lwz r13, __CONTEXT_OFFSET_R13(r3)
+        lwz r14, __CONTEXT_OFFSET_R14(r3)
+        lwz r15, __CONTEXT_OFFSET_R15(r3)
+        lwz r16, __CONTEXT_OFFSET_R16(r3)
+        lwz r17, __CONTEXT_OFFSET_R17(r3)
+        lwz r18, __CONTEXT_OFFSET_R18(r3)
+        lwz r19, __CONTEXT_OFFSET_R19(r3)
+        lwz r20, __CONTEXT_OFFSET_R20(r3)
+        lwz r21, __CONTEXT_OFFSET_R21(r3)
+        lwz r22, __CONTEXT_OFFSET_R22(r3)
+        lwz r23, __CONTEXT_OFFSET_R23(r3)
+        lwz r24, __CONTEXT_OFFSET_R24(r3)
+        lwz r25, __CONTEXT_OFFSET_R25(r3)
+        lwz r26, __CONTEXT_OFFSET_R26(r3)
+        lwz r27, __CONTEXT_OFFSET_R27(r3)
+        lwz r28, __CONTEXT_OFFSET_R28(r3)
+        lwz r29, __CONTEXT_OFFSET_R29(r3)
+        lwz r30, __CONTEXT_OFFSET_R30(r3)
+        lwz r31, __CONTEXT_OFFSET_R31(r3)
 
-        lwz r5, CONTEXT_OFFSET_CR(r3)
+        lwz r5, __CONTEXT_OFFSET_CR(r3)
         mtcr r5
 
-        lwz r5, CONTEXT_OFFSET_PC(r3)
+        lwz r5, __CONTEXT_OFFSET_PC(r3)
         mtlr r5