X-Git-Url: http://git.joshuawise.com/mandelfpga.git/blobdiff_plain/f802110e1d6c16a50761ea3732a07a3eeac76930..9032b2b5f7475dc07709aa2e51f9a014f76760c0:/Main.v

diff --git a/Main.v b/Main.v
index 4d51e93..42e614a 100644
--- a/Main.v
+++ b/Main.v
@@ -1,4 +1,4 @@
-/*
+/* 
  * MandelFPGA
  * by Joshua Wise and Chris Lu
  * 
@@ -8,7 +8,7 @@
 
 `define XRES 640
 `define YRES 480
-`define WHIRRRRR 21
+`define WHIRRRRR 27
 
 module SyncGen(
 	input pixclk,
@@ -113,6 +113,7 @@ module MandelUnit(
 	output reg [7:0] obail, ocuriter);
 
 	wire [14:0] r2, i2, ri, diff;
+	wire [15:0] twocdiff;
 	wire r2sign, i2sign, risign, dsign;
 	wire [16:0] bigsum;
 	wire bigsum_ovf, rin_ovf, iin_ovf, throwaway;
@@ -132,8 +133,9 @@ module MandelUnit(
 	assign bigsum_ovf = bigsum[16] | bigsum[15] | bigsum[14];
 	assign rin_ovf = rd;
 	assign iin_ovf = id;
-	assign diff = (r2 > i2) ? r2 - i2 : i2 - r2;
-	assign dsign = (r2 > i2) ? 0 : 1;
+	assign twocdiff = r2 - i2;
+	assign diff = twocdiff[15] ? -twocdiff : twocdiff;
+	assign dsign = twocdiff[15];
 
 	always @ (posedge clk)
 	begin
@@ -195,6 +197,8 @@ module Mandelbrot(
 	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,12 +212,12 @@ module Mandelbrot(
 	assign rysign = ny[13];
 	
 
-	wire [14: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 [14:0] initx, inity, initr, initi;
 	wire [7:0] initci, initb;
@@ -249,19 +253,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 +306,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(