Changeset fca4207 in mainline

Timestamp:

2006-05-04T11:04:23Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

4a7c273

Parents:

f33cb0b9

Message:

preliminary TLS & pthread support for ppc32

Location:

libc/arch/ppc32

Files:

• include/context_offset.h (modified) (1 diff)
• include/psthread.h (modified) (1 diff)
• include/regname.h (added)
• include/thread.h (modified) (2 diffs)
• src/psthread.S (modified) (1 diff)
• src/thread.c (modified) (2 diffs)

libc/arch/ppc32/include/context_offset.h

@@ +1 @@
+/* struct context */
+#define OFFSET_SP    0x0
+#define OFFSET_PC    0x4
+#define OFFSET_R2    0x8
+#define OFFSET_R13   0xc
+#define OFFSET_R14   0x10
+#define OFFSET_R15   0x14
+#define OFFSET_R16   0x18
+#define OFFSET_R17   0x1c
+#define OFFSET_R18   0x20
+#define OFFSET_R19   0x24
+#define OFFSET_R20   0x28
+#define OFFSET_R21   0x2c
+#define OFFSET_R22   0x30
+#define OFFSET_R23   0x34
+#define OFFSET_R24   0x38
+#define OFFSET_R25   0x3c
+#define OFFSET_R26   0x40
+#define OFFSET_R27   0x44
+#define OFFSET_R28   0x48
+#define OFFSET_R29   0x4c
+#define OFFSET_R30   0x50
+#define OFFSET_R31   0x54
+#define OFFSET_CR    0x58
+#define OFFSET_CR    0x58

libc/arch/ppc32/include/psthread.h

@@ -32 +32 @@
 #include <types.h>
 
