Move Label to base folder

zyantific · Dec 27, 2023 · 028bd1d · 028bd1d
1 parent fc95dc3
commit 028bd1d
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -90,6 +90,7 @@ set(zasm_SOURCES
 	"src/zasm/src/program/saverestoretypes.hpp"
 	"include/zasm/base/immediate.hpp"
 	"include/zasm/base/instruction.hpp"
+	"include/zasm/base/label.hpp"
 	"include/zasm/base/meta.hpp"
 	"include/zasm/base/mode.hpp"
 	"include/zasm/base/register.hpp"
@@ -112,7 +113,6 @@ set(zasm_SOURCES
 	"include/zasm/program/data.hpp"
 	"include/zasm/program/embeddedlabel.hpp"
 	"include/zasm/program/instruction.hpp"
-	"include/zasm/program/label.hpp"
 	"include/zasm/program/labeldata.hpp"
 	"include/zasm/program/memory.hpp"
 	"include/zasm/program/node.hpp"

diff --git a/include/zasm/program/label.hpp → include/zasm/base/label.hpp b/include/zasm/program/label.hpp → include/zasm/base/label.hpp
diff --git a/include/zasm/program/embeddedlabel.hpp b/include/zasm/program/embeddedlabel.hpp
@@ -1,9 +1,8 @@
 #pragma once
 
-#include "label.hpp"
-
 #include <cstddef>
 #include <cstdint>
+#include <zasm/base/label.hpp>
 #include <zasm/core/bitsize.hpp>
 
 namespace zasm

diff --git a/include/zasm/program/labeldata.hpp b/include/zasm/program/labeldata.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <cstdint>
+#include <zasm/base/label.hpp>
 #include <zasm/core/enumflags.hpp>
-#include <zasm/program/label.hpp>
 
 namespace zasm
 {

diff --git a/include/zasm/program/memory.hpp b/include/zasm/program/memory.hpp
@@ -1,9 +1,8 @@
 #pragma once
 
-#include "label.hpp"
-
 #include <cstdint>
 #include <limits>
+#include <zasm/base/label.hpp>
 #include <zasm/base/mode.hpp>
 #include <zasm/base/register.hpp>
 #include <zasm/core/bitsize.hpp>

diff --git a/include/zasm/program/node.hpp b/include/zasm/program/node.hpp
@@ -4,13 +4,13 @@
 #include "data.hpp"
 #include "embeddedlabel.hpp"
 #include "instruction.hpp"
-#include "label.hpp"
 #include "section.hpp"
 #include "sentinel.hpp"
 
 #include <climits>
 #include <cstddef>
 #include <variant>
+#include <zasm/base/label.hpp>
 #include <zasm/core/enumflags.hpp>
 
 namespace zasm

diff --git a/include/zasm/program/operand.hpp b/include/zasm/program/operand.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "label.hpp"
 #include "memory.hpp"
 
 #include <cstdint>
 #include <variant>
 #include <zasm/base/immediate.hpp>
+#include <zasm/base/label.hpp>
 #include <zasm/base/register.hpp>
 #include <zasm/core/enumflags.hpp>
 

diff --git a/include/zasm/program/program.hpp b/include/zasm/program/program.hpp
@@ -2,13 +2,13 @@
 
 #include "data.hpp"
 #include "embeddedlabel.hpp"
-#include "label.hpp"
 #include "node.hpp"
 #include "section.hpp"
 
 #include <cstddef>
 #include <cstdint>
 #include <memory>
+#include <zasm/base/label.hpp>
 #include <zasm/base/mode.hpp>
 #include <zasm/core/errors.hpp>
 #include <zasm/core/expected.hpp>

diff --git a/src/zasm/src/encoder/encoder.context.hpp b/src/zasm/src/encoder/encoder.context.hpp
@@ -5,8 +5,8 @@
 #include <cstdint>
 #include <optional>
 #include <vector>
+#include <zasm/base/label.hpp>
 #include <zasm/core/stringpool.hpp>
-#include <zasm/program/label.hpp>
 #include <zasm/program/section.hpp>
 
 namespace zasm

diff --git a/src/zasm/src/program/program.state.hpp b/src/zasm/src/program/program.state.hpp
@@ -1,19 +1,19 @@
 #pragma once
 
-#include "zasm/base/mode.hpp"
 #include "zasm/core/enumflags.hpp"
 #include "zasm/core/objectpool.hpp"
 #include "zasm/core/stringpool.hpp"
 #include "zasm/encoder/encoder.hpp"
 #include "zasm/program/data.hpp"
-#include "zasm/program/label.hpp"
 #include "zasm/program/labeldata.hpp"
 #include "zasm/program/node.hpp"
 #include "zasm/program/section.hpp"
 
 #include <Zydis/Zydis.h>
 #include <cstddef>
 #include <vector>
+#include <zasm/base/label.hpp>
+#include <zasm/base/mode.hpp>
 
 namespace zasm
 {