From 5d6b5a80b0ede1c75564923fa627388759f5d392 Mon Sep 17 00:00:00 2001 From: Luke Wren Date: Sun, 21 Aug 2022 13:22:55 +0100 Subject: [PATCH] Standardise on ifndef YOSYS around default_nettype wire --- hdl/arith/hazard3_branchcmp.v | 4 +++- hdl/arith/hazard3_mul_fast.v | 2 ++ hdl/arith/hazard3_muldiv_seq.v | 2 ++ hdl/arith/hazard3_shift_barrel.v | 2 ++ hdl/debug/cdc/hazard3_apb_async_bridge.v | 2 ++ hdl/debug/cdc/hazard3_reset_sync.v | 2 ++ hdl/debug/cdc/hazard3_sync_1bit.v | 2 ++ hdl/debug/dtm/hazard3_ecp5_jtag_dtm.v | 2 ++ hdl/debug/dtm/hazard3_jtag_dtm.v | 2 ++ hdl/debug/dtm/hazard3_jtag_dtm_core.v | 2 ++ hdl/hazard3_regfile_1w2r.v | 2 ++ 11 files changed, 23 insertions(+), 1 deletion(-) diff --git a/hdl/arith/hazard3_branchcmp.v b/hdl/arith/hazard3_branchcmp.v index dd849fd..3989c7e 100644 --- a/hdl/arith/hazard3_branchcmp.v +++ b/hdl/arith/hazard3_branchcmp.v @@ -39,4 +39,6 @@ assign cmp = aluop[0] ? op_a != op_b : lt; endmodule -`default_nettype wire \ No newline at end of file +`ifndef YOSYS +`default_nettype wire +`endif diff --git a/hdl/arith/hazard3_mul_fast.v b/hdl/arith/hazard3_mul_fast.v index b066165..bf96ae1 100644 --- a/hdl/arith/hazard3_mul_fast.v +++ b/hdl/arith/hazard3_mul_fast.v @@ -157,4 +157,6 @@ endgenerate endmodule +`ifndef YOSYS `default_nettype wire +`endif diff --git a/hdl/arith/hazard3_muldiv_seq.v b/hdl/arith/hazard3_muldiv_seq.v index 30482e9..83de39d 100644 --- a/hdl/arith/hazard3_muldiv_seq.v +++ b/hdl/arith/hazard3_muldiv_seq.v @@ -289,4 +289,6 @@ end endmodule +`ifndef YOSYS `default_nettype wire +`endif diff --git a/hdl/arith/hazard3_shift_barrel.v b/hdl/arith/hazard3_shift_barrel.v index 74f8b86..9fb51be 100644 --- a/hdl/arith/hazard3_shift_barrel.v +++ b/hdl/arith/hazard3_shift_barrel.v @@ -61,4 +61,6 @@ end endmodule +`ifndef YOSYS `default_nettype wire +`endif diff --git a/hdl/debug/cdc/hazard3_apb_async_bridge.v b/hdl/debug/cdc/hazard3_apb_async_bridge.v index 5d86411..a0fc942 100644 --- a/hdl/debug/cdc/hazard3_apb_async_bridge.v +++ b/hdl/debug/cdc/hazard3_apb_async_bridge.v @@ -194,4 +194,6 @@ assign {dst_paddr, dst_pwdata, dst_pwrite} = dst_paddr_pwdata_pwrite; endmodule +`ifndef YOSYS `default_nettype wire +`endif diff --git a/hdl/debug/cdc/hazard3_reset_sync.v b/hdl/debug/cdc/hazard3_reset_sync.v index 860efa4..3dc8c32 100644 --- a/hdl/debug/cdc/hazard3_reset_sync.v +++ b/hdl/debug/cdc/hazard3_reset_sync.v @@ -36,4 +36,6 @@ assign rst_n_out = delay[N_STAGES-1]; endmodule +`ifndef YOSYS `default_nettype wire +`endif diff --git a/hdl/debug/cdc/hazard3_sync_1bit.v b/hdl/debug/cdc/hazard3_sync_1bit.v index a25814d..3e15a37 100644 --- a/hdl/debug/cdc/hazard3_sync_1bit.v +++ b/hdl/debug/cdc/hazard3_sync_1bit.v @@ -34,4 +34,6 @@ assign o = sync_flops[N_STAGES-1]; endmodule +`ifndef YOSYS `default_nettype wire +`endif diff --git a/hdl/debug/dtm/hazard3_ecp5_jtag_dtm.v b/hdl/debug/dtm/hazard3_ecp5_jtag_dtm.v index 0f776bf..bbfed71 100644 --- a/hdl/debug/dtm/hazard3_ecp5_jtag_dtm.v +++ b/hdl/debug/dtm/hazard3_ecp5_jtag_dtm.v @@ -189,4 +189,6 @@ assign dmi_paddr[1:0] = 2'b00; endmodule +`ifndef YOSYS `default_nettype wire +`ifndef YOSYS diff --git a/hdl/debug/dtm/hazard3_jtag_dtm.v b/hdl/debug/dtm/hazard3_jtag_dtm.v index cc8ab47..214a31d 100644 --- a/hdl/debug/dtm/hazard3_jtag_dtm.v +++ b/hdl/debug/dtm/hazard3_jtag_dtm.v @@ -206,4 +206,6 @@ assign dmi_paddr[1:0] = 2'b00; endmodule +`ifndef YOSYS `default_nettype wire +`endif diff --git a/hdl/debug/dtm/hazard3_jtag_dtm_core.v b/hdl/debug/dtm/hazard3_jtag_dtm_core.v index 1248ce6..af837c5 100644 --- a/hdl/debug/dtm/hazard3_jtag_dtm_core.v +++ b/hdl/debug/dtm/hazard3_jtag_dtm_core.v @@ -181,4 +181,6 @@ end endmodule +`ifndef YOSYS `default_nettype wire +`endif diff --git a/hdl/hazard3_regfile_1w2r.v b/hdl/hazard3_regfile_1w2r.v index 80f8e37..f8248b4 100644 --- a/hdl/hazard3_regfile_1w2r.v +++ b/hdl/hazard3_regfile_1w2r.v @@ -65,4 +65,6 @@ endgenerate endmodule +`ifndef YOSYS `default_nettype wire +`endif