mirror of https://github.com/YosysHQ/yosys.git
Order ports with default assignments first
Although the current style is allowed by the standard, Icarus verilog
doesn't parse default assignments using an implicit net type:
techlibs/ice40/cells_sim.v:305: syntax error
techlibs/ice40/cells_sim.v:1: Errors in port declarations.
Fix this by making sure that ports with default assignments first on
their line.
Fixes: 46d3f03d2
("Add default assignments to other SB_* simulation models")
Signed-off-by: Sean Anderson <seanga2@gmail.com>
This commit is contained in:
parent
035d99f3a8
commit
8c05f14b58
|
@ -302,7 +302,9 @@ endmodule
|
||||||
(* abc9_flop, lib_whitebox *)
|
(* abc9_flop, lib_whitebox *)
|
||||||
module SB_DFFE (
|
module SB_DFFE (
|
||||||
output reg Q,
|
output reg Q,
|
||||||
input C, E `ICE40_DEFAULT_ASSIGNMENT_1, D
|
input C,
|
||||||
|
input E `ICE40_DEFAULT_ASSIGNMENT_1,
|
||||||
|
input D
|
||||||
);
|
);
|
||||||
`SB_DFF_INIT
|
`SB_DFF_INIT
|
||||||
|
|
||||||
|
@ -589,7 +591,10 @@ endmodule
|
||||||
(* abc9_flop, lib_whitebox *)
|
(* abc9_flop, lib_whitebox *)
|
||||||
module SB_DFFESR (
|
module SB_DFFESR (
|
||||||
output reg Q,
|
output reg Q,
|
||||||
input C, E `ICE40_DEFAULT_ASSIGNMENT_1, R, D
|
input C,
|
||||||
|
input E `ICE40_DEFAULT_ASSIGNMENT_1,
|
||||||
|
input R,
|
||||||
|
input D
|
||||||
);
|
);
|
||||||
`SB_DFF_INIT
|
`SB_DFF_INIT
|
||||||
|
|
||||||
|
@ -647,7 +652,10 @@ endmodule
|
||||||
(* abc9_box, lib_whitebox *)
|
(* abc9_box, lib_whitebox *)
|
||||||
module SB_DFFER (
|
module SB_DFFER (
|
||||||
output reg Q,
|
output reg Q,
|
||||||
input C, E `ICE40_DEFAULT_ASSIGNMENT_1, R, D
|
input C,
|
||||||
|
input E `ICE40_DEFAULT_ASSIGNMENT_1,
|
||||||
|
input R,
|
||||||
|
input D
|
||||||
);
|
);
|
||||||
`SB_DFF_INIT
|
`SB_DFF_INIT
|
||||||
|
|
||||||
|
@ -724,7 +732,10 @@ endmodule
|
||||||
(* abc9_flop, lib_whitebox *)
|
(* abc9_flop, lib_whitebox *)
|
||||||
module SB_DFFESS (
|
module SB_DFFESS (
|
||||||
output reg Q,
|
output reg Q,
|
||||||
input C, E `ICE40_DEFAULT_ASSIGNMENT_1, S, D
|
input C,
|
||||||
|
input E `ICE40_DEFAULT_ASSIGNMENT_1,
|
||||||
|
input S,
|
||||||
|
input D
|
||||||
);
|
);
|
||||||
`SB_DFF_INIT
|
`SB_DFF_INIT
|
||||||
|
|
||||||
|
@ -782,7 +793,10 @@ endmodule
|
||||||
(* abc9_box, lib_whitebox *)
|
(* abc9_box, lib_whitebox *)
|
||||||
module SB_DFFES (
|
module SB_DFFES (
|
||||||
output reg Q,
|
output reg Q,
|
||||||
input C, E `ICE40_DEFAULT_ASSIGNMENT_1, S, D
|
input C,
|
||||||
|
input E `ICE40_DEFAULT_ASSIGNMENT_1,
|
||||||
|
input S,
|
||||||
|
input D
|
||||||
);
|
);
|
||||||
`SB_DFF_INIT
|
`SB_DFF_INIT
|
||||||
|
|
||||||
|
@ -899,7 +913,9 @@ endmodule
|
||||||
(* abc9_flop, lib_whitebox *)
|
(* abc9_flop, lib_whitebox *)
|
||||||
module SB_DFFNE (
|
module SB_DFFNE (
|
||||||
output reg Q,
|
output reg Q,
|
||||||
input C, E `ICE40_DEFAULT_ASSIGNMENT_1, D
|
input C,
|
||||||
|
input E `ICE40_DEFAULT_ASSIGNMENT_1,
|
||||||
|
input D
|
||||||
);
|
);
|
||||||
`SB_DFF_INIT
|
`SB_DFF_INIT
|
||||||
|
|
||||||
|
@ -1186,7 +1202,10 @@ endmodule
|
||||||
(* abc9_flop, lib_whitebox *)
|
(* abc9_flop, lib_whitebox *)
|
||||||
module SB_DFFNESR (
|
module SB_DFFNESR (
|
||||||
output reg Q,
|
output reg Q,
|
||||||
input C, E `ICE40_DEFAULT_ASSIGNMENT_1, R, D
|
input C,
|
||||||
|
input E `ICE40_DEFAULT_ASSIGNMENT_1,
|
||||||
|
input R,
|
||||||
|
input D
|
||||||
);
|
);
|
||||||
`SB_DFF_INIT
|
`SB_DFF_INIT
|
||||||
|
|
||||||
|
@ -1244,7 +1263,10 @@ endmodule
|
||||||
(* abc9_box, lib_whitebox *)
|
(* abc9_box, lib_whitebox *)
|
||||||
module SB_DFFNER (
|
module SB_DFFNER (
|
||||||
output reg Q,
|
output reg Q,
|
||||||
input C, E `ICE40_DEFAULT_ASSIGNMENT_1, R, D
|
input C,
|
||||||
|
input E `ICE40_DEFAULT_ASSIGNMENT_1,
|
||||||
|
input R,
|
||||||
|
input D
|
||||||
);
|
);
|
||||||
`SB_DFF_INIT
|
`SB_DFF_INIT
|
||||||
|
|
||||||
|
@ -1321,7 +1343,10 @@ endmodule
|
||||||
(* abc9_flop, lib_whitebox *)
|
(* abc9_flop, lib_whitebox *)
|
||||||
module SB_DFFNESS (
|
module SB_DFFNESS (
|
||||||
output reg Q,
|
output reg Q,
|
||||||
input C, E `ICE40_DEFAULT_ASSIGNMENT_1, S, D
|
input C,
|
||||||
|
input E `ICE40_DEFAULT_ASSIGNMENT_1,
|
||||||
|
input S,
|
||||||
|
input D
|
||||||
);
|
);
|
||||||
`SB_DFF_INIT
|
`SB_DFF_INIT
|
||||||
|
|
||||||
|
@ -1379,7 +1404,10 @@ endmodule
|
||||||
(* abc9_box, lib_whitebox *)
|
(* abc9_box, lib_whitebox *)
|
||||||
module SB_DFFNES (
|
module SB_DFFNES (
|
||||||
output reg Q,
|
output reg Q,
|
||||||
input C, E `ICE40_DEFAULT_ASSIGNMENT_1, S, D
|
input C,
|
||||||
|
input E `ICE40_DEFAULT_ASSIGNMENT_1,
|
||||||
|
input S,
|
||||||
|
input D
|
||||||
);
|
);
|
||||||
`SB_DFF_INIT
|
`SB_DFF_INIT
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue