riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into eddie/abc9_refactor

This commit is contained in:
Eddie Hung 2020-01-06 16:53:08 -08:00
parent cf3a13746d 5c89dead5f
commit 7347c13071
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
techlibs/xilinx/cells_sim.v
View File

@ -2396,8 +2396,8 @@ module DSP48E1 (
if (CEB2) Br2 <= Br1; if (CEB2) Br2 <= Br1;
end end
end else if (BREG == 1) begin end else if (BREG == 1) begin
//initial Br1 = 25'b0; //initial Br1 = 18'b0;
initial Br2 = 25'b0; initial Br2 = 18'b0;
always @(posedge CLK) always @(posedge CLK)
if (RSTB) begin if (RSTB) begin
Br1 <= 18'b0; Br1 <= 18'b0;
@ -2444,7 +2444,7 @@ module DSP48E1 (
endgenerate endgenerate
// A/D input selection and pre-adder // A/D input selection and pre-adder
wire signed [29:0] Ar12_muxed = INMODEr[0] ? Ar1 : Ar2; wire signed [24:0] Ar12_muxed = INMODEr[0] ? Ar1 : Ar2;
wire signed [24:0] Ar12_gated = INMODEr[1] ? 25'b0 : Ar12_muxed; wire signed [24:0] Ar12_gated = INMODEr[1] ? 25'b0 : Ar12_muxed;
wire signed [24:0] Dr_gated = INMODEr[2] ? Dr : 25'b0; wire signed [24:0] Dr_gated = INMODEr[2] ? Dr : 25'b0;
wire signed [24:0] AD_result = INMODEr[3] ? (Dr_gated - Ar12_gated) : (Dr_gated + Ar12_gated); wire signed [24:0] AD_result = INMODEr[3] ? (Dr_gated - Ar12_gated) : (Dr_gated + Ar12_gated);