Potentially fixed triplepump: 75.028MHz, 4596 slices, 8537 LUTs, 1805 ffs

diff --git a/Main.v b/Main.v
index 61cb8f1d9991a72ae15261f8b2bd8781e6840108..11d7833809a60fc44a8897046ac48f95c664ba0e 100644 (file)
--- a/Main.v
+++ b/Main.v
@@ -230,11 +230,6 @@ module Mandelbrot(
        
        reg [2:0] state = 3'b001;       // One-hot encoded state.
        
        
        reg [2:0] state = 3'b001;       // One-hot encoded state.
        

-       // On pixclk = 1,
-       //    A new value to be loaded comes in, and a value in need of loopback comes out.
-       // On pixclk = 0,
-       //    A new value in need of loopback comes in, and a completed value comes out.
-       

        assign initx = state[0] ? rx :
                       state[1] ? stagex[1] :
                       stagex[2];
        assign initx = state[0] ? rx :
                       state[1] ? stagex[1] :
                       stagex[2];


@@ -263,8 +258,8 @@ module Mandelbrot(
                       state[1] ? stageb[1] :
                       stageb[2];
        assign initci = state[0] ? 8'b00000000 :
                       state[1] ? stageb[1] :
                       stageb[2];
        assign initci = state[0] ? 8'b00000000 :

-                       state[1] ? stageb[1] : 
-                       stageb[2];
+                       state[1] ? stageci[1] : 
+                       stageci[2];

        
        reg [7:0] out;
        reg typethea = 0;       // Whether we have typed the A.
        
        reg [7:0] out;
        reg typethea = 0;       // Whether we have typed the A.


@@ -286,11 +281,11 @@ module Mandelbrot(
                if (state[0]) begin
                        {red, green, blue} <= {out[0],out[3],out[6],out[1],out[4],out[7],out[2],out[5]};
                end
                if (state[0]) begin
                        {red, green, blue} <= {out[0],out[3],out[6],out[1],out[4],out[7],out[2],out[5]};
                end

-               if (state[2]) begin
+               if (state[1]) begin

                        out <= ~mb[`MAXOUTN] + colorofs;
                end
                
                        out <= ~mb[`MAXOUTN] + colorofs;
                end
                

-               if (state[1]) begin             // PnR0 in, PnR2 out
+               if (state[0]) begin             // PnR0 in, PnR2 out

                        stagex[2] <= xprop[`MAXOUTN];
                        stagey[2] <= yprop[`MAXOUTN];
                        stager[2] <= mr[`MAXOUTN];
                        stagex[2] <= xprop[`MAXOUTN];
                        stagey[2] <= yprop[`MAXOUTN];
                        stager[2] <= mr[`MAXOUTN];


@@ -303,7 +298,7 @@ module Mandelbrot(
                        stageci[2] <= curiter[`MAXOUTN];
                end
                
                        stageci[2] <= curiter[`MAXOUTN];
                end
                

-               if (state[0]) begin     // PnR2 in, PnR1 out
+               if (state[2]) begin     // PnR2 in, PnR1 out

                        stagex[1] <= xprop[`MAXOUTN];
                        stagey[1] <= yprop[`MAXOUTN];
                        stager[1] <= mr[`MAXOUTN];
                        stagex[1] <= xprop[`MAXOUTN];
                        stagey[1] <= yprop[`MAXOUTN];
                        stager[1] <= mr[`MAXOUTN];