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

machxo2: Fix more oversights in machxo2 models. logic.ys test passes.

This commit is contained in:
William D. Jones 2020-11-17 14:22:44 -05:00 committed by Marcelina Kościelnicka
parent 9cb0bae1b2
commit 044393b990
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
techlibs/machxo2/cells_map.v
View File

@ -8,12 +8,16 @@ module \$lut (A, Y);
wire [3:0] I;
generate
if(WIDTH == 2) begin
if(WIDTH == 1) begin
assign I = {1'b0, 1'b0, 1'b0, A[0]};
end else if(WIDTH == 2) begin
assign I = {1'b0, 1'b0, A[1], A[0]};
end else if(WIDTH == 3) begin
assign I = {1'b0, A[2], A[1], A[0]};
end else if(WIDTH == 4) begin
assign I = {A[3], A[2], A[1], A[0]};
end else begin
INVALID_LUT_WIDTH error();
end
endgenerate

2
techlibs/machxo2/cells_sim.v
View File

@ -42,7 +42,7 @@ module FACADE_FF #(
wire muxlsr = (LSRMUX == "INV") ? ~LSR : LSR;
wire muxclk = (CLKMUX == "INV") ? ~CLK : CLK;
assign srval = (REGSET == "SET") ? 1'b1 : 1'b0;
wire srval = (REGSET == "SET") ? 1'b1 : 1'b0;
generate
if (SRMODE == "ASYNC") begin