X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=gc.v;h=2bbada4f0aeac15103c0643e91274aa3feb550d9;hb=29d6bd4718c5788a15657813c5cad8bb82f12684;hp=ceae7d7a23ada8d40115ec03879aee6dbd69fff6;hpb=b5efed3aa26a11e1da3639806afea5c772fff7aa;p=yule.git

diff --git a/gc.v b/gc.v
index ceae7d7..2bbada4 100644
--- a/gc.v
+++ b/gc.v
@@ -1,18 +1,20 @@
 `include "gcram.v"
 
-module GC (input clk, input mclk, input [15:0] Ein, output [15:0] Eout, input [3:0] gcop, output [5:0] ostate, output conn_et, output conn_ea, output step_eval, output [15:0] result);
+module GC (input clk, input clk_enable, input [15:0] Ein, output [15:0] Eout, input [3:0] gcop, output [5:0] ostate, output conn_et, output conn_ea, output step_eval, output ram_we, output [12:0] ram_addr, output [15:0] ram_di, input [15:0] ram_do);
    reg [15:0] rom_output;
    reg [5:0]  gostate = 6'o0;
    reg [5:0]  gnstate;
    reg [15:0] Ein_latched = 16'b0100000000000100; // initial value of E
 
    always @(posedge clk) begin
-	  Ein_latched <= Ein;
+	  if(clk_enable) begin
+		Ein_latched <= Ein;
+	  end
    end
 
    wire ga_zero_disp = rom_output[15];
    wire gcop_disp    = rom_output[14];
-   wire write        = rom_output[13];
+   assign ram_we     = rom_output[13];
    wire adr          = rom_output[12];
    wire rdR          = rom_output[11];
    wire rdQ          = rom_output[10];
@@ -84,10 +86,12 @@ module GC (input clk, input mclk, input [15:0] Ein, output [15:0] Eout, input [3
    end // always @ *
 
    always @ (posedge clk) begin
-	  gostate <=
-				ga_zero_disp ? (gnstate | ga_zero) :
-				gcop_disp ? (gnstate | gcop) :
-				gnstate;
+	  if(clk_enable) begin
+		 gostate <=
+				   ga_zero_disp ? (gnstate | ga_zero) :
+				   gcop_disp ? (gnstate | gcop) :
+				   gnstate;
+	  end
    end // always @ (posedge clk)
 
    assign ostate = gostate;
@@ -99,7 +103,8 @@ module GC (input clk, input mclk, input [15:0] Ein, output [15:0] Eout, input [3
 
    reg [12:0] A; // latched address
 
-   wire [15:0] I;
+   assign ram_addr = A;
+   assign ram_di = S;
 
    wire [15:0] G;
    wire [15:0] Gout;
@@ -108,7 +113,7 @@ module GC (input clk, input mclk, input [15:0] Ein, output [15:0] Eout, input [3
    wire [15:0] GfromQ = rdQ ? Q : 0;
    wire [15:0] GfromP = rdP ? {3'b0, P} : 0;
    wire [15:0] GfromP_plus = rdP_plus ? {3'b0, P + 1} : 0;
-   wire [15:0] GfromI = conn_i ? I : 0;
+   wire [15:0] GfromI = conn_i ? ram_do : 0;
    wire [12:0] GAfromE = conn_ea ? Ein_latched[12:0] : 0;
    wire [2:0] GTfromE = conn_et ? Ein_latched[15:13] : 0;
    wire [15:0] GfromE = {GTfromE, GAfromE};
@@ -119,13 +124,13 @@ module GC (input clk, input mclk, input [15:0] Ein, output [15:0] Eout, input [3
    assign Eout[12:0]  = conn_ea ? Gout[12:0]  : 0;
    assign Eout[15:13] = conn_et ? Gout[15:13] : 0;
 
-   GCRAM gcram (.clk(mclk), .we(write), .addr(A), .do(I), .di(S), .result(result));
-
    always @ (posedge clk) begin
-	  if (ldS) S = G;
-	  if (ldP) P <= G[12:0];
-	  if (ldR) R <= G;
-	  if (ldQ) Q <= G;
-	  if (adr) A <= S[12:0];
+	  if(clk_enable) begin
+		 if (ldS) S = G;
+		 if (ldP) P <= G[12:0];
+		 if (ldR) R <= G;
+		 if (ldQ) Q <= G;
+		 if (adr) A <= S[12:0];
+	  end
    end
 endmodule // GC