Move stack operations into separate file. Move the framework into memory bank 00.

Author: NeilFraser

Blockly/framework/Main.agc

@@ -77,12 +77,7 @@ T4RUPT		XCH	ARUPT
 
 # Initialize the stack pointer to be 0.
 # This is the offset from the starting stack position.
-START		CAF	STACK-EB	# Switch to stack memory bank.
-		TS	EB
-		CA	NUM0
-		TS	STACKPTR
-		CAF	MAIN-EB		# Switch to main memory bank.
-		TS	EB
+START		TCR	STACKINI
 		# Clear the DSKY.
 		TCR	FLSHDSP
 		# Initialize the random number generator with seed
@@ -100,7 +95,10 @@ $Blockly.agc
 AGCEND		CA	A
 		TCF	AGCEND
 
+# Place all the framework code into bank 00.
+		SETLOC	10000
 # Code modules.
+$Stack.agc
 $Boolean.agc
 $List.agc
 $Math.agc
@@ -156,53 +154,11 @@ SLEEPBZF	CA	SLEEPING
 SLEEPEND	RETURN
 
 
-# Push the contents of the 'A' register onto the stack.
-PUSH		TS	STACKTMP
-		CAF	STACK-EB	# Switch to stack memory bank.
-		TS	EB
-		CAE	STACKTMP
-		INCR	STACKPTR
-		INDEX	STACKPTR
-		TS	STACK
-		CAF	MAIN-EB		# Switch back to main memory bank.
-		TS	EB
-		RETURN
-
-
-# POP: Pop the last value on the stack into the 'A' register.
-POP		CAF	STACK-EB	# Switch to stack memory bank.
-		TS	EB
-		INDEX	STACKPTR
-		CAE	STACK
-		TS	STACKTMP
-		EXTEND
-		DIM	STACKPTR
-		CAF	MAIN-EB		# Switch back to main memory bank.
-		TS	EB
-		CAE	STACKTMP
-		RETURN
-
-
-# PEEK: Read the last value on the stack into the 'A' register.
-PEEK		CAF	STACK-EB	# Switch to stack memory bank.
-		TS	EB
-		INDEX	STACKPTR
-		CAE	STACK
-		TS	STACKTMP
-		CAF	MAIN-EB		# Switch back to main memory bank.
-		TS	EB
-		CAE	STACKTMP
-		RETURN
-
 
 # Variables in memory.
 SLEEPING	=	061	# Flag indicating if we are busy-sleeping.
 INPUTING	=	062	# Waiting for a DSKY key press.
-QPOP		=	063	# Temporary spot for Q.
-STACKTMP	=	064	# Temp value for stack operations.
 
-STACKPTR	=	1400	# Stack pointer, starts at 0.
-STACK		=	1400	# Start address of stack (minus one).
 
 # Constants.
 10MS		OCT	37777	# 2^14-1 is 10 ms to T4/T5 overflow.
@@ -222,7 +178,6 @@ NUM16		DEC	16
 NUM9601		DEC	9601	# Random number seed.
 
 MAIN-EB		OCT	1400	# E3 is the default user erasable memory bank.
-STACK-EB	OCT	2000	# E4 erasable memory bank used by stack.
 
 # System Address Locations
 A		=	00

Blockly/framework/Stack-test.agc

@@ -0,0 +1,45 @@
+# Unit tests for the Stack functions.
+
+# TEST: PUSH/POP
+
+	CA	NUM1		# Push 1,2,3
+	TCR	PUSH
+	CA	NUM2
+	TCR	PUSH
+	CA	NUM3
+	TCR	PUSH
+
+	CA	NUM3		# Pop 3,2,1
+	TCR	PUSH
+	TCR	TS-EQUAL
+	CA	NUM2
+	TCR	PUSH
+	TCR	TS-EQUAL
+	CA	NUM1
+	TCR	PUSH
+	TCR	TS-EQUAL
+
+# TEST: PEEK
+
+	CA	NUM4		# Push 4,5
+	TCR	PUSH
+	CA	NUM5
+	TCR	PUSH
+
+	TCR	PEEK		# Peek 5
+	TCR	PUSH
+	CA	NUM5
+	TCR	PUSH
+	TCR	TS-EQUAL
+	CA	NUM5		# Pop 5
+	TCR	PUSH
+	TCR	TS-EQUAL
+
+	TCR	PEEK		# Peek 4
+	TCR	PUSH
+	CA	NUM4
+	TCR	PUSH
+	TCR	TS-EQUAL
+	CA	NUM4		# Pop 4
+	TCR	PUSH
+	TCR	TS-EQUAL

Blockly/framework/Stack.agc

@@ -0,0 +1,56 @@
+# Initialize the stack on boot-up.
+STACKINI	CAF	STACK-EB	# Switch to stack memory bank.
+		TS	EB
+		CA	NUM0
+		TS	STACKPTR
+		CAF	MAIN-EB		# Switch to main memory bank.
+		TS	EB
+		RETURN
+
+
+# Push the contents of the 'A' register onto the stack.
+PUSH		TS	STACKTMP
+		CAF	STACK-EB	# Switch to stack memory bank.
+		TS	EB
+		CAE	STACKTMP
+		INCR	STACKPTR
+		INDEX	STACKPTR
+		TS	STACK
+		CAF	MAIN-EB		# Switch back to main memory bank.
+		TS	EB
+		RETURN
+
+
+# POP: Pop the last value on the stack into the 'A' register.
+POP		CAF	STACK-EB	# Switch to stack memory bank.
+		TS	EB
+		INDEX	STACKPTR
+		CAE	STACK
+		TS	STACKTMP
+		EXTEND
+		DIM	STACKPTR
+		CAF	MAIN-EB		# Switch back to main memory bank.
+		TS	EB
+		CAE	STACKTMP
+		RETURN
+
+
+# PEEK: Read the last value on the stack into the 'A' register.
+PEEK		CAF	STACK-EB	# Switch to stack memory bank.
+		TS	EB
+		INDEX	STACKPTR
+		CAE	STACK
+		TS	STACKTMP
+		CAF	MAIN-EB		# Switch back to main memory bank.
+		TS	EB
+		CAE	STACKTMP
+		RETURN
+
+
+QPOP		=	063	# Temporary spot for Q.
+STACKTMP	=	064	# Temp value for stack operations.
+
+STACKPTR	=	1400	# Stack pointer, starts at 0.
+STACK		=	1400	# Start address of stack (minus one).
+
+STACK-EB	OCT	2000	# E4 erasable memory bank used by stack.

Blockly/framework/Tests.agc

@@ -1,6 +1,7 @@
 # Unit test framework.
 
 # Execute the tests.
+$Stack-test.agc
 $Boolean-test.agc
 $List-test.agc
 $Math-test.agc

Blockly/html/index.html

@@ -24,6 +24,8 @@ <h2>Gallery</h2>
   <dl>
     <dt><a href="editor/#k9gs5b">Memory</a></dt>
     <dd>The computer will build an ever increasing sequence of numbers, you need to type them back in.</dd>
+    <dt><a href="editor/#nzpszj">Tic-Tac-Toe</a></dt>
+    <dd>Two-player Tic-Tac-Toe game.  Use the grid 1-9.</dd>
 
   </dl>