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>
---
 nexus/arch.h     | 15 +++++++++------
 nexus/archdefs.h | 13 ++++++++++---
 nexus/fasm.cc    |  1 +
 3 files changed, 20 insertions(+), 9 deletions(-)

(limited to 'nexus')

diff --git a/nexus/arch.h b/nexus/arch.h
index 9dfc4551..55e9becd 100644
--- a/nexus/arch.h
+++ b/nexus/arch.h
@@ -18,18 +18,19 @@
  *
  */
 
-#ifndef NEXTPNR_H
-#error Include "arch.h" via "nextpnr.h" only.
-#endif
+#ifndef NEXUS_ARCH_H
+#define NEXUS_ARCH_H
 
 #include <boost/iostreams/device/mapped_file.hpp>
-
 #include <iostream>
 
-NEXTPNR_NAMESPACE_BEGIN
-
+#include "base_arch.h"
+#include "nextpnr_namespaces.h"
+#include "nextpnr_types.h"
 #include "relptr.h"
 
+NEXTPNR_NAMESPACE_BEGIN
+
 /*
     Fully deduplicated database
 
@@ -1394,3 +1395,5 @@ struct Arch : BaseArch<ArchRanges>
 };
 
 NEXTPNR_NAMESPACE_END
+
+#endif /* NEXUS_ARCH_H */
diff --git a/nexus/archdefs.h b/nexus/archdefs.h
index e6c3edde..b9ac3c77 100644
--- a/nexus/archdefs.h
+++ b/nexus/archdefs.h
@@ -17,9 +17,14 @@
  *
  */
 
-#ifndef NEXTPNR_H
-#error Include "archdefs.h" via "nextpnr.h" only.
-#endif
+#ifndef NEXUS_ARCHDEFS_H
+#define NEXUS_ARCHDEFS_H
+
+#include <boost/functional/hash.hpp>
+#include <unordered_map>
+
+#include "idstring.h"
+#include "nextpnr_namespaces.h"
 
 NEXTPNR_NAMESPACE_BEGIN
 
@@ -233,3 +238,5 @@ template <> struct hash<NEXTPNR_NAMESPACE_PREFIX DecalId>
 };
 
 } // namespace std
+
+#endif /* NEXUS_ARCHDEFS_H */
diff --git a/nexus/fasm.cc b/nexus/fasm.cc
index 4394aebc..d802712d 100644
--- a/nexus/fasm.cc
+++ b/nexus/fasm.cc
@@ -22,6 +22,7 @@
 #include "nextpnr.h"
 #include "util.h"
 
+#include <boost/range/adaptor/reversed.hpp>
 #include <queue>
 
 NEXTPNR_NAMESPACE_BEGIN
-- 
cgit v1.2.3