diff options
| author | forsyth <forsyth@vitanuova.com> | 2011-12-31 10:27:57 +0000 |
|---|---|---|
| committer | forsyth <forsyth@vitanuova.com> | 2011-12-31 10:27:57 +0000 |
| commit | 70847ce7c3d2ee9800014eb328f362b8e335ac76 (patch) | |
| tree | 75d2e5ac8db02c9384eb82f3c7415e56bb7f81d7 | |
| parent | efbaac87ed5df1764747ea89043475db86c52e19 (diff) | |
20111231-1027
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | Linux/386/include/emu.h | 2 | ||||
| -rw-r--r-- | Linux/arm/include/emu.h | 2 | ||||
| -rw-r--r-- | Linux/power/include/emu.h | 6 | ||||
| -rw-r--r-- | Linux/spim/include/emu.h | 6 | ||||
| -rw-r--r-- | include/version.h | 2 |
6 files changed, 15 insertions, 5 deletions
@@ -1,3 +1,5 @@ +20111231 + Linux/*/include/emu.h adjustments for USE_PTHREADS for non-x86 processors 20111221 add `...` uninterpreted string literals to limbo/lex.c, appl/cmd/limbo/lex.b 20111215 diff --git a/Linux/386/include/emu.h b/Linux/386/include/emu.h index b17552ff..cdef342c 100644 --- a/Linux/386/include/emu.h +++ b/Linux/386/include/emu.h @@ -22,7 +22,7 @@ static __inline Proc *getup(void) { : "=a" (p) ); return *(Proc **)((uintptr)p & ~(KSTACK - 1)); -}; +} #else extern Proc* getup(void); #endif diff --git a/Linux/arm/include/emu.h b/Linux/arm/include/emu.h index da7b786f..686dc1b7 100644 --- a/Linux/arm/include/emu.h +++ b/Linux/arm/include/emu.h @@ -22,7 +22,7 @@ static __inline Proc *getup(void) { : "=r" (p) ); return *(Proc **)((uintptr)p & ~(KSTACK - 1)); -}; +} #else extern Proc* getup(void); #endif diff --git a/Linux/power/include/emu.h b/Linux/power/include/emu.h index b169fd7e..f60f64fd 100644 --- a/Linux/power/include/emu.h +++ b/Linux/power/include/emu.h @@ -20,11 +20,15 @@ struct FPU */ #define KSTACK (16 * 1024) +#ifndef USE_PTHREADS static __inline Proc *getup(void) { Proc *p; __asm__( "mr %0, 1" : "=r" (p)); return *(Proc **)((unsigned long)p & ~(KSTACK - 1)); -}; +} +#else +extern Proc* getup(void); +#endif #define up (getup()) diff --git a/Linux/spim/include/emu.h b/Linux/spim/include/emu.h index 9ca46903..e367d069 100644 --- a/Linux/spim/include/emu.h +++ b/Linux/spim/include/emu.h @@ -20,13 +20,17 @@ struct FPU */ #define KSTACK (16 * 1024) +#ifndef USE_PTHREADS static __inline Proc *getup(void) { Proc *p; __asm__( "move %0, $29\n\t" : "=r" (p) ); return *(Proc **)((unsigned long)p & ~(KSTACK - 1)); -}; +} +#else +extern Proc* getup(void); +#endif #define up (getup()) diff --git a/include/version.h b/include/version.h index 47753558..fc63651e 100644 --- a/include/version.h +++ b/include/version.h @@ -1 +1 @@ -#define VERSION "Fourth Edition (20111222)" +#define VERSION "Fourth Edition (20111231)" |