summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kernel/modtools.h (renamed from kernel/modwalker.h)4
-rw-r--r--passes/memory/memory_share.cc11
-rw-r--r--passes/sat/share.cc11
3 files changed, 14 insertions, 12 deletions
diff --git a/kernel/modwalker.h b/kernel/modtools.h
index 09f815b8..06e96246 100644
--- a/kernel/modwalker.h
+++ b/kernel/modtools.h
@@ -17,8 +17,8 @@
*
*/
-#ifndef MODWALKER_H
-#define MODWALKER_H
+#ifndef MODTOOLS_H
+#define MODTOOLS_H
#include "kernel/sigtools.h"
#include "kernel/celltypes.h"
diff --git a/passes/memory/memory_share.cc b/passes/memory/memory_share.cc
index b6e7cc83..fde6ea00 100644
--- a/passes/memory/memory_share.cc
+++ b/passes/memory/memory_share.cc
@@ -17,13 +17,12 @@
*
*/
-#include "kernel/rtlil.h"
+#include "kernel/yosys.h"
#include "kernel/satgen.h"
#include "kernel/sigtools.h"
-#include "kernel/modwalker.h"
-#include "kernel/register.h"
-#include "kernel/log.h"
-#include <algorithm>
+#include "kernel/modtools.h"
+
+PRIVATE_NAMESPACE_BEGIN
static bool memcells_cmp(RTLIL::Cell *a, RTLIL::Cell *b)
{
@@ -742,3 +741,5 @@ struct MemorySharePass : public Pass {
}
} MemorySharePass;
+PRIVATE_NAMESPACE_END
+
diff --git a/passes/sat/share.cc b/passes/sat/share.cc
index 1041227e..ea7a9f63 100644
--- a/passes/sat/share.cc
+++ b/passes/sat/share.cc
@@ -17,13 +17,12 @@
*
*/
-#include "kernel/rtlil.h"
+#include "kernel/yosys.h"
#include "kernel/satgen.h"
#include "kernel/sigtools.h"
-#include "kernel/modwalker.h"
-#include "kernel/register.h"
-#include "kernel/log.h"
-#include <algorithm>
+#include "kernel/modtools.h"
+
+PRIVATE_NAMESPACE_BEGIN
struct ShareWorkerConfig
{
@@ -967,3 +966,5 @@ struct SharePass : public Pass {
}
} SharePass;
+PRIVATE_NAMESPACE_END
+