From: Christopher Lu <lu@stop.hsd1.pa.comcast.net>
Date: Sun, 28 Dec 2008 10:23:33 +0000 (-0500)
Subject: Merge branch 'master' of nyus.joshuawise.com:/git/firearm
X-Git-Url: http://git.joshuawise.com/firearm.git/commitdiff_plain/4caf81e0cb02f814642cd7dc1a1d5ac05415415e?hp=932d2ed6999912bd7a85a3972a48109c127570f3

Merge branch 'master' of nyus.joshuawise.com:/git/firearm
---

diff --git a/Decode.v b/Decode.v
index cbe6184..22c6eae 100644
--- a/Decode.v
+++ b/Decode.v
@@ -315,11 +315,11 @@ module SuckLessShifter(
 
 	/* do a barrel shift */
 	assign stage1 = amt[5] ? {is_rot ? oper : {32{pushbits}}, oper[31]} : {oper, carryin};
-	assign stage2 = amt[4] ? {is_rot ? stage1[15:0] : {16{pushbits}}, stage1[31:16], stage1[15]} : stage1;
-	assign stage3 = amt[3] ? {is_rot ? stage2[7:0] : {8{pushbits}}, stage2[31:8], stage2[7]} : stage2;
-	assign stage4 = amt[2] ? {is_rot ? stage3[3:0] : {4{pushbits}}, stage3[31:4], stage3[3]} : stage3;
-	assign stage5 = amt[1] ? {is_rot ? stage4[1:0] : {2{pushbits}}, stage4[31:2], stage4[1]} : stage4;
-	assign {res, carryout} = amt[0] ? {is_rot ? stage5[0] : pushbits, stage5[31:1], stage5[0]} : stage5;
+	assign stage2 = amt[4] ? {is_rot ? stage1[16:1] : {16{pushbits}}, stage1[32:17], stage1[16]} : stage1;
+	assign stage3 = amt[3] ? {is_rot ? stage2[8:1] : {8{pushbits}}, stage2[32:9], stage2[8]} : stage2;
+	assign stage4 = amt[2] ? {is_rot ? stage3[4:1] : {4{pushbits}}, stage3[32:5], stage3[4]} : stage3;
+	assign stage5 = amt[1] ? {is_rot ? stage4[2:1] : {2{pushbits}}, stage4[32:3], stage4[2]} : stage4;
+	assign {res, carryout} = amt[0] ? {is_rot ? stage5[1] : pushbits, stage5[32:2], stage5[1]} : stage5;
 
 endmodule
 
diff --git a/RegFile.v b/RegFile.v
index f5a63ae..a9699e9 100644
--- a/RegFile.v
+++ b/RegFile.v
@@ -22,14 +22,14 @@ 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'h0000000A;
 	end
 	
 	always @(*)
diff --git a/ram.hex b/ram.hex
index 937ce99..083ed80 100644
Binary files a/ram.hex and b/ram.hex differ