X-Git-Url: http://git.joshuawise.com/mandelfpga.git/blobdiff_plain/05c0805be5682a94d874a89f05f01d1830941a70..281eac32105cf581a2f73f3530466709e280af0a:/Main.v

diff --git a/Main.v b/Main.v
index 2dd4764..306c8a7 100644
--- a/Main.v
+++ b/Main.v
@@ -8,7 +8,7 @@
 
 `define XRES 640
 `define YRES 480
-`define WHIRRRRR 21
+`define WHIRRRRR 27
 
 module SyncGen(
 	input pixclk,
@@ -89,9 +89,9 @@ endmodule
 
 module Multiplier(
 	input clk,
-	input [11:0] x, y,
+	input [12:0] x, y,
 	input xsign, ysign,
-	output wire [11:0] out,
+	output wire [12:0] out,
 	output wire sign,
 	output wire [1:0] overflow);
 
@@ -103,16 +103,16 @@ module MandelUnit(
 	input clk,
 	input [12:0] x, y,
 	input xsign, ysign,
-	input [13:0] r, i,
+	input [14:0] r, i,
 	input rsign, isign,
 	input [7:0] ibail, icuriter,
 	output reg [12:0] xout, yout,
 	output reg xsout, ysout,
-	output reg [13:0] rout, iout,
+	output reg [14:0] rout, iout,
 	output reg rsout, isout,
 	output reg [7:0] obail, ocuriter);
 
-	wire [13:0] r2, i2, ri, diff;
+	wire [14:0] r2, i2, ri, diff;
 	wire r2sign, i2sign, risign, dsign;
 	wire [16:0] bigsum;
 	wire bigsum_ovf, rin_ovf, iin_ovf, throwaway;
@@ -124,9 +124,9 @@ module MandelUnit(
 
 	assign ri[0] = 0;
 
-	Multiplier r2m(clk, r[12:0], r[12:0], rsign, rsign, r2[12:0], r2sign, r2[13]);
-	Multiplier i2m(clk, i[12:0], i[12:0], isign, isign, i2[12:0], i2sign, i2[13]);
-	Multiplier rim(clk, r[12:0], i[12:0], rsign, isign, ri[13:1], risign, throwaway);
+	Multiplier r2m(clk, r[12:0], r[12:0], rsign, rsign, r2[12:0], r2sign, r2[14:13]);
+	Multiplier i2m(clk, i[12:0], i[12:0], isign, isign, i2[12:0], i2sign, i2[14:13]);
+	Multiplier rim(clk, r[12:0], i[12:0], rsign, isign, ri[13:1], risign, {throwaway,ri[14]});
 
 	assign bigsum = r2 + i2;
 	assign bigsum_ovf = bigsum[16] | bigsum[15] | bigsum[14];
@@ -147,8 +147,8 @@ module MandelUnit(
 		ysout <= ysd;
 		ibaild <= ibail;
 		curiterd <= icuriter;
-		rd <= r[13];
-		id <= i[13];
+		rd <= r[13] | r[14];
+		id <= i[13] | i[14];
 
 		if (xsd ^ dsign) begin
 			if (diff > xd) begin
@@ -191,10 +191,12 @@ module Mandelbrot(
 	input mclk,
 	input pixclk,
 	input [11:0] x, y,
-	input [12:0] xofs, yofs,
+	input [13:0] xofs, yofs,
 	input [7:0] colorofs,
 	input [2:0] scale,
 	output reg [2:0] red, green, output reg [1:0] blue);
+
+`define MAXOUTN 12
 	
 	wire [12:0] rx, ry;
 	wire [13:0] nx, ny;
@@ -208,18 +210,18 @@ module Mandelbrot(
 	assign rysign = ny[13];
 	
 
-	wire [13:0] mr[9:0], mi[9:0];
-	wire mrs[9:0], mis[9:0];
-	wire [7:0] mb[9:0];
-	wire [12:0] xprop[9:0], yprop[9:0];
-	wire xsprop[9:0], ysprop[9:0];
-	wire [7:0] curiter[9:0];
+	wire [14:0] mr[`MAXOUTN:0], mi[`MAXOUTN:0];
+	wire mrs[`MAXOUTN:0], mis[`MAXOUTN:0];
+	wire [7:0] mb[`MAXOUTN:0];
+	wire [12:0] xprop[`MAXOUTN:0], yprop[`MAXOUTN:0];
+	wire xsprop[`MAXOUTN:0], ysprop[`MAXOUTN:0];
+	wire [7:0] curiter[`MAXOUTN:0];
 	
-	wire [13:0] initx, inity, initr, initi;
+	wire [14:0] initx, inity, initr, initi;
 	wire [7:0] initci, initb;
 	wire initxs, initys, initrs, initis;
 	
-	reg [13:0] loopx, loopy, loopr, loopi;
+	reg [14:0] loopx, loopy, loopr, loopi;
 	reg [7:0] loopci, loopb;
 	reg loopxs, loopys, looprs, loopis;
 	
@@ -249,19 +251,19 @@ module Mandelbrot(
 	always @(posedge mclk)
 	begin
 		if (!state) begin
-			out <= ~mb[9] + colorofs;
+			out <= ~mb[`MAXOUTN] + colorofs;
 		end else begin
 			{red, green, blue} <= {out[0],out[3],out[6],out[1],out[4],out[7],out[2],out[5]};
-			loopx <= xprop[9];
-			loopy <= yprop[9];
-			loopr <= mr[9];
-			loopi <= mi[9];
-			loopxs <= xsprop[9];
-			loopys <= ysprop[9];
-			looprs <= mrs[9];
-			loopis <= mis[9];
-			loopb <= mb[9];
-			loopci <= curiter[9];
+			loopx <= xprop[`MAXOUTN];
+			loopy <= yprop[`MAXOUTN];
+			loopr <= mr[`MAXOUTN];
+			loopi <= mi[`MAXOUTN];
+			loopxs <= xsprop[`MAXOUTN];
+			loopys <= ysprop[`MAXOUTN];
+			looprs <= mrs[`MAXOUTN];
+			loopis <= mis[`MAXOUTN];
+			loopb <= mb[`MAXOUTN];
+			loopci <= curiter[`MAXOUTN];
 		end
 		state <= ~pixclksync;
 	end
@@ -302,7 +304,16 @@ module Mandelbrot(
 	MandelUnit mu9(mclk,
 		xprop[8], yprop[8], xsprop[8], ysprop[8], mr[8], mi[8], mrs[8], mis[8], mb[8], curiter[8],
 		xprop[9], yprop[9], xsprop[9], ysprop[9], mr[9], mi[9], mrs[9], mis[9], mb[9], curiter[9]);
-	
+	MandelUnit mua(mclk,
+		xprop[9],  yprop[9],  xsprop[9],  ysprop[9],  mr[9],  mi[9],  mrs[9],  mis[9],  mb[9], curiter[9],
+		xprop[10], yprop[10], xsprop[10], ysprop[10], mr[10], mi[10], mrs[10], mis[10], mb[10], curiter[10]);
+	MandelUnit mub(mclk,
+		xprop[10], yprop[10], xsprop[10], ysprop[10], mr[10], mi[10], mrs[10], mis[10], mb[10], curiter[10],
+		xprop[11], yprop[11], xsprop[11], ysprop[11], mr[11], mi[11], mrs[11], mis[11], mb[11], curiter[11]);
+	MandelUnit muc(mclk,
+		xprop[11], yprop[11], xsprop[11], ysprop[11], mr[11], mi[11], mrs[11], mis[11], mb[11], curiter[11],
+		xprop[12], yprop[12], xsprop[12], ysprop[12], mr[12], mi[12], mrs[12], mis[12], mb[12], curiter[12]);
+
 endmodule
 
 module Logo(
@@ -336,7 +347,7 @@ module MandelTop(
 	wire [7:0] zero = 8'b0;
 	wire clk;
 	wire [11:0] x, y;
-	reg [12:0] xofs = -`XRES/2, yofs = -`YRES/2;
+	reg [13:0] xofs = -`XRES/2, yofs = -`YRES/2;
 	reg [5:0] slowctr = 0;
 	reg [7:0] colorcycle = 0;
 	wire [11:0] realx, realy;