Sunrise 45: More cleanup

jonatadev · Dec 10, 2022 · 53b2876 · 53b2876
1 parent 28e988f
commit 53b2876
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 49 deletions.
diff --git a/Sunrise45/ALARM_AND_DISPLAY_PROCEDURES.agc b/Sunrise45/ALARM_AND_DISPLAY_PROCEDURES.agc
@@ -7,12 +7,10 @@
 ## Assembler:	yaYUL --block1
 ## Contact:	Jim Lawton <jim DOT lawton AT gmail DOT com>
 ## Website:	www.ibiblio.org/apollo/index.html
-## Page Scans:	www.ibiblio.org/apollo/ScansForConversion/Solarium055/
 ## Mod history:	2009-09-15 JL	Created.
 ## 		2016-12-28 RSB	Proofed comment text using octopus/ProoferComments,
 ##				and fixed errors found.
 
-## Page 293
 
 # 	THE FOLLOWING SUBROUTINE MAY BE CALLED TO DISPLAY A NON-ABORTIVE ALARM CONDITION. IT MAY BE CALLED
 # EITHER IN INTERRUPT OR UNDER EXECUTIVE CONTROL.
@@ -56,7 +54,6 @@ NEWALARM	XCH	ITEMP1		# SAVE RETURN ADDRESS FOR CALL TO NOVAC.
 		XCH	FAILREG		# SET FAILREG AND GET BACK RETURN ADDRESS.
 		TC	ENDALARM
 
-## Page 294
 
 #	JOB WHICH CALLS NVSUB FOR ALARM DISPLAY.
 
@@ -78,7 +75,6 @@ PROGLARM	CS	ONE		# TURNS ON PROGRAM FAIL LIGHT ON THE
 ALMPRIO		OCT	37000
 FAILDISP	OCT	00131
 
-## Page 295
 
 #	THE FOLLOWING ROUTINE IS CALLED TO INITIATE AN ABORT. FAILREG IS SET (ACCORDING TO THE MULTIPLE
 # FAILURES CONVENTION) AND A RE-START IS INITIATED BY TC-SELF. THIS IS CALLED ONLY UNDER RARE CIRCUMSTANCES.

diff --git a/Sunrise45/ERASABLE_ASSIGNMENTS.agc b/Sunrise45/ERASABLE_ASSIGNMENTS.agc
@@ -454,7 +454,7 @@ ASQ		EQUALS	BMEMORY +165D
 W		EQUALS	CMEMORY +000D
 
 
-# THE FOLLOWING STORAGE IS RESERVED EXCLUSIVELY FOR SELF-CHECK
+#	THE FOLLOWING STORAGE IS USED BY SELF-CHECK
 
 SMODE		ERASE
 SFAIL		ERASE

diff --git a/Sunrise45/EXECUTIVE.agc b/Sunrise45/EXECUTIVE.agc
@@ -1,16 +1,17 @@
 ### FILE="Main.annotation"
 ## Copyright:	Public domain.
 ## Filename:	EXECUTIVE.agc
-## Purpose:	Part of the source code for Solarium build 55. This
-##		is for the Command Module's (CM) Apollo Guidance
-##		Computer (AGC), for Apollo 6.
+## Purpose:	A section of Sunrise 45. 
+##		It is part of the reconstructed source code for the penultimate
+##		release of the Block I Command Module system test software. No
+##		original listings of this program are available; instead, this
+##		file was created via disassembly of dumps of Sunrise core rope
+##		memory modules and comparison with the later Block I program
+##		Solarium 55.
 ## Assembler:	yaYUL --block1
-## Contact:	Jim Lawton <jim DOT lawton AT gmail DOT com>
+## Contact:	Ron Burkey <[email protected]>.
 ## Website:	www.ibiblio.org/apollo/index.html
-## Mod history:	2009-09-19 JL	Created.
-##		2016-08-18 RSB	Some fixes.
-## 		2016-12-28 RSB	Proofed comment text using octopus/ProoferComments,
-##				and fixed errors found.
+## Mod history:	2022-12-09 MAS	Initial reconstructed source.
 
 
 # EXECUTIVE PROGRAMS

diff --git a/Sunrise45/FIXED-FIXED_INTERPRETER_SECTION.agc b/Sunrise45/FIXED-FIXED_INTERPRETER_SECTION.agc
@@ -7,14 +7,12 @@
 ## Assembler:	yaYUL --block1
 ## Contact:	Jim Lawton <jim DOT lawton AT gmail DOT com>
 ## Website:	www.ibiblio.org/apollo/index.html
