Develop (#1)

* mid right did not have bound check

* implementing rule anticanway and copyworld

* renamed files and fixed fpgrars display problem

* optimizing reset call; changing cell color to more eye friendly

* fixing draw_rectangle utest; adding utest for next_cell_edge_detection

* added exploding labyrint rule andblacking screen

* added change color code

* adding UT for living neighboor count

* adding color check !=0; excluding exercise solution by renaming to .tjon

* fixing missing SUCCESS message of edge test; adding rule_1 UT

* added UT for anti conway (rule 2)

* added UT for rule 3

* added UT for rule 4 (labyrinth)

* added UT checking status bits and printing them

Author: muellevin

src/constants_settings.asm

@@ -19,9 +19,9 @@
 .eqv MIN_CELL_SIZE 1
 .eqv MAX_CELL_SIZE 16
 
-.eqv MAX_RULE 1	# min rule 1
+.eqv MAX_RULE 4	# min rule 1
 
-.eqv ALIVE 0x00ff00
+#.eqv ALIVE 0xa0a397 
 
 ask_rars_version:
 .string "are you using fpgrars(any number) or rars(0)\n"
@@ -36,7 +36,7 @@ ask_y_size_display:
 .string "width of display rars(64; 128; 256; 512)\n"
 
 ask_rule_to_apply:
-.string "which rule do you want tu use min 1 max 1\n"
+.string "which rule do you want tu use min 1 max 4\n"
 
 ask_time_till_next_generation:
 .string "how much time in ms should the programm wait till next generation is shown max 2³²-1\n"
@@ -47,8 +47,14 @@ ask_start_density:
 invalid_input_message:
 .string "Somehow you did not gave the valid input try again\n"
 
+ask_colour:
+.string "What color do you like?\n"
+
+new_line:
+.string "\n"
+
 settings:
-.word 8	# here we have our cell size. 		1 default for unittest		#addresss by 0
+.word 1	# here we have our cell size. 		1 default for unittest		#addresss by 0
 .word RARS_DISPLAY_ADDRESS # display address	defaulting for rars (unittest)		#addresss by 4
 .word RARS_KEYBOARD_ADDRESS # keyboard address	defaulting for rars (unittest)		#addresss by 8
 
@@ -58,10 +64,12 @@ settings:
 
 .word 1	# rule to use				0 is default/normal Game of Life			#addresss by 20
 
-.word 10	# time till next generation will be displayed in ms 0-2³²-1	in unittest i don't want to wait		#addresss by 24
+.word 0	# time till next generation will be displayed in ms 0-2³²-1	in unittest i don't want to wait		#addresss by 24
 
 .word 50	# start density	this is random so no UT								#addresss by 28
 
+.word 0xa0a397	# color of living cells				# adress by 32
+
 state_bits:
 .space 32768	# malloc for 512x512Pixel/32Bits of word x 4 addressing
 # it is disgusting but i guess the easiest solution for now

src/exercise_solutions/draw_rectangle.asm

@@ -107,14 +107,17 @@ print_living_cell:
 # input
 # a1 x cell pos
 # a2 y cell pos
-	addi sp, sp, -4
+	addi sp, sp, -8
 	sw ra, 0(sp)
-
-	li a7, ALIVE	# dead cell
+	sw t0, 4(sp)
+	
+	la t0, settings
+	lw a7, 32(t0)		# color of living cell
 	jal ra, draw_cell
 
 	lw ra, 0(sp)
-	addi sp, sp, 4
+	lw t0, 4(sp)
+	addi sp, sp, 8
 	ret
 
 .include "draw_pixel.asm"

src/init_gamefield.asm renamed to src/gamefield.asm

@@ -33,14 +33,13 @@ init_gamefield:
 	cell_alive:
 		mv a1, t2
 		mv a2, t3
-		li a7, ALIVE	# all living cells are green
-		jal draw_cell
+		jal ra, print_living_cell
 
 	adding_next_cell:
 	la a0, return_to_main
 	mv a1, t2	# incase some below function modified them
 	mv a2, t3
-	jal ra, continue_gamefield	# input a1, a2
+	jal ra, next_cell_edge_detection	# input a1, a2
 	mv t2, a1
 	mv t3, a2
 	j init_living_cells
@@ -56,7 +55,7 @@ init_gamefield:
 	ret
 
 
-continue_gamefield:
+next_cell_edge_detection:
 # input:
 # a0 where to jump if gemfield is finished
 # a1 current x pos
@@ -130,10 +129,12 @@ neighboor_status:
 
 	la t3, settings
 	lw s0, 0(t3)
+	
+	mv t0, a1	# saving the coords of current cell
+	mv t1, a2
 
 	top_left:
-	mv t0, a1
-	mv t1, a2
+	
 	sub a1, t0, s0
 	sub a2, t1, s0
 	bltz a2, mid_left
@@ -143,13 +144,15 @@ neighboor_status:
 	addi a4, a4, 1
 
 	top_mid:
-	add a1, a1, s0
+	mv a1, t0
+	sub a2, t1, s0
 	jal ra, get_pixel
 	beqz a3, top_right
 	addi a4, a4, 1
 
 	top_right:
-	add a1, a1, s0
+	add a1, t0, s0
+	sub a2, t1, s0
 	lw t4, 12(t3)
 	bgeu a1, t4, mid_left
 	jal ra, get_pixel
@@ -166,13 +169,15 @@ neighboor_status:
 
 	mid_right:
 	add a1, t0, s0
+	mv a2, t1
+	lw t4, 12(t3)
+	bgeu a1, t4, bottom_left
 	jal ra, get_pixel
 	beqz a3, bottom_left
 	addi a4, a4, 1
 
 	bottom_left:
 	sub a1, t0, s0
-	sub a1, t0, s0
 	add a2, t1, s0
 	lw t4, 16(t3)
 	bgeu a2, t4, finish_counting_neighboor
@@ -182,13 +187,15 @@ neighboor_status:
 	addi a4, a4, 1
 
 	bottom_mid:
-	add a1, a1, s0
+	mv a1, t0
+	add a2, t1, s0
 	jal ra, get_pixel
 	beqz a3, bottom_right
 	addi a4, a4, 1
 
 	bottom_right:
-	add a1, a1, s0
+	add a1, t0, s0
+	add a2, t1, s0
 	lw t4, 12(t3)
 	bgeu a1, t4, finish_counting_neighboor
 	jal ra, get_pixel
@@ -259,7 +266,7 @@ print_next_generation:
 		#current pos
 		mv a1, t2	
 		mv a2, t3
-		jal ra, continue_gamefield
+		jal ra, next_cell_edge_detection
 		# load coords of next cell
 		mv t2, a1
 		mv t3, a2
@@ -275,3 +282,83 @@ print_next_generation:
 	lw ra, 20(sp)
 	addi sp, sp, 24
 	ret
+
+# more efficient way to print black screen (reset)
+print_black_display:
+	addi sp, sp, -12
+	sw t0, 0(sp)
+	sw t1, 4(sp)
+	sw ra, 8(sp)
+
+	li t0, 0	# display start coords
+	li t1, 0	
+	
+	print_trough_blacking_display:
+	mv a1, t0
+	mv a2, t1
+	
+	jal ra, get_pixel
+	mv a1, t0
+	mv a2, t1
+	la ra, continue_blacking_display
+	bnez a3, print_dead_cell
+	
+	continue_blacking_display:
+	la a0, print_black_display_finished	# where to go if gamefield is finished
+	#current pos
+	mv a1, t0
+	mv a2, t1
+	jal ra, next_cell_edge_detection
+	# load coords of next cell
+	mv t0, a1
+	mv t1, a2
+	j print_trough_blacking_display
+	
+	
+	print_black_display_finished:
+	lw t0, 0(sp)
+	lw t1, 4(sp)
+	lw ra, 8(sp)
+	addi sp, sp, 12
+	ret
+	
+print_colour_display:
+	addi sp, sp, -12
+	sw t0, 0(sp)
+	sw t1, 4(sp)
+	sw ra, 8(sp)
+
+	li t0, 0	# display start coords
+	li t1, 0	
+	
+	print_trough_colour_display:
+	mv a1, t0
+	mv a2, t1
+	
+	jal ra, get_pixel
+	mv a1, t0
+	mv a2, t1
+	la ra, continue_colour_display
+	bnez a3, print_living_cell
+	
+	continue_colour_display:
+	la a0, print_colour_display_finished	# where to go if gamefield is finished
+	#current pos
+	mv a1, t0
+	mv a2, t1
+	jal ra, next_cell_edge_detection
+	# load coords of next cell
+	mv t0, a1
+	mv t1, a2
+	j print_trough_colour_display
+	
+	
+	print_colour_display_finished:
+	lw t0, 0(sp)
+	lw t1, 4(sp)
+	lw ra, 8(sp)
+	addi sp, sp, 12
+	ret
+
+
+.include "exercise_solutions/draw_rectangle.asm"

src/main.asm

@@ -24,8 +24,7 @@ j game_loop
 #li a0, 10000
 #li a7, 32
 #ecall
-.include "init_user_question.asm"
-.include "init_gamefield.asm"
-.include "exercise_solutions/draw_rectangle.asm"
+.include "user_question.asm"
+.include "gamefield.asm"
 .include "rules.asm"
 .include "user_key_interface.asm"