+/* We define our own context_set, because we need to set
+ * the TLS pointer to the tcb+0x7000
+ *
+ * See tls_set in thread.h
+ */
 #define context_set(c, _pc, stack, size, ptls)                  \
         (c)->pc = (sysarg_t) (_pc);                             \
         (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA;     \
-        (c)->tls = ((sysarg_t)(ptls)) + 0x7000 + sizeof(tcb_t);
+        (c)->tls = ((sysarg_t) (ptls)) + 0x7000 + sizeof(tcb_t);
 
-#define SP_DELTA        (8+16)
+#define SP_DELTA        16
 
-typedef struct  {
+typedef struct {
         uint32_t sp;
         uint32_t pc;
         
         uint32_t tls;
-} context_t;
+        uint32_t r13;
+        uint32_t r14;
+        uint32_t r15;
+        uint32_t r16;
+        uint32_t r17;
+        uint32_t r18;
+        uint32_t r19;
+        uint32_t r20;
+        uint32_t r21;
+        uint32_t r22;
+        uint32_t r23;
+        uint32_t r24;
+        uint32_t r25;
+        uint32_t r26;
+        uint32_t r27;
+        uint32_t r28;
+        uint32_t r29;
+        uint32_t r30;
+        uint32_t r31;
+        
+        uint32_t cr;
+} __attribute__ ((packed)) context_t;
 
 #endif

libc/arch/ppc32/include/thread.h

@@ -30 +30 @@
 #define __LIBC__ppc32__THREAD_H__
 
+/* I did not find any specification (neither MIPS nor PowerPC), but
+ * as I found it
+ * - it uses Variant II
+ * - TCB is at Address(First TLS Block)+0x7000.
+ * - DTV is at Address(First TLS Block)+0x8000
+ * - What would happen if the TLS data was larger then 0x7000?
+ * - The linker never accesses DTV directly, has the second definition any
+ *   sense?
+ * We will make it this way:
+ * - TCB is at TP-0x7000-sizeof(tcb)
+ * - No assumption about DTV etc., but it will not have a fixed address
+ */
+#define PPC_TP_OFFSET 0x7000
+
 typedef struct {
         void *pst_data;
@@ -36 +50 @@
 static inline void __tcb_set(tcb_t *tcb)
 {
+        void *tp = tcb;
+        tp += PPC_TP_OFFSET + sizeof(tcb_t);
+        
+        asm volatile (
+                "mr %%r2, %0\n"
+                :
+                : "r" (tp)
+        );
 }
 
 static inline tcb_t * __tcb_get(void)
 {
+        void * retval;
+        
+        asm volatile (
+                "mr %0, %%r2\n"
+                : "=r" (retval)
+        );
+
+        return (tcb_t *)(retval - PPC_TP_OFFSET - sizeof(tcb_t));
 }
 

libc/arch/ppc32/src/psthread.S

@@ -32 +32 @@
 .global context_restore
 
+#include <libarch/regname.h>
 #include <libarch/context_offset.h>
 
+.macro CONTEXT_STORE r
+        stw sp, OFFSET_SP(\r)
+        stw r2, OFFSET_R2(\r)
+        stw r13, OFFSET_R13(\r)
+        stw r14, OFFSET_R14(\r)
+        stw r15, OFFSET_R15(\r)
+        stw r16, OFFSET_R16(\r)
+        stw r17, OFFSET_R17(\r)
+        stw r18, OFFSET_R18(\r)
+        stw r19, OFFSET_R19(\r)
+        stw r20, OFFSET_R20(\r)
+        stw r21, OFFSET_R21(\r)
+        stw r22, OFFSET_R22(\r)
+        stw r23, OFFSET_R23(\r)
+        stw r24, OFFSET_R24(\r)
+        stw r25, OFFSET_R25(\r)
+        stw r26, OFFSET_R26(\r)
+        stw r27, OFFSET_R27(\r)
+        stw r28, OFFSET_R28(\r)
+        stw r29, OFFSET_R29(\r)
+        stw r30, OFFSET_R30(\r)
+        stw r31, OFFSET_R31(\r)
+.endm
+
+.macro CONTEXT_LOAD r
+        lwz sp, OFFSET_SP(\r)
+        lwz r2, OFFSET_R2(\r)
+        lwz r13, OFFSET_R13(\r)
+        lwz r14, OFFSET_R14(\r)
+        lwz r15, OFFSET_R15(\r)
+        lwz r16, OFFSET_R16(\r)
+        lwz r17, OFFSET_R17(\r)
+        lwz r18, OFFSET_R18(\r)
+        lwz r19, OFFSET_R19(\r)
+        lwz r20, OFFSET_R20(\r)
+        lwz r21, OFFSET_R21(\r)
+        lwz r22, OFFSET_R22(\r)
+        lwz r23, OFFSET_R23(\r)
+        lwz r24, OFFSET_R24(\r)
+        lwz r25, OFFSET_R25(\r)
+        lwz r26, OFFSET_R26(\r)
+        lwz r27, OFFSET_R27(\r)
+        lwz r28, OFFSET_R28(\r)
+        lwz r29, OFFSET_R29(\r)
+        lwz r30, OFFSET_R30(\r)
+        lwz r31, OFFSET_R31(\r)
+.endm
+
 context_save:
+        CONTEXT_STORE r3
+        
+        mflr r4
+        stw r4, OFFSET_PC(r3)
+        
+        mfcr r4
+        stw r4, OFFSET_CR(r3)
+        
+        # context_save returns 1
+        li r3, 1
         blr
 
 
 context_restore:
+        CONTEXT_LOAD r3
+        
+        lwz r4, OFFSET_CR(r3)
+        mtcr r4
+        
+        lwz r4, OFFSET_PC(r3)
+        mtlr r4
+        
+        # context_restore returns 0
+        li r3, 0
         blr

libc/arch/ppc32/src/thread.c

@@ -34 +34 @@
  * @param data Start of data section
  * @return pointer to tcb_t structure
+ *
  */
 tcb_t * __alloc_tls(void **data, size_t size)
@@ -40 +41 @@
         
         *data = malloc(sizeof(tcb_t) + size);
-
         tcb = (tcb_t *) (*data + size);
-
         return tcb;
 }