Browse Source

Plan 9 from Bell Labs 2005-01-16

David du Colombier 17 years ago
parent
commit
fd5cf9be8d

+ 3 - 3
dist/replica/_plan9.db

@@ -5485,7 +5485,7 @@ sys/src/9/port/devcons.c - 664 sys sys 1084475350 22380
 sys/src/9/port/devdraw.c - 664 sys sys 1091733670 41996
 sys/src/9/port/devdup.c - 664 sys sys 1014931172 2332
 sys/src/9/port/devenv.c - 664 sys sys 1048644225 6992
-sys/src/9/port/devfs.c - 664 sys sys 1081864735 10779
+sys/src/9/port/devfs.c - 664 sys sys 1105799131 10783
 sys/src/9/port/devkbmap.c - 644 sys sys 1079463756 2774
 sys/src/9/port/devkprof.c - 664 sys sys 1014931173 3111
 sys/src/9/port/devloopback.c - 664 sys sys 1076612248 14573
@@ -9622,7 +9622,7 @@ sys/src/cmd/ki/stats.c - 664 sys sys 1068859845 4536
 sys/src/cmd/ki/symbols.c - 664 sys sys 944961015 1744
 sys/src/cmd/ki/syscall.c - 664 sys sys 1076688578 14057
 sys/src/cmd/kl - 20000000775 sys sys 944961016 0
-sys/src/cmd/kl/asm.c - 664 sys sys 1045503967 26003
+sys/src/cmd/kl/asm.c - 664 sys sys 1105798985 26122
 sys/src/cmd/kl/compat.c - 664 sys sys 947099591 465
 sys/src/cmd/kl/cputime.c - 664 sys sys 944961015 336
 sys/src/cmd/kl/l.h - 664 sys sys 1020311762 5250
@@ -9630,7 +9630,7 @@ sys/src/cmd/kl/list.c - 664 sys sys 1014925965 4502
 sys/src/cmd/kl/mkfile - 664 sys sys 944961015 258
 sys/src/cmd/kl/noop.c - 664 sys sys 1045503968 11140
 sys/src/cmd/kl/obj.c - 664 sys sys 1089299170 21649
-sys/src/cmd/kl/optab.c - 664 sys sys 944961015 7369
+sys/src/cmd/kl/optab.c - 664 sys sys 1105798985 7369
 sys/src/cmd/kl/pass.c - 664 sys sys 1045503969 9348
 sys/src/cmd/kl/sched.c - 664 sys sys 1089299170 10796
 sys/src/cmd/kl/span.c - 664 sys sys 1045503970 10146

+ 3 - 3
dist/replica/plan9.db

@@ -5485,7 +5485,7 @@ sys/src/9/port/devcons.c - 664 sys sys 1084475350 22380
 sys/src/9/port/devdraw.c - 664 sys sys 1091733670 41996
 sys/src/9/port/devdup.c - 664 sys sys 1014931172 2332
 sys/src/9/port/devenv.c - 664 sys sys 1048644225 6992
-sys/src/9/port/devfs.c - 664 sys sys 1081864735 10779
+sys/src/9/port/devfs.c - 664 sys sys 1105799131 10783
 sys/src/9/port/devkbmap.c - 644 sys sys 1079463756 2774
 sys/src/9/port/devkprof.c - 664 sys sys 1014931173 3111
 sys/src/9/port/devloopback.c - 664 sys sys 1076612248 14573
@@ -9622,7 +9622,7 @@ sys/src/cmd/ki/stats.c - 664 sys sys 1068859845 4536
 sys/src/cmd/ki/symbols.c - 664 sys sys 944961015 1744
 sys/src/cmd/ki/syscall.c - 664 sys sys 1076688578 14057
 sys/src/cmd/kl - 20000000775 sys sys 944961016 0
