- /*
- assign G = rdR ? R : 8'bzzzzzzzz;
- assign G = rdQ ? Q : 8'bzzzzzzzz;
- assign G = rdP ? {3'b0, P} : 8'bzzzzzzzz;
- assign G = rdP_plus ? {3'b0, P+1} : 8'bzzzzzzzz;
- assign G = conn_i ? I : 8'bzzzzzzzz;
- assign G[4:0] = conn_ea ? E[4:0] : 5'bzzzzz;
- assign G[7:5] = conn_et ? E[7:5] : 3'bzzz;
-
- assign E[4:0] = conn_ea ? G[4:0] : 5'bzzzzz;
- assign E[7:5] = conn_et ? G[7:5] : 3'bzzz;
- */
-
- wire [7:0] GfromR = rdR ? R : 0;
- wire [7:0] GfromQ = rdQ ? Q : 0;
- wire [7:0] GfromP = rdP ? {3'b0, P} : 0;
- wire [7:0] GfromP_plus = rdP_plus ? {3'b0, P + 1} : 0;
- wire [7:0] GfromI = conn_i ? I : 0;
- wire [4:0] GAfromE = conn_ea ? Ein_latched[4:0] : 0;
- wire [3:0] GTfromE = conn_et ? Ein_latched[7:5] : 0;
- wire [7:0] GfromE = {GTfromE, GAfromE};
+ wire [15:0] GfromR = rdR ? R : 0;
+ 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 ? ram_do : 0;
+ wire [12:0] GAfromE = conn_ea ? Ein[12:0] : 0;
+ wire [2:0] GTfromE = conn_et ? Ein[15:13] : 0;
+ wire [15:0] GfromE = {GTfromE, GAfromE};