diff options
| author | Keith Rothman <537074+litghost@users.noreply.github.com> | 2021-03-12 13:09:44 -0800 |
|---|---|---|
| committer | Keith Rothman <537074+litghost@users.noreply.github.com> | 2021-03-15 09:05:23 -0700 |
| commit | fe4608386eb163c70a75ed84beb07516af378b36 (patch) | |
| tree | 05f1371ad44da5a69617f43cf68005cf271be5e1 /ecp5 | |
| parent | 035b797ec230aa3d686d9013e0e15d79cd2982c3 (diff) | |
| download | nextpnr-fe4608386eb163c70a75ed84beb07516af378b36.tar.gz nextpnr-fe4608386eb163c70a75ed84beb07516af378b36.tar.bz2 nextpnr-fe4608386eb163c70a75ed84beb07516af378b36.zip | |
Split nextpnr.h to allow for linear inclusion.
"nextpnr.h" is no longer the god header. Important improvements:
- Functions in log.h can be used without including
BaseCtx/Arch/Context. This means that log_X functions can be called
without included "nextpnr.h"
- NPNR_ASSERT can be used without including "nextpnr.h" by including
"nextpnr_assertions.h". This allows NPNR_ASSERT to be used safely in
any header file.
- Types defined in "archdefs.h" are now available without including
BaseCtx/Arch/Context. This means that utility classes that will be
used inside of BaseCtx/Arch/Context can be defined safely in a
self-contained header.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
Diffstat (limited to 'ecp5')
| -rw-r--r-- | ecp5/arch.h | 13 | ||||
| -rw-r--r-- | ecp5/archdefs.h | 14 | ||||
| -rw-r--r-- | ecp5/lpf.cc | 4 |
3 files changed, 21 insertions, 10 deletions
diff --git a/ecp5/arch.h b/ecp5/arch.h index f1da870a..063a3df6 100644 --- a/ecp5/arch.h +++ b/ecp5/arch.h @@ -18,19 +18,20 @@ * */ -#ifndef NEXTPNR_H -#error Include "arch.h" via "nextpnr.h" only. -#endif +#ifndef ECP5_ARCH_H +#define ECP5_ARCH_H #include <set> #include <sstream> +#include "base_arch.h" +#include "nextpnr_types.h" +#include "relptr.h" + NEXTPNR_NAMESPACE_BEGIN /**** Everything in this section must be kept in sync with chipdb.py ****/ -#include "relptr.h" - NPNR_PACKED_STRUCT(struct BelWirePOD { LocationPOD rel_wire_loc; int32_t wire_index; @@ -928,3 +929,5 @@ struct Arch : BaseArch<ArchRanges> }; NEXTPNR_NAMESPACE_END + +#endif /* ECP5_ARCH_H */ diff --git a/ecp5/archdefs.h b/ecp5/archdefs.h index cf6902d3..6a149264 100644 --- a/ecp5/archdefs.h +++ b/ecp5/archdefs.h @@ -18,12 +18,14 @@ * */ -#ifndef NEXTPNR_H -#error Include "archdefs.h" via "nextpnr.h" only. -#endif +#ifndef ECP5_ARCHDEFS_H +#define ECP5_ARCHDEFS_H #include <boost/functional/hash.hpp> +#include "idstring.h" +#include "nextpnr_namespaces.h" + NEXTPNR_NAMESPACE_BEGIN typedef int delay_t; @@ -165,12 +167,12 @@ struct ArchCellInfo bool is_output_b_registered; // Which timing information to use for a DP16KD. Depends on registering // configuration. - nextpnr_ecp5::IdString regmode_timing_id; + IdString regmode_timing_id; } ramInfo; struct { bool is_clocked; - nextpnr_ecp5::IdString timing_id; + IdString timing_id; } multInfo; }; @@ -242,3 +244,5 @@ template <> struct hash<NEXTPNR_NAMESPACE_PREFIX DecalId> }; } // namespace std + +#endif /* ECP5_ARCHDEFS_H */ diff --git a/ecp5/lpf.cc b/ecp5/lpf.cc index 22859783..6d134e8d 100644 --- a/ecp5/lpf.cc +++ b/ecp5/lpf.cc @@ -19,7 +19,11 @@ #include <boost/algorithm/string.hpp> #include <sstream> +#include <unordered_set> + +#include "arch.h" #include "log.h" +#include "nextpnr_namespaces.h" NEXTPNR_NAMESPACE_BEGIN |