Browse Source

Plan 9 from Bell Labs 2005-12-01

David du Colombier 15 years ago
parent
commit
19411a2878
5 changed files with 34 additions and 21 deletions
  1. 10 10
      dist/replica/_plan9.db
  2. 10 10
      dist/replica/plan9.db
  3. 10 0
      dist/replica/plan9.log
  4. 1 0
      sys/games/lib/fortunes
  5. 3 1
      sys/src/9/pc/screen.c

+ 10 - 10
dist/replica/_plan9.db

@@ -3,14 +3,14 @@
 386/9loaddebug - 775 sys sys 1131317308 311884
 386/9loadlite - 775 sys sys 1131317306 135668
 386/9loadlitedebug - 775 sys sys 1131317312 200131
-386/9pc - 775 sys sys 1133186866 1890197
-386/9pc.gz - 664 sys sys 1133186867 662137
-386/9pccpu - 775 sys sys 1133186870 1564262
-386/9pccpu.gz - 664 sys sys 1133186871 555412
-386/9pcdisk - 775 sys sys 1133186875 2081241
-386/9pcdisk.gz - 664 sys sys 1133186878 749319
-386/9pcf - 775 sys sys 1133186885 2424458
-386/9pcf.gz - 664 sys sys 1133186888 903434
+386/9pc - 775 sys sys 1133399393 1890278
+386/9pc.gz - 664 sys sys 1133399395 662161
+386/9pccpu - 775 sys sys 1133399399 1564262
+386/9pccpu.gz - 664 sys sys 1133399400 555413
+386/9pcdisk - 775 sys sys 1133399404 2081322
+386/9pcdisk.gz - 664 sys sys 1133399406 749316
+386/9pcf - 775 sys sys 1133399412 2424539
+386/9pcf.gz - 664 sys sys 1133399414 903461
 386/9pxeload - 775 sys sys 1131317321 216948
 386/_9pcdisk.gz - 664 sys sys 1039764191 695837
 386/bin - 20000000775 sys sys 1018897690 0
@@ -5766,7 +5766,7 @@ sys/games - 20000000775 sys sys 952648872 0
 sys/games/lib - 20000000775 sys sys 952648879 0
 sys/games/lib/4scores - 10000000664 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000664 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1132452521 256595
+sys/games/lib/fortunes - 664 sys sys 1133400893 256649
 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
@@ -7998,7 +7998,7 @@ sys/src/9/pc/ptclbsum386.s - 664 sys sys 1015014521 1493
 sys/src/9/pc/random.c - 664 sys sys 1036812832 2021
 sys/src/9/pc/realmode.c - 664 sys sys 1131294602 2658
 sys/src/9/pc/rebootcode.s - 664 sys sys 1015014522 988
-sys/src/9/pc/screen.c - 664 sys sys 1133218367 13797
+sys/src/9/pc/screen.c - 664 sys sys 1133356380 13831
 sys/src/9/pc/screen.h - 664 sys sys 1131290516 4156
 sys/src/9/pc/sd53c8xx.c - 664 sys sys 1131538448 55207
 sys/src/9/pc/sd53c8xx.n - 664 sys sys 1131290556 12657

+ 10 - 10
dist/replica/plan9.db

@@ -3,14 +3,14 @@
 386/9loaddebug - 775 sys sys 1131317308 311884
 386/9loadlite - 775 sys sys 1131317306 135668
 386/9loadlitedebug - 775 sys sys 1131317312 200131
