mirror of https://github.com/YosysHQ/yosys.git
Merge pull request #3488 from YosysHQ/micko/test_fix
Test fixes for latest iverilog
This commit is contained in:
commit
5580185228
|
@ -68,9 +68,8 @@ end
|
||||||
assign dout = combout_rt & 1'b1;
|
assign dout = combout_rt & 1'b1;
|
||||||
endmodule
|
endmodule
|
||||||
|
|
||||||
module DFF (output q,
|
module DFF (output reg q,
|
||||||
input d, ck);
|
input d, ck);
|
||||||
reg q;
|
|
||||||
always @(posedge ck)
|
always @(posedge ck)
|
||||||
q <= d;
|
q <= d;
|
||||||
|
|
||||||
|
|
|
@ -162,7 +162,7 @@ module ARI1 (
|
||||||
wire F1 = INIT[8 + Fsel];
|
wire F1 = INIT[8 + Fsel];
|
||||||
wire Yout = A ? F1 : F0;
|
wire Yout = A ? F1 : F0;
|
||||||
assign Y = Yout;
|
assign Y = Yout;
|
||||||
wire S = FCI ^ Yout;
|
assign S = FCI ^ Yout;
|
||||||
wire G = INIT[16] ? (INIT[17] ? F1 : F0) : INIT[17];
|
wire G = INIT[16] ? (INIT[17] ? F1 : F0) : INIT[17];
|
||||||
wire P = INIT[19] ? 1'b1 : (INIT[18] ? Yout : 1'b0);
|
wire P = INIT[19] ? 1'b1 : (INIT[18] ? Yout : 1'b0);
|
||||||
assign FCO = P ? FCI : G;
|
assign FCO = P ? FCI : G;
|
||||||
|
|
|
@ -137,8 +137,13 @@ endmodule
|
||||||
|
|
||||||
// ----------------------------------------------------------
|
// ----------------------------------------------------------
|
||||||
|
|
||||||
module memtest06_sync(input clk, input rst, input [2:0] idx, input [7:0] din, output [7:0] dout);
|
module memtest06_sync(clk, rst, idx, din, dout);
|
||||||
|
input clk;
|
||||||
|
input rst;
|
||||||
(* gentb_constant=0 *) wire rst;
|
(* gentb_constant=0 *) wire rst;
|
||||||
|
input [2:0] idx;
|
||||||
|
input [7:0] din;
|
||||||
|
output [7:0] dout;
|
||||||
reg [7:0] test [0:7];
|
reg [7:0] test [0:7];
|
||||||
integer i;
|
integer i;
|
||||||
always @(posedge clk) begin
|
always @(posedge clk) begin
|
||||||
|
@ -156,8 +161,13 @@ module memtest06_sync(input clk, input rst, input [2:0] idx, input [7:0] din, ou
|
||||||
assign dout = test[idx];
|
assign dout = test[idx];
|
||||||
endmodule
|
endmodule
|
||||||
|
|
||||||
module memtest06_async(input clk, input rst, input [2:0] idx, input [7:0] din, output [7:0] dout);
|
module memtest06_async(clk, rst, idx, din, dout);
|
||||||
|
input clk;
|
||||||
|
input rst;
|
||||||
(* gentb_constant=0 *) wire rst;
|
(* gentb_constant=0 *) wire rst;
|
||||||
|
input [2:0] idx;
|
||||||
|
input [7:0] din;
|
||||||
|
output [7:0] dout;
|
||||||
reg [7:0] test [0:7];
|
reg [7:0] test [0:7];
|
||||||
integer i;
|
integer i;
|
||||||
always @(posedge clk or posedge rst) begin
|
always @(posedge clk or posedge rst) begin
|
||||||
|
|
Loading…
Reference in New Issue