-sys/src/cmd/kl/asm.c - 664 sys sys 1045503967 26003
+sys/src/cmd/kl/asm.c - 664 sys sys 1105798985 26122
 sys/src/cmd/kl/compat.c - 664 sys sys 947099591 465
 sys/src/cmd/kl/cputime.c - 664 sys sys 944961015 336
 sys/src/cmd/kl/l.h - 664 sys sys 1020311762 5250
@@ -9630,7 +9630,7 @@ sys/src/cmd/kl/list.c - 664 sys sys 1014925965 4502
 sys/src/cmd/kl/mkfile - 664 sys sys 944961015 258
 sys/src/cmd/kl/noop.c - 664 sys sys 1045503968 11140
 sys/src/cmd/kl/obj.c - 664 sys sys 1089299170 21649
-sys/src/cmd/kl/optab.c - 664 sys sys 944961015 7369
+sys/src/cmd/kl/optab.c - 664 sys sys 1105798985 7369
 sys/src/cmd/kl/pass.c - 664 sys sys 1045503969 9348
 sys/src/cmd/kl/sched.c - 664 sys sys 1089299170 10796
 sys/src/cmd/kl/span.c - 664 sys sys 1045503970 10146

+ 3 - 0
dist/replica/plan9.log

@@ -13231,3 +13231,6 @@
 1105632024 0 c sys/src/cmd/troff2html/mkfile - 664 sys sys 1105631961 242
 1105632024 1 c sys/src/cmd/troff2html/troff2html.c - 664 sys sys 1105631971 14160
 1105677032 0 c 386/bin/troff2html - 775 sys sys 1105675429 85684
+1105799458 0 c sys/src/9/port/devfs.c - 664 sys sys 1105799131 10783
+1105799458 1 c sys/src/cmd/kl/asm.c - 664 sys sys 1105798985 26122
+1105799458 2 c sys/src/cmd/kl/optab.c - 664 sys sys 1105798985 7369

+ 1 - 1
sys/src/9/port/devfs.c

@@ -268,7 +268,7 @@ rdconf(void)
 	cclose(*ccp);
 	*ccp = nil;
 	if (strncmp(confstr, Cfgstr, strlen(Cfgstr)) != 0)
-		error("Bad config: should begin with: fsdev\\n");
+		error("Bad config, first line must be: 'fsdev:\\n'");
 	kstrdup(&c, confstr + strlen(Cfgstr));
 	memset(confstr, 0, sizeof(confstr));
 	for (p = c; p != nil && *p != 0; p = e){

+ 5 - 0
sys/src/cmd/kl/asm.c

@@ -1001,6 +1001,11 @@ asmout(Prog *p, Optab *o, int aflag)
 			}
 		}
 		break;
+
+	case 57:	/* op r1,r2 with reserved rs1 */
+		r = 0;
+		o1 = OP_RRR(opcode(p->as), p->from.reg, r, p->to.reg);
+		break;
 	}
 	if(aflag)
 		return o1;

+ 2 - 2
sys/src/cmd/kl/optab.c

@@ -174,8 +174,8 @@ Optab	optab[] =
 	{ AFMOVD,	C_FREG,	C_NONE,	C_FREG,		49, 8, 0 },
 	{ AFCMPD,	C_FREG,	C_NONE,	C_FREG,		50, 4, 0 },
 
-	{ AFABSF,	C_FREG,	C_NONE,	C_FREG,		21, 4, 0 },
-	{ AFMOVF,	C_FREG,	C_NONE,	C_FREG,		21, 4, 0 },
+	{ AFABSF,	C_FREG,	C_NONE,	C_FREG,		57, 4, 0 },
+	{ AFMOVF,	C_FREG,	C_NONE,	C_FREG,		57, 4, 0 },
 	{ AFADDD,	C_FREG,	C_NONE,	C_FREG,		21, 4, 0 },
 	{ AFADDD,	C_FREG,	C_REG,	C_FREG,		21, 4, 0 },