-## Page Scans:	www.ibiblio.org/apollo/ScansForConversion/Solarium055/
 ## Mod history:	2009-09-16 JL	Created.
 ##		2016-08-18 RSB	Some corrections.
 ##		2016-08-23 RSB	More of the same.
 ## 		2016-12-28 RSB	Proofed comment text using octopus/ProoferComments,
 ##				and fixed errors found.
 
-## Page 37
 
 		SETLOC	4000		# SECOND HALF OF FIXED-FIXED.
 
@@ -41,7 +39,6 @@ NEWEQUN		CS	BANKSET		# HERE FOR NEW EQUATIONS
 		CAF	ZERO		# TO SET ORDER TO ZERO
 		TC	IPROC2
 
-## Page 38
 
 DANZIG		CCS	NEWJOB		# INTERPRETIVE INTERRUPT
 		TC	CHANG2		# CALL IN BANK0 AND SWITCH JOBS
@@ -82,7 +79,6 @@ NEGIDEX		OCT	-33777		# NEGATIVE OF STORE ADDRESS PREFIX +1
 		TS	POLISH
 		TC	NONINDEX
 
-## Page 39
 
 IPROC		TS	ORDER		# OP CODE WORD WAS PICKED UP BY CCS
 		XCH	LOC
@@ -111,7 +107,6 @@ UNAPROC		CCS	NEWEQIND	# PROCESS UNARY REQUESTS
 		INDEX	A
 		TC	UNAJUMP
 
-## Page 40
 
 #	PROCESS MISCELLANEOUS OP CODES.
 
@@ -151,7 +146,6 @@ ENDMISC		CAF	LOW7
 		INDEX	A
 		TC	NONJUMP
 
-## Page 41
 
 UNALOAD		CAF	LOW7		# PROCESS LOADING REQUESTS FOR UNARY
 		MASK	CYR		# OPERATIONS. START BY FINDING APPROPRIATE
@@ -182,7 +176,6 @@ LOWWD		CAF	ZERO		# RIGHT HAND OP CODE HAS ALREADY BEEN SET
 		XCH	ORDER
 		TC	JUMPIT -1
 
-## Page 42
 
 LOAD		TS	NEWEQIND	# LOADS FIRST ADDRESS OF NEW EQUATIONS
 		INDEX	MODE		# TRIGGERS TYPE OF CLEAR-AND-ADD
@@ -212,7 +205,6 @@ ADDRESS		INDEX	ADRLOC		# INDEXABLE ADDRESS ROUTINE
 BUGMPAC		XCADR	MPAC
 		TC	NONINDEX
 
-## Page 43
 
 #	PROCEDURE FOR INDEXED ADDRESSES.
 
@@ -240,7 +232,6 @@ INDEX		XCH	POLISH
 		XCH	POLISH		# LESS THAN -1000. GO DIRECTLY TO
 		TC	SWADDR		# SWITCHED-BANK ADDRESS ROUTINE.
 
-## Page 44
 
 NONINDEX	CS	POLISH		# GET 14 BIT ADDRESS
 		AD	ERASTEST	# SEE IF ERASABLE OR NOT
@@ -277,7 +268,6 @@ JUMP		CAF	THREE		# LOOK AT LOW-ORDER 2 BITS IN 5 BIT CODE
 		INDEX	A
 		TC	INDJUMP
 
-## Page 45
 
 PUSHDOWN	XCH	PUSHLOC		# NO STORE ADDRESS GIVEN - PUSH DOWN
 		TS	ADDRWD		# STORED IN THE NEXT ENTRY
@@ -330,7 +320,6 @@ INCADR		CAF	ONE
 		TS	ADRLOC
 		TC	Q
 
-## Page 46
 
 IJUMP		TC	ITCF		# INTERPRETIVE TRANSFER CONTROL
 		TC	VXSC1		# VECTOR TIMES SCALAR
@@ -373,7 +362,6 @@ IJUMP		TC	ITCF		# INTERPRETIVE TRANSFER CONTROL
 
 INDJUMP		EQUALS	IJUMP -1
 
-## Page 47
 
 NONJUMP		TC	EXIT
 		TC	AXT		# ADDRESS TO INDEX TRUE
