Browse Source

Plan 9 from Bell Labs 2007-01-06

David du Colombier 14 years ago
parent
commit
7e0e870e58

+ 6 - 6
dist/replica/_plan9.db

@@ -19,7 +19,7 @@
 386/bin/8l - 775 sys sys 1148500567 115711
 386/bin/9660srv - 775 sys sys 1148500567 104375
 386/bin/aan - 775 sys sys 1148500568 131392
-386/bin/acid - 775 sys sys 1148500568 401250
+386/bin/acid - 775 sys sys 1168034569 401157
 386/bin/acme - 775 sys sys 1166906378 432350
 386/bin/ape - 20000000775 sys sys 1016944144 0
 386/bin/ape/basename - 775 sys sys 1136656314 132873
@@ -5763,7 +5763,7 @@ sys/games - 20000000775 sys sys 1117225532 0
 sys/games/lib - 20000000775 sys sys 1165337608 0
 sys/games/lib/4scores - 10000000666 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000666 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1166491854 262249
+sys/games/lib/fortunes - 664 sys sys 1168053975 262351
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
 sys/games/lib/mahjongg/backgrounds/default.bit - 664 sys sys 1095792293 346803
@@ -6047,7 +6047,7 @@ sys/include/trace.h - 664 sys sys 1138460022 640
 sys/include/venti.h - 664 sys sys 1091904426 7150
 sys/lib - 20000000775 sys sys 1105564897 0
 sys/lib/acid - 20000000775 sys sys 1114524607 0
-sys/lib/acid/386 - 664 sys sys 1138464088 3268
+sys/lib/acid/386 - 664 sys sys 1168035402 3188
 sys/lib/acid/68020 - 664 sys sys 944955985 2487
 sys/lib/acid/acme - 664 sys sys 969499632 2291
 sys/lib/acid/alef - 664 sys sys 944955985 2293
@@ -9316,11 +9316,11 @@ sys/src/cmd/9nfs/xfile.c - 664 sys sys 1131293680 1894
 sys/src/cmd/aan.c - 664 sys sys 1019856827 9758
 sys/src/cmd/acid - 20000000775 sys sys 1063859225 0
 sys/src/cmd/acid/acid.h - 664 sys sys 1131289460 4273
-sys/src/cmd/acid/builtin.c - 664 sys sys 1133802425 20958
+sys/src/cmd/acid/builtin.c - 664 sys sys 1168034619 20982
 sys/src/cmd/acid/dbg.y - 664 sys sys 1131289463 5568
 sys/src/cmd/acid/dot.c - 664 sys sys 1131289462 2162
 sys/src/cmd/acid/exec.c - 664 sys sys 1132674180 8383
-sys/src/cmd/acid/expr.c - 664 sys sys 1136312279 15220
+sys/src/cmd/acid/expr.c - 664 sys sys 1168034614 15242
 sys/src/cmd/acid/lex.c - 664 sys sys 1131289460 7963
 sys/src/cmd/acid/list.c - 664 sys sys 1131289462 3680
 sys/src/cmd/acid/main.c - 664 sys sys 1143695038 8549
@@ -15258,7 +15258,7 @@ sys/src/libmach/6obj.c - 664 sys sys 1148106911 2440
 sys/src/libmach/7.c - 664 sys sys 1138471022 3310
 sys/src/libmach/7db.c - 664 sys sys 1136322405 17355
 sys/src/libmach/7obj.c - 664 sys sys 1148106912 2425
-sys/src/libmach/8.c - 664 sys sys 1138471020 2071
+sys/src/libmach/8.c - 664 sys sys 1168034569 2071
 sys/src/libmach/8db.c - 664 sys sys 1136322405 50889
 sys/src/libmach/8obj.c - 664 sys sys 1148106912 2258
 sys/src/libmach/access.c - 664 sys sys 1131289377 4588

+ 6 - 6
dist/replica/plan9.db

@@ -19,7 +19,7 @@
 386/bin/8l - 775 sys sys 1148500567 115711
 386/bin/9660srv - 775 sys sys 1148500567 104375
 386/bin/aan - 775 sys sys 1148500568 131392
-386/bin/acid - 775 sys sys 1148500568 401250
+386/bin/acid - 775 sys sys 1168034569 401157
 386/bin/acme - 775 sys sys 1166906378 432350
 386/bin/ape - 20000000775 sys sys 1016944144 0
 386/bin/ape/basename - 775 sys sys 1136656314 132873
