Plan 9 from Bell Labs 2003-01-31

dist/replica/plan9.db

@@ -4943,7 +4943,7 @@ sys/src/9/alphapc/vgatvp3026.c - 664 sys sys 1015012788 30
 sys/src/9/alphapc/vgax.c - 664 sys sys 1015012788 24
 sys/src/9/bitsy - 20000000775 sys sys 1018721429 0
 sys/src/9/bitsy/Booting101 - 664 sys sys 1037028993 6820
-sys/src/9/bitsy/bitsy - 664 sys sys 1037028996 412
+sys/src/9/bitsy/bitsy - 664 sys sys 1043922351 450
 sys/src/9/bitsy/bitsyreset.s - 664 sys sys 1017695510 2352
 sys/src/9/bitsy/clock.c - 664 sys sys 1037028998 4835
 sys/src/9/bitsy/dat.h - 664 sys sys 1037029000 5672
@@ -4964,13 +4964,13 @@ sys/src/9/bitsy/fpiarm.c - 664 sys sys 1017695513 9328
 sys/src/9/bitsy/fpimem.c - 664 sys sys 1017695513 2229
 sys/src/9/bitsy/gamma.c - 664 sys sys 1017695513 646
 sys/src/9/bitsy/gamma.h - 664 sys sys 1017695514 540718
-sys/src/9/bitsy/initcode - 664 sys sys 1017695514 456
+sys/src/9/bitsy/init9.s - 444 sys sys 1043922398 183
 sys/src/9/bitsy/io.h - 664 sys sys 1037029022 8008
 sys/src/9/bitsy/l.s - 664 sys sys 1037029024 18182
 sys/src/9/bitsy/main.c - 664 sys sys 1039753387 8929
 sys/src/9/bitsy/map - 664 sys sys 1017695515 236
 sys/src/9/bitsy/mem.h - 664 sys sys 1037029029 8048
-sys/src/9/bitsy/mkfile - 664 sys sys 1039911490 2389
+sys/src/9/bitsy/mkfile - 664 sys sys 1043922405 2438
 sys/src/9/bitsy/mmu.c - 664 sys sys 1017695515 11204
 sys/src/9/bitsy/mouse.c - 664 sys sys 1017695516 962
 sys/src/9/bitsy/paqfiles - 20000000775 sys sys 1020011250 0
@@ -4991,7 +4991,7 @@ sys/src/9/bitsy/sdata.c - 464 sys sys 1037029041 44666
 sys/src/9/bitsy/tar.c - 664 sys sys 1017695521 1375
 sys/src/9/bitsy/trap.c - 664 sys sys 1037029044 18951
 sys/src/9/bitsy/uartsa1110.c - 664 sys sys 1037029045 8530
-sys/src/9/bitsy/wavelan.c - 664 sys sys 1037029074 25685
+sys/src/9/bitsy/wavelan.c - 664 sys sys 1043922422 25684
 sys/src/9/bitsy/wavelan.h - 664 sys sys 1037029076 27
 sys/src/9/boot - 20000000775 sys sys 1018556557 0
 sys/src/9/boot/aux.c - 664 sys sys 1015012529 2520

dist/replica/plan9.log

@@ -17126,3 +17126,8 @@
 1043789528 1 c sys/src/libthread/ioproc.c - 664 sys sys 1043788755 928
 1043805300 0 a sys/src/cmd/venti/printarena.c - 664 sys sys 1043805294 2557
 1043866956 0 c rc/bin/replica/push - 775 sys sys 1043865725 361
+1043933432 0 c sys/src/9/bitsy/bitsy - 664 sys sys 1043922351 450
+1043933432 1 a sys/src/9/bitsy/init9.s - 444 sys sys 1043922398 183
+1043933432 2 c sys/src/9/bitsy/mkfile - 664 sys sys 1043922405 2438
+1043933432 3 c sys/src/9/bitsy/wavelan.c - 664 sys sys 1043922422 25684
+1043933432 4 d sys/src/9/bitsy/initcode - 664 sys sys 1017695514 0

sys/src/9/bitsy/bitsy

@@ -38,7 +38,6 @@ link
 
 misc
 	uartsa1110
-	paqfs.root
 	sdata
 
 port
@@ -47,3 +46,6 @@ port
 boot cpu
 boot
 	paq
+bootdir
+	bootbitsy.out	boot
+	/arm/bin/paqfs	paqfs

sys/src/9/bitsy/init9.s

@@ -0,0 +1,12 @@
+TEXT	_main(SB),$8
+	MOVW	$setR12(SB), R12	/* load the SB */
+	MOVW	$boot(SB), R0
+
+	ADD	$12, R13, R1	/* get a pointer to 0(FP) */
+
+	MOVW	R0, 4(R13)
+	MOVW	R1, 8(R13)
+
+	BL	startboot(SB)
+
+

sys/src/9/bitsy/initcode

@@ -1,31 +0,0 @@
-#include "/sys/src/libc/9syscall/sys.h"
-
-TEXT	main+0(SB),$-4
-
-	/*
-	 *  for initial debugging, set regs to known vals
-	 */
-	MOVW	$1,R0
-	ADD	R0,R0,R1
-	ADD	R0,R1,R2
-	ADD	R0,R2,R3
-	ADD	R0,R3,R4
-	ADD	R0,R4,R5
-	ADD	R0,R5,R6
-	ADD	R0,R6,R7
-	ADD	R0,R7,R8
-	ADD	R0,R8,R9
-	ADD	R0,R9,R10
-	ADD	R0,R10,R11
-	ADD	R0,R11,R12
-	ADD	R0,R12,R14
-	/*
-	 *  exec /boot (args put on stack by userinit())
- 	 */
-	MOVW	$EXEC, R0
-	SWI 0
-	/*
-	 *  should never get here
-	 */
-here:
-	B	here

sys/src/9/bitsy/mkfile

@@ -47,7 +47,6 @@ OBJ=\
 	screen.$O\
 	$DEVS\
 	$PORT\
-	boot$CONF.root.$O\
 	fpi.$O\
 	fpiarm.$O\
 	fpimem.$O\
@@ -91,12 +90,14 @@ installkern:V:	$p$CONF
 
 <../boot/bootmkfile
 <../port/portmkfile
+<|../port/mkbootrules $CONF
 
-init.h:	initcode /sys/src/libc/9syscall/sys.h
-	$AS initcode
-	$LD -l -s -R4 -o init.out initcode.$O
+init.h:	../port/initcode.c init9.s
+	$CC ../port/initcode.c
+	$AS init9.s
+	$LD -l -R1 -o init.out init9.$O initcode.$O /arm/lib/libc.a
 	{echo 'uchar initcode[]={'
-	 xd -r -1x init.out |
+	 strip < init.out | xd -1x |
 		sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g'
 	 echo '};'} > init.h
 

sys/src/9/bitsy/wavelan.c

@@ -655,7 +655,7 @@ w_timer(void* arg)
 			}
 			if((ctlr->ticks % 120) == 0)
 			if(ctlr->txbusy == 0)
-				w_cmd(ctlr, WCmdAskStats, WTyp_Stats);
+				w_cmd(ctlr, WCmdEnquire, WTyp_Stats);
 		}
 		iunlock(ctlr);
 	}