Fixed MMR1/MMR2 updates, and synced boot monitor code with http://skn.noip.me/pdp11/boot.mac

2016-11-15 16:16:38 -08:00 · 2016-11-15 16:16:38 -08:00 · 9d67f243ef
commit 9d67f243ef
parent 7342ea254e
9 changed files with 1401 additions and 809 deletions
--- a/apps/pdp11/boot/monitor/BOOTMON.mac
+++ b/apps/pdp11/boot/monitor/BOOTMON.mac
@ -174,13 +174,14 @@ CMD:
 	RTI


-CMDTBL:	.WORD	BOOT,HALT,TEST,LIGHTS,HELP
-HLPMSG:	.ASCIZ	'COMMANDS ARE BOOT, HALT, LIGHTS, TEST AND HELP'<15><12>'BOOT DEVICES ARE RK? RL? OR RP?'<15><12>
+CMDTBL: .WORD	BOOT,HALT,TEST,DIAG,LIGHTS,HELP
+HLPMSG:	.ASCIZ	'COMMANDS ARE BOOT, HALT, TEST, DIAG, LIGHTS AND HELP'<15><12>'BOOT DEVICES ARE RK? RL? OR RP?'<15><12>
 EOL:	.BYTE	15,12,0
 DEL:	.BYTE	10,40,10,0
 CMDLST:	.ASCIZ	'BOOT'
 	.ASCIZ	'HALT'
 	.ASCIZ	'TEST'
+        .ASCIZ	'DIAG'
 	.ASCIZ	'LIGHTS'
 	.ASCIZ	'HELP'
 	.BYTE	0
@ -190,6 +191,7 @@ BANNER:	.ASCIZ	'PDP-11 MONITOR V1.0'<12><15><12><15>
 PROMPT:	.ASCIZ	'BOOT> '
 BADBOO:	.ASCIZ	'UNKNOWN BOOT DEVICE'<12><15>
 PERMSG:	.ASCIZ	'      CLOCK TICKS'<12><15>
+LOOMSG:	.ASCIZ	'      ITERATIONS'<12><15>

        .EVEN

@ -236,6 +238,179 @@ TEST:
 	JSR	PC,PRINT
 	RTS	PC

+LOOCNT:	.WORD	0
+
+DIAG:
+	CLR	LOOCNT
+	CLR	CLKTIC
+DIAGLP:
+	CLR	R5
+	BMI	L1
+	BVS	L1
+	BHI	L1
+	BLT	L1
+	BLOS	L2
+L1:	HALT
+
+L2:	DEC	R5
+	BPL	L3
+	BEQ	L3
+	BGE	L3
+	BLE	L4
+L3:	HALT
+
+L4:	ROR	R5
+	BVC	L5
+	BCC	L5
+	BNE	L6
+L5:	HALT
+
+L6:	MOVB	#17,@#177776
+	BPL	L7
+	BVC	L7
+	BLT	L7
+	BHI	L7
+	BMI	L8
+L7:	HALT
+
+L8:	MOV	#77777,R3
+	ADD	#77777,R3
+	CMPB	@#177776,#5
+	BNE	L9
+	HALT
+
+L9:	MOVB	#1700,R4
+	BPL	L10
+	CMP	R4,#177700
+	BEQ	L11
+L10:	HALT
+
+L11:	CLRB	R4
+	CMP	R4,#177400
+	BEQ	L12
+	HALT
+
+L12:	MOV	#125252,R5
+	MOV	R5,R0
+	MOV	R0,R1
+	MOV	R1,R2
+	MOV	R2,R3
+	MOV	R3,R4
+	MOV	R4,R5
+	SUB	R5,R1
+	BLT	NODIAG
+	BEQ	L13
+NODIAG:	HALT
+
+L13:	ROL	R2
+	BCC	L14
+	BLT	L15
+L14:	HALT
+
+L15:	ADD	R2,R3
+	INC	R3
+	COM	R3
+	ADD	R3,R1
+	BCS	L16
+	BLE	L17
+L16:	HALT
+
+L17:	ROR	R4
+	BIS	R4,R3
+	ADD	R5,R3
+	INC	R3
+	BCS	L18
+	DEC	R1
+	BLT	L19
+L18:	HALT
+
+L19:	COM	R0
+	BLOS	L20
+	HALT
+
+L20:	BIC	R0,R1
+	ADD	R1,R1
+	BGT	L21
+	BLE	L22
+L21:	HALT
+
+L22:	SWAB	R1
+	CMP	R1,#052125
+	BNE	L23
+	BIT	R4,R5
+	BGT	L23
+	COM	R5
+	BNE	L24
+L23:	HALT
+
+L24:	MOVB	#177401,R0
+	BPL	L26
+L25:	HALT
+
+L26:	SOB	R0,L25
+	CLR	R1
+L27:	INC	R1
+	SOB	R0,L27
+	TST	R0
+	BNE	L28
+	TST	R1
+	BEQ	L29
+L28:	HALT
+
+L29:	MOV	#N1,PC
+	HALT
+
+N1:	TST	(PC)+
+	HALT
+
+N2:	MOV	#N3,-(SP)
+	RTS	PC
+	HALT
+
+N3:	CLR	-(SP)
+	MOV	#N4,-(SP)
+	RTI
+	HALT
+
+N4:	JMP	@#N5
+	HALT
+
+N5:	MOV	#3,R5
+	CLR	@#6
+	MOV	#N6,@#4
+	TST	-(R5)
+	HALT
+N6:	ADD	#4,SP
+
+	CLR	R0
+	MOV	#7777,R1
+N7:	MOV	R0,R2
+	ADD	#5,R2
+	CMP	(R0)+,-5(R2)
+	BEQ	N8
+	HALT
+D1:	.WORD	0
+
+N8:	SOB	R1,N7
+
+	INC	LOOCNT
+	BCC	10$
+	HALT
+10$:	CMP	CLKTIC,#2200
+	BHI	20$
+	JMP	DIAGLP
+20$:	MOV	#LOOMSG+5,R0
+	MOV	LOOCNT,R3
+
+25$:	CLR	R2
+	DIV	#10,R2
+	ADD	#'0,R3
+	MOVB	R3,-(R0)
+	MOV	R2,R3
+	BNE	25$
+
+	JSR	PC,PRINT
+	RTS	PC

 MMR0=177572
 MMR1=177574