@@ -5763,7 +5763,7 @@ sys/games - 20000000775 sys sys 1117225532 0
 sys/games/lib - 20000000775 sys sys 1165337608 0
 sys/games/lib/4scores - 10000000666 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000666 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1166491854 262249
+sys/games/lib/fortunes - 664 sys sys 1168053975 262351
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
 sys/games/lib/mahjongg/backgrounds/default.bit - 664 sys sys 1095792293 346803
@@ -6047,7 +6047,7 @@ sys/include/trace.h - 664 sys sys 1138460022 640
 sys/include/venti.h - 664 sys sys 1091904426 7150
 sys/lib - 20000000775 sys sys 1105564897 0
 sys/lib/acid - 20000000775 sys sys 1114524607 0
-sys/lib/acid/386 - 664 sys sys 1138464088 3268
+sys/lib/acid/386 - 664 sys sys 1168035402 3188
 sys/lib/acid/68020 - 664 sys sys 944955985 2487
 sys/lib/acid/acme - 664 sys sys 969499632 2291
 sys/lib/acid/alef - 664 sys sys 944955985 2293
@@ -9316,11 +9316,11 @@ sys/src/cmd/9nfs/xfile.c - 664 sys sys 1131293680 1894
 sys/src/cmd/aan.c - 664 sys sys 1019856827 9758
 sys/src/cmd/acid - 20000000775 sys sys 1063859225 0
 sys/src/cmd/acid/acid.h - 664 sys sys 1131289460 4273
-sys/src/cmd/acid/builtin.c - 664 sys sys 1133802425 20958
+sys/src/cmd/acid/builtin.c - 664 sys sys 1168034619 20982
 sys/src/cmd/acid/dbg.y - 664 sys sys 1131289463 5568
 sys/src/cmd/acid/dot.c - 664 sys sys 1131289462 2162
 sys/src/cmd/acid/exec.c - 664 sys sys 1132674180 8383
-sys/src/cmd/acid/expr.c - 664 sys sys 1136312279 15220
+sys/src/cmd/acid/expr.c - 664 sys sys 1168034614 15242
 sys/src/cmd/acid/lex.c - 664 sys sys 1131289460 7963
 sys/src/cmd/acid/list.c - 664 sys sys 1131289462 3680
 sys/src/cmd/acid/main.c - 664 sys sys 1143695038 8549
@@ -15258,7 +15258,7 @@ sys/src/libmach/6obj.c - 664 sys sys 1148106911 2440
 sys/src/libmach/7.c - 664 sys sys 1138471022 3310
 sys/src/libmach/7db.c - 664 sys sys 1136322405 17355
 sys/src/libmach/7obj.c - 664 sys sys 1148106912 2425
-sys/src/libmach/8.c - 664 sys sys 1138471020 2071
+sys/src/libmach/8.c - 664 sys sys 1168034569 2071
 sys/src/libmach/8db.c - 664 sys sys 1136322405 50889
 sys/src/libmach/8obj.c - 664 sys sys 1148106912 2258
 sys/src/libmach/access.c - 664 sys sys 1131289377 4588

+ 6 - 0
dist/replica/plan9.log

@@ -46946,3 +46946,9 @@
 1167861606 0 c sys/man/1/strings - 664 sys sys 1167861217 815
 1167861606 1 c sys/src/cmd/strings.c - 664 sys sys 1167860903 1474
 1167883206 0 c 386/bin/strings - 775 sys sys 1167883135 62949
+1168036205 0 c 386/bin/acid - 775 sys sys 1168034569 401157
+1168036205 1 c sys/lib/acid/386 - 664 sys sys 1168035402 3188
+1168036205 2 c sys/src/cmd/acid/builtin.c - 664 sys sys 1168034619 20982
+1168036205 3 c sys/src/cmd/acid/expr.c - 664 sys sys 1168034614 15242
+1168036205 4 c sys/src/libmach/8.c - 664 sys sys 1168034569 2071
+1168054206 0 c sys/games/lib/fortunes - 664 sys sys 1168053975 262351

+ 1 - 0
sys/games/lib/fortunes

@@ -4159,3 +4159,4 @@ Multithreading is just one damn thing after, before, or simultaneous with anothe
 ArrayList of int / my list of int, equals new / ArrayList of int  - Steve Yegge
 In the land of the clueless, the man with half an idea is king.  - Todd Robbins
 Chebyshev said it, and I say it again / There is always a prime between n and 2n.  - Paul Erdös
