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 /ice40 | |
| 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 'ice40')
| -rw-r--r-- | ice40/arch.h | 16 | ||||
| -rw-r--r-- | ice40/archdefs.h | 12 |
2 files changed, 20 insertions, 8 deletions
diff --git a/ice40/arch.h b/ice40/arch.h index 4bac3d7a..29396f49 100644 --- a/ice40/arch.h +++ b/ice40/arch.h @@ -17,16 +17,20 @@ * */ -#ifndef NEXTPNR_H -#error Include "arch.h" via "nextpnr.h" only. -#endif +#ifndef ICE40_ARCH_H +#define ICE40_ARCH_H + +#include <cstdint> + +#include "base_arch.h" +#include "nextpnr_namespaces.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 { int32_t port; int32_t type; @@ -866,3 +870,5 @@ struct Arch : BaseArch<ArchRanges> void ice40DelayFuzzerMain(Context *ctx); NEXTPNR_NAMESPACE_END + +#endif /* ICE40_ARCH_H */ diff --git a/ice40/archdefs.h b/ice40/archdefs.h index 5caa420a..038a3131 100644 --- a/ice40/archdefs.h +++ b/ice40/archdefs.h @@ -17,9 +17,13 @@ * */ -#ifndef NEXTPNR_H -#error Include "archdefs.h" via "nextpnr.h" only. -#endif +#ifndef ICE40_ARCHDEFS_H +#define ICE40_ARCHDEFS_H + +#include <boost/functional/hash.hpp> + +#include "idstring.h" +#include "nextpnr_namespaces.h" NEXTPNR_NAMESPACE_BEGIN @@ -196,3 +200,5 @@ template <> struct hash<NEXTPNR_NAMESPACE_PREFIX DecalId> }; } // namespace std + +#endif /* ICE40_ARCHDEFS_H */ |