@@ -409,7 +397,6 @@ UNAJUMP		TC	TMOVE		# FOR TP AS WELL
 		TC	SMOVE
 		TC	VDEF		# VECTOR DEFINE
 
-## Page 48
 
 THREE		OCT	3
 		OCT	2
@@ -450,7 +437,6 @@ NEG1/2		2DEC	-.5
 POS1/2		2DEC	.5
 HALF		EQUALS	POS1/2
 
-## Page 49
 
 TCS1		CS	BUF +2		# USED BY DMP, ETC
 		TS	MPAC +2
@@ -494,7 +480,6 @@ NEQRET		TC	NEWEQUN		# START NEW EQUATION
 TTS1		EQUALS	STORE3
 #							35W
 
-## Page 50
 
 DOBR		XCH	POLISH		# DOES BRANCHES
 		TC	DOBR2
@@ -539,7 +524,6 @@ VTS1		XCH	ADDRWD		# TRANSFER TO STORAGE
 		TS	VACLOC
 		TC	NEWEQUN		# THIS ONLY HAPPENS AT END OF EQUATION
 
-## Page 51
 
 VECMOVE		TS	TEM2		# MOVES A DP VECTOR IN THE FASTEST WAY
 		INDEX	ADDRWD		# AVAILABLE. USED BY VCA, VCS, AND VTS.
@@ -586,7 +570,6 @@ CSQ		CS	1		# CONSTANT USED BY WAITLIST.
 
 		TC	Q		# DONE
 
-## Page 52
 
 STZ1		CAF	ZERO
 		INDEX	ADDRWD
@@ -613,7 +596,6 @@ LOW7		OCT	177
 
 STOR1		EQUALS	STZ1 +1
 
-## Page 53
 
 TAG		CCS	CYR		# SETS TAG1 ACCORDING TO SIGN BIT IN CYR
 		CAF	ZERO
@@ -659,7 +641,6 @@ TPSET		CS	TWO		# AND FOR TP
 		TC	LOAD
 		TC	Q
 
-## Page 54
 
 DAD2		TC	DPSET		# DOUBLE PRECISION ADD INSTRUCTION
 		CAF	DAD2 +4
@@ -693,7 +674,6 @@ TRAD		TC	TPSET		# TRIPLE PRECISION ADD INSTRUCTION
 
 		TC	TEM5		# AND RETURN
 
-## Page 55
 
 DAD1		TS	TEM2		# DOUBLE PRECISION ADD ROUTINE
 		INDEX	TEM2		# POLYNOMIAL EVALUATOR ENTERS HERE.
@@ -731,7 +711,6 @@ ADDTOSUB	XCH	ADDRWD		# BY PUTTING THE APPROPRIATE BITS IN
 		TS	ADDRWD		# STEAD OF A DOUBLE ADD.
 		TC	Q
 
-## Page 56
 
 DMP2		TC	DPSET		# DP MULTIPLY (AND ROUND) ROUTINE
 		XCH	ADDRWD
@@ -754,7 +733,6 @@ SHIFTR1		TC	DPSET		# TSRT INSTRUCTION.
 		TC	SHIFTR -1	# WITH DECREMENTED COUNT IN A.
 		TC	DANZIG
 
-## Page 57
 
 DMP1		TS	TEM2		# GENERAL PURPOSE DP MULTIPLICATION
 		INDEX	TEM2		# POLYNOMIAL ENTERS HERE.
@@ -790,7 +768,6 @@ DMP1		TS	TEM2		# GENERAL PURPOSE DP MULTIPLICATION
 
 # 	TIMING:  86 MC +-2  OR 1.032 MS +-0.024				30 WORDS
 
-## Page 58
 
 BDDV		TC	DPSET		# BACKWARDS DP DIVIDE
 		CAF	ONE		# SET SWITCH
@@ -830,7 +807,6 @@ DAD		XCH	Q		# DP ADD ROUTINE WORKING JUST AS MP ABOVE
 		INDEX	TEM5
 		TC	1		# TIME IS 48+-2 MC OR 576 MICRO-SEC.
 
-## Page 59
 
 VACCOM		XCH	Q		# COMPLEMENT THE APPROPRIATE VAC
 		TS	TEM5
@@ -862,7 +838,6 @@ VAD1		TC	VECSET
 		TC	DAD1
 		TC	INT1
 
