From fe4608386eb163c70a75ed84beb07516af378b36 Mon Sep 17 00:00:00 2001 From: Keith Rothman <537074+litghost@users.noreply.github.com> Date: Fri, 12 Mar 2021 13:09:44 -0800 Subject: 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> --- ice40/arch.h | 16 +++++++++++----- ice40/archdefs.h | 12 +++++++++--- 2 files changed, 20 insertions(+), 8 deletions(-) (limited to 'ice40') 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 + +#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 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 + +#include "idstring.h" +#include "nextpnr_namespaces.h" NEXTPNR_NAMESPACE_BEGIN @@ -196,3 +200,5 @@ template <> struct hash }; } // namespace std + +#endif /* ICE40_ARCHDEFS_H */ -- cgit v1.2.3