diff --git a/openfpga_flow/openfpga_arch/k4_frac_N4_adder_chain_mem1K_frac_dsp32_40nm_frame_openfpga.xml b/openfpga_flow/openfpga_arch/k4_frac_N4_adder_chain_mem1K_frac_dsp32_40nm_frame_openfpga.xml index bd350e389..0fcbfba3f 100644 --- a/openfpga_flow/openfpga_arch/k4_frac_N4_adder_chain_mem1K_frac_dsp32_40nm_frame_openfpga.xml +++ b/openfpga_flow/openfpga_arch/k4_frac_N4_adder_chain_mem1K_frac_dsp32_40nm_frame_openfpga.xml @@ -286,18 +286,18 @@ of the input/output of the 32x32 multiplier --> - - - + + + - - - + + + diff --git a/openfpga_flow/openfpga_arch/k6_frac_N10_adder_chain_frac_mem32K_frac_dsp36_40nm_GlobalTile8Clk_openfpga.xml b/openfpga_flow/openfpga_arch/k6_frac_N10_adder_chain_frac_mem32K_frac_dsp36_40nm_GlobalTile8Clk_openfpga.xml index dc39b625c..1997ab1f3 100644 --- a/openfpga_flow/openfpga_arch/k6_frac_N10_adder_chain_frac_mem32K_frac_dsp36_40nm_GlobalTile8Clk_openfpga.xml +++ b/openfpga_flow/openfpga_arch/k6_frac_N10_adder_chain_frac_mem32K_frac_dsp36_40nm_GlobalTile8Clk_openfpga.xml @@ -298,18 +298,18 @@ of the input/output of the 36x36 multiplier --> - - - + + + - - - + + + diff --git a/openfpga_flow/openfpga_cell_library/verilog/frac_mem_32k.v b/openfpga_flow/openfpga_cell_library/verilog/frac_mem_32k.v index 2d0b8fd26..b99753e7f 100644 --- a/openfpga_flow/openfpga_cell_library/verilog/frac_mem_32k.v +++ b/openfpga_flow/openfpga_cell_library/verilog/frac_mem_32k.v @@ -161,13 +161,17 @@ module frac_mem_32k ( end else if (4'b0111 == mode) begin if (we_a) begin ram_a[addr_a[0:9]] <= data_a; - ram_b[addr_b[0:9]] <= data_b; q_a <= data_a; - q_b <= data_b; end else begin q_a <= ram_a[addr_a[0:9]]; + end + + if (we_b) begin + ram_b[addr_b[0:9]] <= data_b; + q_b <= data_b; + end else begin q_b <= ram_b[addr_b[0:9]]; - end + end // Operating mode: dual port RAM 2048 x 16 end else if (4'b1000 == mode) begin if (we_a) begin diff --git a/yosys-plugins b/yosys-plugins index 27208ce08..b3430d2e5 160000 --- a/yosys-plugins +++ b/yosys-plugins @@ -1 +1 @@ -Subproject commit 27208ce08200a5e89e3bd4f466bc68824df38c32 +Subproject commit b3430d2e55181ab12ea67396a59c753fd342bbbc