d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bring in a more healthy version of the libpthread for arm, which uses

Browse Source 
ARM_TP_ADDRESS.
This commit is contained in:
Olivier Houchard 2005-02-26 19:06:49 +00:00
parent f4c01f1508
commit 788d6eeca0
8 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libkse/arch/arm/Makefile.inc
View File

@ -2,4 +2,6 @@
.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
CFLAGS+=-DSYSTEM_SCOPE_ONLY
SRCS+= pthread_md.c context.S

5
lib/libkse/arch/arm/arm/context.S
View File

@ -45,7 +45,10 @@ ENTRY(__thr_setcontext)
moveq pc, lr
cmp r2, #0
strne r1, [r2]
ldr r1, [r0, #(16 * 4)] /* CPSR */
msr cpsr, r1
ldmia r0, {r0-r15}
mov pc, lr
/* XXX: FP bits ? */
/*
@ -62,7 +65,7 @@ ENTRY(__thr_getcontext)
cmp r0, #0
moveq r0, #-1
moveq pc, lr
stmia r0, {r0-r13}
stmia r0, {r1-r14}
mov r1, #1
str r1, [r0] /* Return 1 from setcontext */
str lr, [r0, #(15 * 4)] /* PC */

4
lib/libkse/arch/arm/arm/pthread_md.c
View File

@ -37,9 +37,11 @@ __FBSDID("$FreeBSD$");
#include <string.h>
#include <ucontext.h>
#include <machine/sysarch.h>
#include "pthread_md.h"
struct arm_tp *_tp = NULL;
struct arm_tp **arm_tp = (struct arm_tp **)ARM_TP_ADDRESS;
struct tcb *
_tcb_ctor(struct pthread *thread, int initial)

5
lib/libkse/arch/arm/include/pthread_md.h
View File

@ -81,7 +81,8 @@ struct kcb {
struct kse *kcb_kse;
};
extern struct arm_tp *_tp;
extern struct arm_tp **arm_tp;
#define _tp (*arm_tp)
#define _tcb ((struct tcb*)((char*)(_tp) - offsetof(struct tcb, tcb_tp)))
@ -235,7 +236,7 @@ _thread_switch(struct kcb *kcb, struct tcb *tcb, int setmbox)
return (-1);
_tcb_set(kcb, tcb);
mc = &tcb->tcb_tmbx.tm_context.uc_mcontext;
if (0 && _libkse_debug == 0) {
if (_libkse_debug == 0) {
tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp;
if (setmbox)
_thr_setcontext(mc, (intptr_t)&tcb->tcb_tmbx,

2
lib/libpthread/arch/arm/Makefile.inc
View File

@ -2,4 +2,6 @@
.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
CFLAGS+=-DSYSTEM_SCOPE_ONLY
SRCS+= pthread_md.c context.S

5
lib/libpthread/arch/arm/arm/context.S
View File

@ -45,7 +45,10 @@ ENTRY(__thr_setcontext)
moveq pc, lr
cmp r2, #0
strne r1, [r2]
ldr r1, [r0, #(16 * 4)] /* CPSR */
msr cpsr, r1
ldmia r0, {r0-r15}
mov pc, lr
/* XXX: FP bits ? */
/*
@ -62,7 +65,7 @@ ENTRY(__thr_getcontext)
cmp r0, #0
moveq r0, #-1
moveq pc, lr
stmia r0, {r0-r13}
stmia r0, {r1-r14}
mov r1, #1
str r1, [r0] /* Return 1 from setcontext */
str lr, [r0, #(15 * 4)] /* PC */

4
lib/libpthread/arch/arm/arm/pthread_md.c
View File

@ -37,9 +37,11 @@ __FBSDID("$FreeBSD$");
#include <string.h>
#include <ucontext.h>
#include <machine/sysarch.h>
#include "pthread_md.h"
struct arm_tp *_tp = NULL;
struct arm_tp **arm_tp = (struct arm_tp **)ARM_TP_ADDRESS;
struct tcb *
_tcb_ctor(struct pthread *thread, int initial)

5
lib/libpthread/arch/arm/include/pthread_md.h
View File

@ -81,7 +81,8 @@ struct kcb {
struct kse *kcb_kse;
};
extern struct arm_tp *_tp;
extern struct arm_tp **arm_tp;
#define _tp (*arm_tp)
#define _tcb ((struct tcb*)((char*)(_tp) - offsetof(struct tcb, tcb_tp)))
@ -235,7 +236,7 @@ _thread_switch(struct kcb *kcb, struct tcb *tcb, int setmbox)
return (-1);
_tcb_set(kcb, tcb);
mc = &tcb->tcb_tmbx.tm_context.uc_mcontext;
if (0 && _libkse_debug == 0) {
if (_libkse_debug == 0) {
tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp;
if (setmbox)
_thr_setcontext(mc, (intptr_t)&tcb->tcb_tmbx,