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> --- generic/arch.h | 15 ++++++++++++--- generic/archdefs.h | 11 ++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) (limited to 'generic') diff --git a/generic/arch.h b/generic/arch.h index cc8de484..1d37b2fd 100644 --- a/generic/arch.h +++ b/generic/arch.h @@ -17,9 +17,16 @@ * */ -#ifndef NEXTPNR_H -#error Include "arch.h" via "nextpnr.h" only. -#endif +#ifndef GENERIC_ARCH_H +#define GENERIC_ARCH_H + +#include + +#include "arch_api.h" +#include "idstring.h" +#include "idstringlist.h" +#include "nextpnr_namespaces.h" +#include "nextpnr_types.h" NEXTPNR_NAMESPACE_BEGIN @@ -366,3 +373,5 @@ struct Arch : ArchAPI }; NEXTPNR_NAMESPACE_END + +#endif /* GENERIC_ARCH_H */ diff --git a/generic/archdefs.h b/generic/archdefs.h index a5108e9e..bdd97dde 100644 --- a/generic/archdefs.h +++ b/generic/archdefs.h @@ -17,9 +17,12 @@ * */ -#ifndef NEXTPNR_H -#error Include "archdefs.h" via "nextpnr.h" only. -#endif +#ifndef GENERIC_ARCHDEFS_H +#define GENERIC_ARCHDEFS_H + +#include + +#include "idstringlist.h" NEXTPNR_NAMESPACE_BEGIN @@ -52,3 +55,5 @@ struct ArchCellInfo }; NEXTPNR_NAMESPACE_END + +#endif /* GENERIC_ARCHDEFS_H */ -- cgit v1.2.3