diff options
| author | deischen <deischen@FreeBSD.org> | 2000-11-20 01:57:19 +0000 |
|---|---|---|
| committer | deischen <deischen@FreeBSD.org> | 2000-11-20 01:57:19 +0000 |
| commit | 7d8a00561233be5c4ecfe188e55c8e3770012ae1 (patch) | |
| tree | 34d9758c2f3dd959d5ab8b61d3a28790850e6f44 | |
| parent | 5870a97ec2c2e7bb1e0095de97f57af8ede5e725 (diff) | |
| download | FreeBSD-src-7d8a00561233be5c4ecfe188e55c8e3770012ae1.zip FreeBSD-src-7d8a00561233be5c4ecfe188e55c8e3770012ae1.tar.gz | |
Fix MD macros to work for alpha. Without this fix, threads under alpha
seem to be totally broke.
MFC Candidate
Submitted by: gallatin
| -rw-r--r-- | lib/libc_r/uthread/pthread_private.h | 8 | ||||
| -rw-r--r-- | lib/libkse/thread/thr_private.h | 8 | ||||
| -rw-r--r-- | lib/libpthread/thread/thr_private.h | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/lib/libc_r/uthread/pthread_private.h b/lib/libc_r/uthread/pthread_private.h index 9d6bc31..2c9a469 100644 --- a/lib/libc_r/uthread/pthread_private.h +++ b/lib/libc_r/uthread/pthread_private.h @@ -95,10 +95,10 @@ #define SET_STACK_UC(ucp, stk) (ucp)->uc_mcontext.mc_regs[R_SP] = (unsigned long)(stk) #define FP_SAVE_UC(ucp) #define FP_RESTORE_UC(ucp) -#define SET_RETURN_ADDR_JB(jb, ra) do { \ - (jb)[0]._jb[2] = (long)(ra); \ - (jb)[0]._jb[R_RA + 4] = 0; \ - (jb)[0]._jb[R_T12 + 4] = (long)(ra); \ +#define SET_RETURN_ADDR_JB(jb, ra) do { \ + (jb)[0]._jb[2] = (unsigned long)(ra) + 8UL; \ + (jb)[0]._jb[R_RA + 4] = 0; \ + (jb)[0]._jb[R_T12 + 4] = (long)(ra); \ } while (0) #else #error "Don't recognize this architecture!" diff --git a/lib/libkse/thread/thr_private.h b/lib/libkse/thread/thr_private.h index 9d6bc31..2c9a469 100644 --- a/lib/libkse/thread/thr_private.h +++ b/lib/libkse/thread/thr_private.h @@ -95,10 +95,10 @@ #define SET_STACK_UC(ucp, stk) (ucp)->uc_mcontext.mc_regs[R_SP] = (unsigned long)(stk) #define FP_SAVE_UC(ucp) #define FP_RESTORE_UC(ucp) -#define SET_RETURN_ADDR_JB(jb, ra) do { \ - (jb)[0]._jb[2] = (long)(ra); \ - (jb)[0]._jb[R_RA + 4] = 0; \ - (jb)[0]._jb[R_T12 + 4] = (long)(ra); \ +#define SET_RETURN_ADDR_JB(jb, ra) do { \ + (jb)[0]._jb[2] = (unsigned long)(ra) + 8UL; \ + (jb)[0]._jb[R_RA + 4] = 0; \ + (jb)[0]._jb[R_T12 + 4] = (long)(ra); \ } while (0) #else #error "Don't recognize this architecture!" diff --git a/lib/libpthread/thread/thr_private.h b/lib/libpthread/thread/thr_private.h index 9d6bc31..2c9a469 100644 --- a/lib/libpthread/thread/thr_private.h +++ b/lib/libpthread/thread/thr_private.h @@ -95,10 +95,10 @@ #define SET_STACK_UC(ucp, stk) (ucp)->uc_mcontext.mc_regs[R_SP] = (unsigned long)(stk) #define FP_SAVE_UC(ucp) #define FP_RESTORE_UC(ucp) -#define SET_RETURN_ADDR_JB(jb, ra) do { \ - (jb)[0]._jb[2] = (long)(ra); \ - (jb)[0]._jb[R_RA + 4] = 0; \ - (jb)[0]._jb[R_T12 + 4] = (long)(ra); \ +#define SET_RETURN_ADDR_JB(jb, ra) do { \ + (jb)[0]._jb[2] = (unsigned long)(ra) + 8UL; \ + (jb)[0]._jb[R_RA + 4] = 0; \ + (jb)[0]._jb[R_T12 + 4] = (long)(ra); \ } while (0) #else #error "Don't recognize this architecture!" |
