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 /machxo2 | |
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 'machxo2')
-rw-r--r-- | machxo2/arch.h | 15 | ||||
-rw-r--r-- | machxo2/archdefs.h | 10 |
2 files changed, 18 insertions, 7 deletions
diff --git a/machxo2/arch.h b/machxo2/arch.h index 7a22dd91..15535fe1 100644 --- a/machxo2/arch.h +++ b/machxo2/arch.h @@ -18,9 +18,14 @@ * */ -#ifndef NEXTPNR_H -#error Include "arch.h" via "nextpnr.h" only. -#endif +#ifndef MACHXO2_ARCH_H +#define MACHXO2_ARCH_H + +#include <cstdint> + +#include "base_arch.h" +#include "nextpnr_namespaces.h" +#include "nextpnr_types.h" NEXTPNR_NAMESPACE_BEGIN @@ -37,7 +42,7 @@ template <typename T> struct RelPtr const T *get() const { return reinterpret_cast<const T *>(reinterpret_cast<const char *>(this) + offset); } - const T &operator[](size_t index) const { return get()[index]; } + const T &operator[](std::size_t index) const { return get()[index]; } const T &operator*() const { return *(get()); } @@ -684,3 +689,5 @@ struct Arch : BaseArch<ArchRanges> }; NEXTPNR_NAMESPACE_END + +#endif /* MACHXO2_ARCH_H */ diff --git a/machxo2/archdefs.h b/machxo2/archdefs.h index 433b1b6b..31575487 100644 --- a/machxo2/archdefs.h +++ b/machxo2/archdefs.h @@ -18,9 +18,11 @@ * */ -#ifndef NEXTPNR_H -#error Include "archdefs.h" via "nextpnr.h" only. -#endif +#ifndef MACHXO2_ARCHDEFS_H +#define MACHXO2_ARCHDEFS_H + +#include "idstring.h" +#include "nextpnr_namespaces.h" NEXTPNR_NAMESPACE_BEGIN @@ -153,3 +155,5 @@ template <> struct hash<NEXTPNR_NAMESPACE_PREFIX PipId> }; } // namespace std + +#endif /* MACHXO2_ARCHDEFS_H */ |