aboutsummaryrefslogtreecommitdiffstats
path: root/common/constraints.h
diff options
context:
space:
mode:
authorKeith Rothman <537074+litghost@users.noreply.github.com>2021-03-12 13:09:44 -0800
committerKeith Rothman <537074+litghost@users.noreply.github.com>2021-03-15 09:05:23 -0700
commitfe4608386eb163c70a75ed84beb07516af378b36 (patch)
tree05f1371ad44da5a69617f43cf68005cf271be5e1 /common/constraints.h
parent035b797ec230aa3d686d9013e0e15d79cd2982c3 (diff)
downloadnextpnr-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 'common/constraints.h')
-rw-r--r--common/constraints.h15
1 files changed, 10 insertions, 5 deletions
diff --git a/common/constraints.h b/common/constraints.h
index dfb108f8..9ec8372d 100644
--- a/common/constraints.h
+++ b/common/constraints.h
@@ -20,15 +20,20 @@
#ifndef CONSTRAINTS_H
#define CONSTRAINTS_H
-#ifndef NEXTPNR_H
-#error Include after "nextpnr.h" only.
-#endif
+#include <cstdint>
+#include <unordered_map>
+#include <vector>
+#include "archdefs.h"
#include "exclusive_state_groups.h"
+#include "idstring.h"
+#include "nextpnr_namespaces.h"
NEXTPNR_NAMESPACE_BEGIN
-template <size_t StateCount, typename StateType = int8_t, typename CountType = uint8_t> struct Constraints
+struct Context;
+
+template <std::size_t StateCount, typename StateType = int8_t, typename CountType = uint8_t> struct Constraints
{
using ConstraintStateType = StateType;
using ConstraintCountType = CountType;
@@ -41,7 +46,7 @@ template <size_t StateCount, typename StateType = int8_t, typename CountType = u
template <typename StateRange> struct Constraint
{
- virtual size_t tag() const = 0;
+ virtual std::size_t tag() const = 0;
virtual ConstraintType constraint_type() const = 0;
virtual StateType state() const = 0;
virtual StateRange states() const = 0;