Browse Source

Plan 9 from Bell Labs 2004-11-13

David du Colombier 19 years ago
parent
commit
dc869c726b
5 changed files with 44 additions and 23 deletions
  1. 10 8
      dist/replica/_plan9.db
  2. 8 8
      dist/replica/plan9.db
  3. 10 0
      dist/replica/plan9.log
  4. 1 1
      mail/lib/validatesender
  5. 15 6
      sys/src/boot/pc/clock.c

+ 10 - 8
dist/replica/_plan9.db

@@ -1,8 +1,8 @@
 386 - 20000000775 sys sys 1010957353 0
-386/9load - 775 sys sys 1097716796 208292
-386/9loaddebug - 775 sys sys 1098933169 299545
-386/9loadlite - 775 sys sys 1097716797 131864
-386/9loadlitedebug - 775 sys sys 1097744361 194456
+386/9load - 775 sys sys 1100269948 208708
+386/9loaddebug - 775 sys sys 1100269950 299981
+386/9loadlite - 775 sys sys 1100269949 132260
+386/9loadlitedebug - 775 sys sys 1100269951 194892
 386/9pc - 775 sys sys 1099839482 1822047
 386/9pc.gz - 664 sys sys 1077049336 635727
 386/9pccpu - 775 sys sys 1099800621 1477040
@@ -11,7 +11,7 @@
 386/9pcdisk.gz - 664 sys sys 1040006345 703136
 386/9pcf - 775 sys sys 1099800630 2356296
 386/9pcf.gz - 664 sys sys 1077049490 872650
-386/9pxeload - 775 sys sys 1097716797 208292
+386/9pxeload - 775 sys sys 1100269949 208708
 386/_9pcdisk.gz - 664 sys sys 1039764191 695837
 386/bin - 20000000775 sys sys 1018897690 0
 386/bin/8a - 775 sys sys 1098536526 112793
@@ -508,7 +508,7 @@
 386/include/u.h - 664 sys sys 1042604326 1450
 386/include/ureg.h - 664 sys sys 944946012 523
 386/init - 775 sys sys 1085077133 98033
-386/ld.com - 775 sys sys 1097716799 71276
+386/ld.com - 775 sys sys 1100269952 71676
 386/lib - 20000000775 sys sys 1016826328 0
 386/lib/ape - 20000000775 sys sys 944969312 0
 386/lib/ape/lib9.a - 664 sys sys 1038237538 6378
@@ -2842,7 +2842,7 @@ mail/lib/smtpd.conf.ext - 664 upas upas 1089299188 1032
 mail/lib/spam.rc - 775 upas upas 1063950954 400
 mail/lib/unspam.rc - 775 upas upas 1063950954 400
 mail/lib/validateaddress - 775 upas upas 1098803974 48
-mail/lib/validatesender - 775 upas upas 1098803974 1081
+mail/lib/validatesender - 775 upas upas 1100271572 1080
 mail/lib/white.starter - 664 upas upas 1067739606 326
 mail/queue - 20000000777 upas upas 953302652 0
 mail/tmp - 20000000777 upas upas 953302655 0
@@ -6486,7 +6486,7 @@ sys/src/boot/pc/boot.c - 664 sys sys 1021579983 3353
 sys/src/boot/pc/bootld.c - 664 sys sys 1015007948 1801
 sys/src/boot/pc/bootp.c - 664 sys sys 1094674486 12069
 sys/src/boot/pc/cga.c - 664 sys sys 1015007948 1362
-sys/src/boot/pc/clock.c - 664 sys sys 1096379794 5819
+sys/src/boot/pc/clock.c - 664 sys sys 1100269944 6068
 sys/src/boot/pc/conf.c - 664 sys sys 1094674484 10217
 sys/src/boot/pc/console.c - 664 sys sys 1094674483 3388
 sys/src/boot/pc/dat.h - 664 sys sys 1094674488 3518