-386/9pc - 775 sys sys 1133186866 1890197
-386/9pc.gz - 664 sys sys 1133186867 662137
-386/9pccpu - 775 sys sys 1133186870 1564262
-386/9pccpu.gz - 664 sys sys 1133186871 555412
-386/9pcdisk - 775 sys sys 1133186875 2081241
-386/9pcdisk.gz - 664 sys sys 1133186878 749319
-386/9pcf - 775 sys sys 1133186885 2424458
-386/9pcf.gz - 664 sys sys 1133186888 903434
+386/9pc - 775 sys sys 1133399393 1890278
+386/9pc.gz - 664 sys sys 1133399395 662161
+386/9pccpu - 775 sys sys 1133399399 1564262
+386/9pccpu.gz - 664 sys sys 1133399400 555413
+386/9pcdisk - 775 sys sys 1133399404 2081322
+386/9pcdisk.gz - 664 sys sys 1133399406 749316
+386/9pcf - 775 sys sys 1133399412 2424539
+386/9pcf.gz - 664 sys sys 1133399414 903461
 386/9pxeload - 775 sys sys 1131317321 216948
 386/_9pcdisk.gz - 664 sys sys 1039764191 695837
 386/bin - 20000000775 sys sys 1018897690 0
@@ -5766,7 +5766,7 @@ sys/games - 20000000775 sys sys 952648872 0
 sys/games/lib - 20000000775 sys sys 952648879 0
 sys/games/lib/4scores - 10000000664 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000664 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1132452521 256595
+sys/games/lib/fortunes - 664 sys sys 1133400893 256649
 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
@@ -7998,7 +7998,7 @@ sys/src/9/pc/ptclbsum386.s - 664 sys sys 1015014521 1493
 sys/src/9/pc/random.c - 664 sys sys 1036812832 2021
 sys/src/9/pc/realmode.c - 664 sys sys 1131294602 2658
 sys/src/9/pc/rebootcode.s - 664 sys sys 1015014522 988
-sys/src/9/pc/screen.c - 664 sys sys 1133218367 13797
+sys/src/9/pc/screen.c - 664 sys sys 1133356380 13831
 sys/src/9/pc/screen.h - 664 sys sys 1131290516 4156
 sys/src/9/pc/sd53c8xx.c - 664 sys sys 1131538448 55207
 sys/src/9/pc/sd53c8xx.n - 664 sys sys 1131290556 12657

+ 10 - 0
dist/replica/plan9.log

@@ -23319,3 +23319,13 @@
 1133289074 10 c 386/bin/upas/nedmail - 775 sys sys 1133287406 156889
 1133289074 11 c 386/lib/libplumb.a - 664 sys sys 1133287407 19458
 1133289074 12 c acme/bin/386/Mail - 775 sys sys 1133287407 179477
+1133357493 0 c sys/src/9/pc/screen.c - 664 sys sys 1133356380 13831
+1133400704 0 c 386/9pc - 775 sys sys 1133399393 1890278
+1133400704 1 c 386/9pc.gz - 664 sys sys 1133399395 662161
+1133400704 2 c 386/9pccpu - 775 sys sys 1133399399 1564262
+1133400704 3 c 386/9pccpu.gz - 664 sys sys 1133399400 555413
+1133400704 4 c 386/9pcdisk - 775 sys sys 1133399404 2081322
+1133400704 5 c 386/9pcdisk.gz - 664 sys sys 1133399406 749316
+1133400704 6 c 386/9pcf - 775 sys sys 1133399412 2424539
+1133400704 7 c 386/9pcf.gz - 664 sys sys 1133399414 903461
+1133402504 0 c sys/games/lib/fortunes - 664 sys sys 1133400893 256649

+ 1 - 0
sys/games/lib/fortunes

@@ -4093,3 +4093,4 @@ gcc is the holy cow of compilers, not the holy grail.  - forsyth
 NOTE 3: Each bit has the value either ZERO or ONE.  - ECMA-035 spec
 cpu90112: exiting
 cpu0: existing
+The operation timed out while trying to contact void.

+ 3 - 1
sys/src/9/pc/screen.c

@@ -469,7 +469,9 @@ vgalinearpci(VGAscr *scr)
 			continue;
 		if(best==-1 
 		|| p->mem[i].size > p->mem[best].size 
-		|| (p->mem[i].size == p->mem[best].size && (p->mem[i].bar&8)))
+		|| (p->mem[i].size == p->mem[best].size 
+		  && (p->mem[i].bar&8)
+		  && !(p->mem[best].bar&8)))
 			best = i;
 	}
 	if(best >= 0){