X-Git-Url: http://git.joshuawise.com/firearm.git/blobdiff_plain/23c6da6ca9b717930c06041e2b674b89058005f5..6060e5359241449a70a27ed0d7023951ee21ceeb:/RegFile.v?ds=sidebyside

diff --git a/RegFile.v b/RegFile.v
index 47f5024..95e5c71 100644
--- a/RegFile.v
+++ b/RegFile.v
@@ -1,11 +1,12 @@
 module RegFile(
 	input clk,
+	input [3:0] read_0,
+	output reg [31:0] rdata_0,
 	input [3:0] read_1,
 	output reg [31:0] rdata_1,
 	input [3:0] read_2,
 	output reg [31:0] rdata_2,
-	input [3:0] read_3,
-	output reg [31:0] rdata_3,
+	output reg [31:0] spsr,
 	input [3:0] write,
 	input write_req,
 	input [31:0] write_data
@@ -22,18 +23,23 @@ module RegFile(
 		regfile[4'h5] = 32'h00500000;
 		regfile[4'h6] = 32'h05000000;
 		regfile[4'h7] = 32'h50000000;
-		regfile[4'h8] = 32'h0000000A;
-		regfile[4'h9] = 32'h000000A0;
-		regfile[4'hA] = 32'h00000A00;
-		regfile[4'hB] = 32'h0000A000;
-		regfile[4'hC] = 32'h000A0000;
-		regfile[4'hD] = 32'h00A00000;
-		regfile[4'hE] = 32'h0A000000;
-		regfile[4'hF] = 32'hA0000000;
+		regfile[4'h8] = 32'hA0000000;
+		regfile[4'h9] = 32'h0A000000;
+		regfile[4'hA] = 32'h00A00000;
+		regfile[4'hB] = 32'h000A0000;
+		regfile[4'hC] = 32'h0000A000;
+		regfile[4'hD] = 32'h00000A00;
+		regfile[4'hE] = 32'h000000A0;
+		regfile[4'hF] = 32'h00000000;	/* Start off claiming we are in user mode. */
 	end
 	
 	always @(*)
 	begin
+		if ((read_0 == write) && write_req)
+			rdata_0 = write_data;
+		else
+			rdata_0 = regfile[read_0];
+		
 		if ((read_1 == write) && write_req)
 			rdata_1 = write_data;
 		else
@@ -44,10 +50,7 @@ module RegFile(
 		else
 			rdata_2 = regfile[read_2];
 		
-		if ((read_3 == write) && write_req)
-			rdata_3 = write_data;
-		else
-			rdata_3 = regfile[read_3];
+		spsr = regfile[4'hF];
 	end
 	
 	always @(posedge clk)