20111231-1027

forsyth committed 14 years ago

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

Unified · Split

6 files

CHANGES +2 −0
Linux/386/include/emu.h +1 −1
Linux/arm/include/emu.h +1 −1
Linux/power/include/emu.h +5 −1
Linux/spim/include/emu.h +5 −1
include/version.h +1 −1

@@ -1,3 +1,5 @@
	1	+20111231
	2	+ Linux/*/include/emu.h adjustments for USE_PTHREADS for non-x86 processors
1	3	20111221
2	4	add `...` uninterpreted string literals to limbo/lex.c, appl/cmd/limbo/lex.b
3	5	20111215

Linux/386/include/emu.h+1−1

@@ -22,7 +22,7 @@ static __inline Proc *getup(void) { · 21 unmodified lines
22	22	: "=a" (p)
23	23	);
24	24	return (Proc *)((uintptr)p & ~(KSTACK - 1));
25		−};
	25	+}
26	26	#else
27	27	extern Proc* getup(void);
28	28	#endif

Linux/arm/include/emu.h+1−1

@@ -22,7 +22,7 @@ static __inline Proc *getup(void) { · 21 unmodified lines
22	22	: "=r" (p)
23	23	);
24	24	return (Proc *)((uintptr)p & ~(KSTACK - 1));
25		−};
	25	+}
26	26	#else
27	27	extern Proc* getup(void);
28	28	#endif

Linux/power/include/emu.h+5−1

@@ -20,11 +20,15 @@ struct FPU · 19 unmodified lines
20	20	*/
21	21	#define KSTACK (16 * 1024)
22	22
	23	+#ifndef USE_PTHREADS
23	24	static __inline Proc *getup(void) {
24	25	Proc *p;
25	26	__asm__( "mr %0, 1" : "=r" (p));
26	27	return (Proc *)((unsigned long)p & ~(KSTACK - 1));
27		−};
	28	+}
	29	+#else
	30	+extern Proc* getup(void);
	31	+#endif
28	32
29	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	21	#define KSTACK (16 * 1024)
22	22
	23	+#ifndef USE_PTHREADS
23	24	static __inline Proc *getup(void) {
24	25	Proc *p;
25	26	__asm__( "move %0, $29\n\t"
26	27	: "=r" (p)
27	28	);
28	29	return (Proc *)((unsigned long)p & ~(KSTACK - 1));
29		−};
	30	+}
	31	+#else
	32	+extern Proc* getup(void);
	33	+#endif
30	34
31	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)"