@@ -12392,3 +12392,5 @@ usr/glenda/lib/profile - 664 glenda glenda 1021580005 847
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
+386/9loaddebug - 775 sys sys 1100319196 299981
+386/9loadlitedebug - 775 sys sys 1100319197 194892

+ 8 - 8
dist/replica/plan9.db

@@ -1,8 +1,8 @@
 386 - 20000000775 sys sys 1010957353 0
-386/9load - 775 sys sys 1097716796 208292
-386/9loaddebug - 775 sys sys 1098933169 299545
-386/9loadlite - 775 sys sys 1097716797 131864
-386/9loadlitedebug - 775 sys sys 1097744361 194456
+386/9load - 775 sys sys 1100269948 208708
+386/9loaddebug - 775 sys sys 1100319196 299981
+386/9loadlite - 775 sys sys 1100269949 132260
+386/9loadlitedebug - 775 sys sys 1100319197 194892
 386/9pc - 775 sys sys 1099839482 1822047
 386/9pc.gz - 664 sys sys 1077049336 635727
 386/9pccpu - 775 sys sys 1099800621 1477040
@@ -11,7 +11,7 @@
 386/9pcdisk.gz - 664 sys sys 1040006345 703136
 386/9pcf - 775 sys sys 1099800630 2356296
 386/9pcf.gz - 664 sys sys 1077049490 872650
-386/9pxeload - 775 sys sys 1097716797 208292
+386/9pxeload - 775 sys sys 1100269949 208708
 386/_9pcdisk.gz - 664 sys sys 1039764191 695837
 386/bin - 20000000775 sys sys 1018897690 0
 386/bin/8a - 775 sys sys 1098536526 112793
@@ -508,7 +508,7 @@
 386/include/u.h - 664 sys sys 1042604326 1450
 386/include/ureg.h - 664 sys sys 944946012 523
 386/init - 775 sys sys 1085077133 98033
-386/ld.com - 775 sys sys 1097716799 71276
+386/ld.com - 775 sys sys 1100269952 71676
 386/lib - 20000000775 sys sys 1016826328 0
 386/lib/ape - 20000000775 sys sys 944969312 0
 386/lib/ape/lib9.a - 664 sys sys 1038237538 6378
@@ -2842,7 +2842,7 @@ mail/lib/smtpd.conf.ext - 664 upas upas 1089299188 1032
 mail/lib/spam.rc - 775 upas upas 1063950954 400
 mail/lib/unspam.rc - 775 upas upas 1063950954 400
 mail/lib/validateaddress - 775 upas upas 1098803974 48
-mail/lib/validatesender - 775 upas upas 1098803974 1081
+mail/lib/validatesender - 775 upas upas 1100271572 1080
 mail/lib/white.starter - 664 upas upas 1067739606 326
 mail/queue - 20000000777 upas upas 953302652 0
 mail/tmp - 20000000777 upas upas 953302655 0
@@ -6486,7 +6486,7 @@ sys/src/boot/pc/boot.c - 664 sys sys 1021579983 3353
 sys/src/boot/pc/bootld.c - 664 sys sys 1015007948 1801
 sys/src/boot/pc/bootp.c - 664 sys sys 1094674486 12069
 sys/src/boot/pc/cga.c - 664 sys sys 1015007948 1362
-sys/src/boot/pc/clock.c - 664 sys sys 1096379794 5819
+sys/src/boot/pc/clock.c - 664 sys sys 1100269944 6068
 sys/src/boot/pc/conf.c - 664 sys sys 1094674484 10217
 sys/src/boot/pc/console.c - 664 sys sys 1094674483 3388
 sys/src/boot/pc/dat.h - 664 sys sys 1094674488 3518

+ 10 - 0
dist/replica/plan9.log

