From 091c684bf1d2cca09da001b9170b205dbe5c333f Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Tue, 1 Oct 2024 18:22:10 -0400
Subject: add recursion test, add noops for branch delay slots

---
 test/masm/div.asm       | 17 -----------------
 test/masm/fault.asm     | 15 ---------------
 test/masm/fncall.asm    |  3 +++
 test/masm/fpe.asm       | 18 ++++++++++++++++++
 test/masm/hello.asm     |  1 +
 test/masm/recursion.asm | 41 +++++++++++++++++++++++++++++++++++++++++
 test/masm/segv.asm      | 16 ++++++++++++++++
 7 files changed, 79 insertions(+), 32 deletions(-)
 delete mode 100644 test/masm/div.asm
 delete mode 100644 test/masm/fault.asm
 create mode 100644 test/masm/fpe.asm
 create mode 100644 test/masm/recursion.asm
 create mode 100644 test/masm/segv.asm

(limited to 'test/masm')

diff --git a/test/masm/div.asm b/test/masm/div.asm
deleted file mode 100644
index b9b4f3f..0000000
--- a/test/masm/div.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2024 Freya Murphy
-
-# file: div.asm
-# test: should cause floting point exception
-
-.text
-.align 2
-.globl main
-
-main:
-	# divide by zero
-	li	$t0, 0
-	div	$t0, $t0, $t0
-
-	# return
-	li	$v0, 0
-	jr	$ra
diff --git a/test/masm/fault.asm b/test/masm/fault.asm
deleted file mode 100644
index df700cf..0000000
--- a/test/masm/fault.asm
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2024 Freya Murphy
-
-# file: div.asm
-# test: should cause page fault
-
-.text
-.align 2
-.globl main
-
-main:
-	lw	$t0, 0($zero)
-
-	# return
-	li	$v0, 0
-	jr	$ra
diff --git a/test/masm/fncall.asm b/test/masm/fncall.asm
index 96d1ba2..39455ab 100644
--- a/test/masm/fncall.asm
+++ b/test/masm/fncall.asm
@@ -11,6 +11,7 @@ result:
 	move	$t0, $a0
 	move	$v0, $t0
 	jr	$ra
+	nop
 
 main:
 	# save ra on stack
@@ -20,6 +21,7 @@ main:
 	# set return to 17
 	li	$a0, 17
 	jal	result
+	nop
 
 	# pop ra from stack
 	lw	$ra, 0($sp)
@@ -27,3 +29,4 @@ main:
 
 	# return result
 	jr	$ra
+	nop
diff --git a/test/masm/fpe.asm b/test/masm/fpe.asm
new file mode 100644
index 0000000..a3725d5
--- /dev/null
+++ b/test/masm/fpe.asm
@@ -0,0 +1,18 @@
+# Copyright (c) 2024 Freya Murphy
+
+# file: div.asm
+# test: should cause floting point exception
+
+.text
+.align 2
+.globl main
+
+main:
+	# divide by zero
+	li	$t0, 0
+	div	$t0, $t0, $t0
+
+	# return
+	li	$v0, 0
+	jr	$ra
+	nop
diff --git a/test/masm/hello.asm b/test/masm/hello.asm
index 2d64ae5..3819b2a 100644
--- a/test/masm/hello.asm
+++ b/test/masm/hello.asm
@@ -24,3 +24,4 @@ main:
 	# return 1
 	li	$v0, 0
 	jr	$ra
+	nop
diff --git a/test/masm/recursion.asm b/test/masm/recursion.asm
new file mode 100644
index 0000000..38982e1
--- /dev/null
+++ b/test/masm/recursion.asm
@@ -0,0 +1,41 @@
+# Copyright (c) 2024 Freya Murphy
+
+# file: recursion.asm
+# test: should recurse sum n..0 numbers
+
+.text
+.align 2
+.globl main
+
+main:
+	# init $a0
+	li	$a0, 5
+
+sum:
+	# save stack
+	addiu	$sp, $sp, -8
+	sw	$ra, 0($sp)
+	sw	$s0, 4($sp)
+
+	# load n from a0
+	move	$s0, $a0
+
+	# skip if n is zero
+	li	$v0, 0
+	beq	$s0, $zero, add
+	nop
+	jal	sum
+	addi	$a0, $s0, -1
+
+add:
+	# n = n + returned
+	add	$v0, $s0, $v0
+
+	# restore stack
+	lw	$ra, 0($sp)
+	lw	$s0, 4($sp)
+	addiu	$sp, $sp, 8
+
+	# return
+	jr	$ra
+	nop
diff --git a/test/masm/segv.asm b/test/masm/segv.asm
new file mode 100644
index 0000000..4102bc2
--- /dev/null
+++ b/test/masm/segv.asm
@@ -0,0 +1,16 @@
+# Copyright (c) 2024 Freya Murphy
+
+# file: div.asm
+# test: should cause page fault
+
+.text
+.align 2
+.globl main
+
+main:
+	lw	$t0, 0($zero)
+
+	# return
+	li	$v0, 0
+	jr	$ra
+	nop
-- 
cgit v1.2.3-freya