-## Page 60
 
 DOT1		TC	VECSET		# DP DOT PRODUCT ROUTINE
 		TC	DOT2
@@ -905,7 +880,6 @@ DOT2		XCH	TWO		# SUBROUTINE DOT2 COMPUTES THE TRIPLE-
 		TC	TRAD +3
 		TC	TEM8
 
-## Page 61
 
 INCRT4		XCH	TEM4
 		AD	TEM11
@@ -942,7 +916,6 @@ MXV2		CAF	K2		# USES VBUF
 		AD	TEM9
 		TS	ADDRWD
 		TC	DOT2 +2
-## Page 62
 		CAF	K2
 		TS	ADDRWD
 		AD	FOUR
@@ -974,7 +947,6 @@ MINUS13		DEC	-13
 VECCHECK	TC	VCA1		# USE ADDRWD TO LOAD VECTOR
 		CAF	BUGMPAC
 
-## Page 63
 
 VXSC2		TS	TEM4
 		CS	VACLOC
@@ -1000,7 +972,6 @@ INCRT2		XCH	TEM2
 		TS	TEM2
 		TC	Q
 
-## Page 64
 
 SHORTMP		XCH	MPAC +2		# MULTIPLY THE CONTENTS OF MPAC,MPAC+1, 
 		EXTEND			# MPAC+2 BY THE SINGLE PRECISION NUMBER
@@ -1049,7 +1020,6 @@ ROUND		CAF	ZERO		# ROUND THE TRIPLE-PRECISION NUMBER WHOSE
 		TS	OVFIND
 		TC	Q
 
-## Page 65
 
 STB		CS	BUF
 		INDEX	TEM2
@@ -1085,7 +1055,6 @@ CROSS1		TC	VECSET		# DP VECTOR CROSS PRODUCT (BOTH WAYS)
 		TS	TEM4		# BY THE ORDER, AND V IS C(VAC).
 		XCH	TWO
 
-## Page 66
 
 LUP		TS	IND
 		INDEX	IND
@@ -1116,7 +1085,6 @@ CREXIT		XCH	K2
 		TC	VCS1		# VXV
 LDANZIG		TC	DANZIG
 
-## Page 67
 
 # DOUBLE-PRECISION POLYNOMIAL EVALUATION ROUTINE.
 #
@@ -1158,7 +1126,6 @@ POLY		CAF	BUGBITS2	# CONTAINS XCADR VBUF
 		TS	TEM9
 		TC	POLYLUP +3
 
-## Page 68
 
 POLYLUP		TS	TEM10
 		TC	DMP1 +1
@@ -1177,7 +1144,6 @@ BUGBITS2	XCADR	VBUF		# USED BY POLY
 
 		TC	TEM9		# RETURN
 
-## Page 69
 
 ITCF		CS	BANKSET		# ITC - UNCONDITIONAL TRANSFER
 		XCH	ADRLOC		# PLACE IN QPRET THE POLISH ADDRESS OF

diff --git a/Sunrise45/MAIN.agc b/Sunrise45/MAIN.agc
@@ -32,7 +32,7 @@ $FIXED-FIXED_INTERPRETER_SECTION.agc
 $BANK_03_INTERPRETER_SECTION.agc
 $EXECUTIVE.agc
 $WAITLIST.agc
-$PROGRESS_CONTROL.agc
+$MASTER_CONTROL.agc
 $FRESH_START_AND_RESTART.agc
 $DOWN-TELEMETRY_PROGRAM.agc
 $T4RUPT_OUTPUT_CONTROL_PROGRAMS.agc

diff --git a/Sunrise45/PROGRESS_CONTROL.agc → Sunrise45/MASTER_CONTROL.agc b/Sunrise45/PROGRESS_CONTROL.agc → Sunrise45/MASTER_CONTROL.agc
diff --git a/Sunrise45/Makefile b/Sunrise45/Makefile
@@ -20,4 +20,4 @@ include ../Makefile.inc
 
 .PHONY: diffSunrise45
 diffSunrise45:
-	diff -s Sunrise45.bin Sunrise45_dump.bin
+	diff -s Sunrise45.bin Sunrise45-dump.bin
diff --git a/Sunrise45/Sunrise45_dump.bin → Sunrise45/Sunrise45-dump.bin b/Sunrise45/Sunrise45_dump.bin → Sunrise45/Sunrise45-dump.bin