Changeset bc73be3 in mainline for uspace/lib/c/arch/ppc32/src

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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.

Message:

cpp: merge and resolve conflicts

Location:

uspace/lib/c/arch/ppc32/src

Files:

• crt0.S (moved) (moved from uspace/lib/c/arch/ppc32/src/entry.S )
• fibril.S (modified) (1 diff)
• rtld/dynamic.c (added)
• rtld/reloc.c (added)
• syscall.c (modified) (1 diff)
• tls.c (modified) (3 diffs)

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

@@ -33 +33 @@
 #include <libarch/fibril_context.h>
 
-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)
+FUNCTION_BEGIN(__context_save)
+        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
+        # __context_save returns 0
         li r3, 0
         blr
-FUNCTION_END(__setjmp)
+FUNCTION_END(__context_save)
 
-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)
+FUNCTION_BEGIN(__context_restore)
+        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
 
-        # __longjmp returns second argument
+        # __context_restore returns second argument
         mr r3, r4
         blr
-FUNCTION_END(__longjmp)
+FUNCTION_END(__context_restore)

uspace/lib/c/arch/ppc32/src/syscall.c

@@ -58 +58 @@
               "r" (__ppc32_reg_r8),
               "r" (__ppc32_reg_r9)
+            :
+              /*
+               * Clobber memory too as some arguments might be
+               * actually pointers.
+               */
+              "memory"
         );
 

uspace/lib/c/arch/ppc32/src/tls.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2019 Jiri Svoboda
  * Copyright (c) 2006 Ondrej Palkovsky
  * All rights reserved.
@@ -36 +37 @@
 #include <stddef.h>
 
+#ifdef CONFIG_RTLD
+#include <rtld/rtld.h>
+#endif
+
 tcb_t *tls_alloc_arch(size_t size, size_t align)
 {
@@ -46 +51 @@
 }
 
+/*
+ * Rtld TLS support
+ */
+
+typedef struct {
+        unsigned long int ti_module;
+        unsigned long int ti_offset;
+} tls_index;
+
+int __tls_debug = 0;
+
+void *__tls_get_addr(tls_index *ti);
+
+void *__tls_get_addr(tls_index *ti)
+{
+        uint8_t *tls;
+
+#ifdef CONFIG_RTLD
+        if (runtime_env != NULL) {
+                return rtld_tls_get_addr(runtime_env, __tcb_get(),
+                    ti->ti_module, ti->ti_offset) + 0x8000;
+        }
+#endif
+        /* Get address of static TLS block */
+        tls = tls_get();
+        return tls + ti->ti_offset + 0x8000;
+}
+
 /** @}
  */