@@ -17016,3 +17016,13 @@
 1099801861 12 c sys/src/9/bitsy/devpcmcia.c - 664 sys sys 1099801570 12977
 1099805462 0 c sys/src/9/bitsy/dat.h - 664 sys sys 1099805278 5857
 1099839669 0 c 386/9pc - 775 sys sys 1099839482 1822047
+1100271631 0 c mail/lib/validatesender - 775 upas upas 1100271572 1080
+1100271631 1 c 386/9load - 775 sys sys 1100269948 208708
+1100271631 2 c 386/9loaddebug - 775 sys sys 1100269950 299981
+1100271631 3 c 386/9loadlite - 775 sys sys 1100269949 132260
+1100271631 4 c 386/9loadlitedebug - 775 sys sys 1100269951 194892
+1100271631 5 c 386/9pxeload - 775 sys sys 1100269949 208708
+1100271631 6 c 386/ld.com - 775 sys sys 1100269952 71676
+1100271631 7 c sys/src/boot/pc/clock.c - 664 sys sys 1100269944 6068
+1100320239 0 c 386/9loaddebug - 775 sys sys 1100319196 299981
+1100320239 1 c 386/9loadlitedebug - 775 sys sys 1100319197 194892

+ 1 - 1
mail/lib/validatesender

@@ -38,7 +38,7 @@ if(~ $sysname ethel){
 		netroot=/net.alt
 }
 
-if(x=`{upas/smtp -p $netroot/tcp!$dom postmaster $addr >[2=1] | 
+if(x=`{upas/smtp -p $netroot/tcp!$dom /dev/null $addr >[2=1] | 
 		tee >{sed 's/^/'$sysname' '$pid' /' >> /sys/log/smtpd.mx} |
 		tail -1})
 	exit ''

+ 15 - 6
sys/src/boot/pc/clock.c

@@ -26,7 +26,7 @@ enum
 	Freq=	1193182,	/* Real clock frequency */
 };
 
-static int cpufreq = 66000000;
+static vlong cpufreq = 66000000;
 static int cpumhz = 66;
 static int loopconst = 100;
 int cpuidax, cpuiddx;
@@ -136,7 +136,10 @@ static X86type	*cputype;
 void
 delay(int l)
 {
-	l *= loopconst;
+	uvlong loops = l * loopconst;
+
+	if (loops != (int)loops)
+		print("delay: int overflow\n");
 	if(l <= 0)
 		l = 1;
 	aamloop(l);
@@ -145,7 +148,10 @@ delay(int l)
 void
 microdelay(int l)
 {
-	l *= loopconst;
+	uvlong loops = l * loopconst;
+
+	if (loops != (int)loops)
+		print("delay: int overflow\n");
 	l /= 1000;
 	if(l <= 0)
 		l = 1;
@@ -169,6 +175,9 @@ cpuidentify(void)
 		t = x86intel;
 	family = X86FAMILY(cpuidax);
 	model = X86MODEL(cpuidax);
+	if (0)
+		print("cpuidentify: cpuidax 0x%ux cpuiddx 0x%ux\n",
+			cpuidax, cpuiddx);
 	while(t->name){
 		if((t->family == family && t->model == model)
 		|| (t->family == family && t->model == -1)
@@ -260,13 +269,13 @@ clockinit(void)
 	/*
  	 *  figure out clock frequency and a loop multiplier for delay().
 	 */
-	cpufreq = loops*((t->aalcycles*Freq)/x);
+	cpufreq = (vlong)loops*((t->aalcycles*Freq)/x);
 	loopconst = (cpufreq/1000)/t->aalcycles;	/* AAM+LOOP's for 1 ms */
 
 	/*
 	 *  add in possible .2% error and convert to MHz
 	 */
 	cpumhz = (cpufreq + cpufreq/500)/1000000;
-//	print("%dMHz %s loop %d\n", cpumhz, t->name, loopconst);
+	if (1)
+		print("%dMHz %s loop %d\n", cpumhz, t->name, loopconst);
 }
-