From cb87f93cf863d591c7d442222ffb1b1bcc58d84e Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Sat, 29 Jul 2017 21:34:29 +0200
Subject: Improve spiflash testbench and firmware

---
 spiflash/firmware.s  | 64 +++++++++++++++++++++++++++++++++++++++++++++-------
 spiflash/spiflash.v  | 20 ++++++++--------
 spiflash/testbench.v | 18 ++++++++++++---
 3 files changed, 80 insertions(+), 22 deletions(-)

diff --git a/spiflash/firmware.s b/spiflash/firmware.s
index 338ae5a..9b12f0c 100644
--- a/spiflash/firmware.s
+++ b/spiflash/firmware.s
@@ -1,8 +1,56 @@
-start:
-      li      x1,0xc0000000
-      sw      x0,0(x0)
-loop: lw      x2,0(x0)
-      addi    x2,x2,1
-      sw      x2,0(x1)
-      sw      x2,0(x0)
-      j       loop
+# write RAM code (a sequence of nops followed by ret)
+li      x5,0x00000013   # nop
+sw      x5,4(x0)
+sw      x5,8(x0)
+sw      x5,12(x0)
+sw      x5,16(x0)
+sw      x5,20(x0)
+sw      x5,24(x0)
+sw      x5,28(x0)
+sw      x5,32(x0)
+sw      x5,36(x0)
+sw      x5,40(x0)
+sw      x5,44(x0)
+sw      x5,48(x0)
+sw      x5,52(x0)
+sw      x5,56(x0)
+sw      x5,60(x0)
+sw      x5,64(x0)
+sw      x5,68(x0)
+sw      x5,72(x0)
+sw      x5,76(x0)
+li      x5,0x00008067   # ret
+sw      x5,80(x0)
+
+# setup gpio address in x5
+li      x5,0xc0000000
+sw      x0,0(x5)
+
+# initial entry point into RAM code
+li      x3,4
+
+# initialize RAM counter
+sw      x0,0(x0)
+
+# start of loop. remember this address
+auipc   x4,0
+
+# execute RAM code, come back here
+jalr    x3
+
+# load counter and increment
+lw      x6,0(x0)
+addi    x6,x6,1
+
+# store counter and update gpios
+sw      x6,0(x5)
+sw      x6,0(x0)
+
+# calculate new entry point into RAM code
+slli    x3,x6,2
+andi    x3,x3,63
+addi    x3,x3,4
+
+# execute RAM code, come back to start of loop
+mv      x1,x4
+jr      x3
diff --git a/spiflash/spiflash.v b/spiflash/spiflash.v
index 933f3a2..5bb796b 100644
--- a/spiflash/spiflash.v
+++ b/spiflash/spiflash.v
@@ -4,7 +4,7 @@ module spiflash (
 	input      spi_mosi,
 	input      spi_sclk
 );
-	localparam verbose = 1;
+	localparam verbose = 0;
 	
 	reg [7:0] buffer;
 	integer bitcount = 0;
@@ -29,12 +29,7 @@ module spiflash (
 
 	task spi_action;
 		begin
-			if (verbose) begin
-				if (bytecount == 1)
-					$write("<SPI>");
-				$write("<SPI:%02x", buffer);
-				spi_in = buffer;
-			end
+			spi_in = buffer;
 
 			if (bytecount == 1) begin
 				spi_cmd = buffer;
@@ -60,12 +55,15 @@ module spiflash (
 				end
 			end
 
+			spi_out = buffer;
+			spi_io_vld = 1;
+
 			if (verbose) begin
-				$write(":%02x>", buffer);
-				spi_out = buffer;
-				spi_io_vld = 1;
-				$fflush;
+				if (bytecount == 1)
+					$write("<SPI-START>");
+				$write("<SPI:%02x:%02x>", spi_in, spi_out);
 			end
+
 		end
 	endtask
 
diff --git a/spiflash/testbench.v b/spiflash/testbench.v
index 6b4aaef..3a61414 100644
--- a/spiflash/testbench.v
+++ b/spiflash/testbench.v
@@ -5,9 +5,10 @@ module testbench;
 	initial begin
 		$dumpfile("testbench.vcd");
 		$dumpvars(0, testbench);
-		repeat (10000) @(posedge clk);
-		$display("<END>");
-		$finish;
+		repeat (100000) @(posedge clk);
+		$display("");
+		$display("[TIMEOUT]");
+		$stop;
 	end
 
 	wire [31:0] gpio_i = 0;
@@ -18,6 +19,17 @@ module testbench;
 	wire spi_mosi;
 	wire spi_miso;
 
+	always @(gpio_o) begin
+		$write("<GPIO:%02x>", gpio_o[7:0]);
+		if (gpio_o == 63) begin
+			$display("[OK]");
+			$finish;
+		end
+		if (gpio_o % 8 == 7) begin
+			$display("");
+		end
+	end
+
 	top uut (
 		.clk     (clk     ),
 		.gpio_i  (gpio_i  ),
-- 
cgit