Changeset fa23560 in mainline for uspace/lib/libc/arch/ppc32

Timestamp:

2007-10-30T22:54:11Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4d21cf8

Parents:

b2a0f6dd

Message:

Unify implementations of TLS variant I and variant II alloc_tls() and
free_tls_arch().

Location:

uspace/lib/libc/arch/ppc32

Files:

• Makefile.inc (modified) (1 diff)
• include/thread.h (modified) (1 diff)
• include/tls.h (added)
• src/tls.c (moved) (moved from uspace/lib/libc/arch/ppc32/src/thread.c ) (1 diff)

uspace/lib/libc/arch/ppc32/Makefile.inc

@@ -35 +35 @@
 ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
                 arch/$(ARCH)/src/fibril.S \
-                arch/$(ARCH)/src/thread.c
+                arch/$(ARCH)/src/tls.c
 
 CFLAGS += -mcpu=powerpc -msoft-float -m32

uspace/lib/libc/arch/ppc32/include/thread.h

@@ -36 +36 @@
 #define LIBC_ppc32_THREAD_H_
 
-#define PPC_TP_OFFSET 0x7000
-
-typedef struct {
-        void *fibril_data;
-} tcb_t;
-
-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));
-}
-
 #endif
 

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

@@ -33 +33 @@
  */
 
-#include <thread.h>
-#include <malloc.h>
+#include <tls.h>
+#include <sys/types.h>
 
-/** Allocate TLS & TCB for initial module threads
- *
- * @param data Start of data section
- * @return pointer to tcb_t structure
- *
- */
 tcb_t * __alloc_tls(void **data, size_t size)
 {
-        tcb_t *result;
-
-        result = malloc(sizeof(tcb_t) + size);
-        *data = ((void *)result) + sizeof(tcb_t);
-        return result;
+        return tls_alloc_variant_1(data, size);
 }
 
 void __free_tls_arch(tcb_t *tcb, size_t size)
 {
-        free(tcb);
+        tls_free_variant_1(tcb, size);
 }