+Using Linux is like rediscovering your childhood and realising it really was pretty miserable.  - jmk

+ 8 - 8
sys/lib/acid/386

@@ -61,14 +61,14 @@ defn regs()				// print all registers
 
 defn fpr()
 {
-	print("F0\t",  *fmt(F0, 'g'), "\n");
-	print("F1\t",  *fmt(F1, 'g'), "\n");
-	print("F2\t",  *fmt(F2, 'g'), "\n");
-	print("F3\t",  *fmt(F3, 'g'), "\n");
-	print("F4\t",  *fmt(F4, 'g'), "\n");
-	print("F5\t",  *fmt(F5, 'g'), "\n");
-	print("F6\t",  *fmt(F6, 'g'), "\n");
-	print("F7\t",  *fmt(F7, 'g'), "\n");
+	print("F0\t",  *F0, "\n");
+	print("F1\t",  *F1, "\n");
+	print("F2\t",  *F2, "\n");
+	print("F3\t",  *F3, "\n");
+	print("F4\t",  *F4, "\n");
+	print("F5\t",  *F5, "\n");
+	print("F6\t",  *F6, "\n");
+	print("F7\t",  *F7, "\n");
 	print("control\t", *fmt(E0, 'x'), "\n");
 	print("status\t", *fmt(E1, 'x'), "\n");
 	print("tag\t", *fmt(E2, 'x'), "\n");

+ 3 - 1
sys/src/cmd/acid/builtin.c

@@ -83,7 +83,7 @@ struct Btab
 	0
 };
 
-char vfmt[] = "aBbcCdDfFgGiIoOqQrRsSuUVWxXYZ";
+char vfmt[] = "aBbcCdDfFgGiIoOqQrRsSuUVWxXYZ38";
 
 void
 mkprint(Lsym *s)
@@ -1039,6 +1039,8 @@ patom(char type, Store *res)
 		break;
 	case 'f':
 	case 'F':
+	case '3':
+	case '8':
 		if(type != TFLOAT)
 			Bprint(bout, "*%c<%s>*", res->fmt, typenames[type]);
 		else

+ 2 - 0
sys/src/cmd/acid/expr.c

@@ -36,6 +36,8 @@ static int fsize[] =
 	['s'] 4,
 	['u'] 2,
 	['x'] 2,
+	['3'] 10,
+	['8'] 10,
 };
 
 int

+ 9 - 9
sys/src/libmach/8.c

@@ -15,7 +15,7 @@
 #define	REGSIZE		sizeof(struct Ureg)
 #define FP_CTL(x)	(REGSIZE+4*(x))
 #define FP_REG(x)	(FP_CTL(7)+10*(x))
-#define	FPREGSIZE	(6*4+8*10)
+#define	FPREGSIZE	(7*4+8*10)
 
 Reglist i386reglist[] = {
 	{"DI",		REGOFF(di),	RINT, 'X'},
@@ -44,14 +44,14 @@ Reglist i386reglist[] = {
 	{"E4",		FP_CTL(4),	RFLT, 'X'},
 	{"E5",		FP_CTL(5),	RFLT, 'X'},
 	{"E6",		FP_CTL(6),	RFLT, 'X'},
-	{"F0",		FP_REG(7),	RFLT, '3'},
-	{"F1",		FP_REG(6),	RFLT, '3'},
-	{"F2",		FP_REG(5),	RFLT, '3'},
-	{"F3",		FP_REG(4),	RFLT, '3'},
-	{"F4",		FP_REG(3),	RFLT, '3'},
-	{"F5",		FP_REG(2),	RFLT, '3'},
-	{"F6",		FP_REG(1),	RFLT, '3'},
-	{"F7",		FP_REG(0),	RFLT, '3'},
+	{"F0",		FP_REG(0),	RFLT, '3'},
+	{"F1",		FP_REG(1),	RFLT, '3'},
+	{"F2",		FP_REG(2),	RFLT, '3'},
+	{"F3",		FP_REG(3),	RFLT, '3'},
+	{"F4",		FP_REG(4),	RFLT, '3'},
+	{"F5",		FP_REG(5),	RFLT, '3'},
+	{"F6",		FP_REG(6),	RFLT, '3'},
+	{"F7",		FP_REG(7),	RFLT, '3'},
 	{  0 }
 };