History

20111231-1027

forsyth committed 14 years ago

Commit a098dea1 parent 5e43f966 files · +15 −5Browse files

Unified · Split

6 files
  1. CHANGES +2 −0
  2. Linux/386/include/emu.h +1 −1
  3. Linux/arm/include/emu.h +1 −1
  4. Linux/power/include/emu.h +5 −1
  5. Linux/spim/include/emu.h +5 −1
  6. include/version.h +1 −1
CHANGES+2−0
@@ -1,3 +1,5 @@
120111231
2 Linux/*/include/emu.h adjustments for USE_PTHREADS for non-x86 processors
120111221320111221
2 add `...` uninterpreted string literals to limbo/lex.c, appl/cmd/limbo/lex.b4 add `...` uninterpreted string literals to limbo/lex.c, appl/cmd/limbo/lex.b
320111215520111215
Linux/386/include/emu.h+1−1
@@ -22,7 +22,7 @@ static __inline Proc *getup(void) { · 21 unmodified lines
22 : "=a" (p)22 : "=a" (p)
23 );23 );
24 return *(Proc **)((uintptr)p & ~(KSTACK - 1));24 return *(Proc **)((uintptr)p & ~(KSTACK - 1));
25};25}
26#else26#else
27extern Proc* getup(void);27extern Proc* getup(void);
28#endif28#endif
Linux/arm/include/emu.h+1−1
@@ -22,7 +22,7 @@ static __inline Proc *getup(void) { · 21 unmodified lines
22 : "=r" (p) 22 : "=r" (p)
23 ); 23 );
24 return *(Proc **)((uintptr)p & ~(KSTACK - 1));24 return *(Proc **)((uintptr)p & ~(KSTACK - 1));
25};25}
26#else26#else
27extern Proc* getup(void);27extern Proc* getup(void);
28#endif28#endif
Linux/power/include/emu.h+5−1
@@ -20,11 +20,15 @@ struct FPU · 19 unmodified lines
20 */20 */
21#define KSTACK (16 * 1024)21#define KSTACK (16 * 1024)
22 22
23#ifndef USE_PTHREADS
23static __inline Proc *getup(void) {24static __inline Proc *getup(void) {
24 Proc *p;25 Proc *p;
25 __asm__( "mr %0, 1" : "=r" (p));26 __asm__( "mr %0, 1" : "=r" (p));
26 return *(Proc **)((unsigned long)p & ~(KSTACK - 1));27 return *(Proc **)((unsigned long)p & ~(KSTACK - 1));
27};28}
29#else
30extern Proc* getup(void);
31#endif
28 32
29#define up (getup())33#define up (getup())
30 34
Linux/spim/include/emu.h+5−1
@@ -20,13 +20,17 @@ struct FPU · 19 unmodified lines
20 */20 */
21#define KSTACK (16 * 1024)21#define KSTACK (16 * 1024)
22 22
23#ifndef USE_PTHREADS
23static __inline Proc *getup(void) {24static __inline Proc *getup(void) {
24 Proc *p;25 Proc *p;
25 __asm__( "move %0, $29\n\t"26 __asm__( "move %0, $29\n\t"
26 : "=r" (p)27 : "=r" (p)
27 );28 );
28 return *(Proc **)((unsigned long)p & ~(KSTACK - 1));29 return *(Proc **)((unsigned long)p & ~(KSTACK - 1));
29};30}
31#else
32extern Proc* getup(void);
33#endif
30 34
31#define up (getup())35#define up (getup())
32 36
include/version.h+1−1
@@ -1 +1 @@
1#define VERSION "Fourth Edition (20111222)"1#define VERSION "Fourth Edition (20111231)"