Merge pull request #34 from Russell-S-Harper/development

Added BRS and RTN instructions.

common/common.asm

@@ -371,7 +371,7 @@ _TRFI0X	.(		; transfer I0 to register indexed by X, MSB returned in A
 	RTS
 .)
 
-_RTZI0X	.(		; clears I0, clears underflow, falls through to _RETI0X
+_RTZI0X	.(		; clears I0, clears underflow, *falls thru* to _RETI0X
 	JSR _ZERI0
 	LDA _F		; clear underflow
 	AND #_F_U^$FF
@@ -841,40 +841,35 @@ _ESC	.(		; ESC			00				- escape back into regular assembler
 .)
 
 _RTN	.(		; RTN			01				- return from subroutine
+	; some stack hocus pocus
+	; currently the stack has return address corresponding to _CMN._1 + 2, _PCL, _PCH, ...
+	; we need to pop that, pop the updated PC, then push the address back
+	PLA		; save the return address
+	STA _I0+2
+	PLA
+	STA _I0+3
+	PLA		; pull the program counter to return
+	STA _PCH
+	PLA
+	STA _PCL
+	LDA _I0+3	; push the return address back
+	PHA
+	LDA _I0+2
+	PHA
 	RTS
 .)
 
-_BRS	.(		; BRS xxyy		02 yy xx	PC <- PC + xxyy	- branch to subroutine
+_INIBR	.(		; save the branch offset in I0, *falls thru* to _UPDPC
-	RTS
-.)
-
-_BRA	.(		; BRA xxyy		03 yy xx	PC <- PC + xxyy	- branch always
 	LDY #1		; save the offset
 	LDA (_PC), Y
-	PHA
+	STA _I0+1	; high byte
 	DEY
 	LDA (_PC), Y
-	PHA
+	STA _I0		; low byte
-	LDA #2		; update PC by the length of the branch address
-	CLC
-	ADC _PCL
-	STA _PCL
-	BNE _1
-	INC _PCH
-_1	PLA		; pull the low byte
-	CLC
-	ADC _PCL
-	STA _PCL
-	PLA		; pull the high byte
-	ADC _PCH
-	STA _PCH
-	RTS
 .)
 
-_BRX	.(		; generic branch testing
+_UPDPC	.(		; update PC by the length of a branch address
-	AND _F		; check the bit
+	LDA #2		; the length of a branch address
-	BNE _BRA	; if set, branch
-	LDA #2		; not set, advance the program counter over the xxyy offset
 	CLC
 	ADC _PCL
 	STA _PCL
@@ -883,6 +878,49 @@ _BRX	.(		; generic branch testing
 _1	RTS
 .)
 
+_UPPCI0	.(		; update PC with offset in I0
+	LDA _I0		; get the low byte
+	CLC
+	ADC _PCL
+	STA _PCL
+	LDA _I0+1	; get the high byte
+	ADC _PCH
+	STA _PCH
+	RTS
+.)
+
+_BRS	.(		; BRS xxyy		02 yy xx	PC <- PC + xxyy	- branch to subroutine
+	; some stack hocus pocus
+	; currently the stack has return address corresponding to _CMN._1 + 2, ...
+	; we need to pop that, push the updated PC, then push the address back
+	JSR _INIBR	; save the offset and update PC by the length of a branch address
+	PLA
+	STA _I0+2
+	PLA
+	STA _I0+3
+	LDA _PCL	; push the program counter to return
+	PHA
+	LDA _PCH
+	PHA
+	LDA _I0+3	; push the return address back
+	PHA
+	LDA _I0+2
+	PHA
+	; stack is now _CMN._1 + 2, _PCL, _PCH, ...
+	JMP _UPPCI0	; update PC with I0 offset, let it handle the return
+.)
+
+_BRA	.(		; BRA xxyy		03 yy xx	PC <- PC + xxyy	- branch always
+	JSR _INIBR	; save the offset and update PC by the length of a branch address
+	JMP _UPPCI0	; update PC with I0 offset, let it handle the return
+.)
+
+_BRX	.(		; generic branch testing
+	AND _F		; check the bit
+	BNE _BRA	; if set, branch
+	JMP _UPDPC	; not set, advance the program counter over the xxyy offset, let it handle the return
+.)
+
 _BRE	.(		; BRE xxyy		04 yy xx	PC <- PC + xxyy	- branch if Rp = Rq (after CMR)
 	LDA #_F_E
 	BNE _BRX

common/page6.src

@@ -6,14 +6,15 @@
 
 HDR(DEMO)
 	CMN
-	SET(R0, 999999.999)
+	SET(R0, 9.4662)
-	SET(R1, -999999.999)
+	PSH(R0)
-	CMR(R0, R1)
+	BRS(FACTORIAL)
+	POP(R4)
 	ESC
 	BRK
 
 BGN(FACTORIAL)
-	SET(R1, 9.4662)
+	POP(R1)
 	SET(R2, 1)
 	MOD(R3, R1, R2)
 	SUB(R1, R1, R3)
@@ -22,8 +23,8 @@ _1	TST(R1)
 	MUL(R2, R2, R1)
 	DCR(R1)
 	BRA(_1)
-_2	ESC
+_2	PSH(R2)
-	BRK
+	RTN
 END(FACTORIAL)
 
 END(DEMO)