Move Mem type to base folder

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

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -91,6 +91,7 @@ set(zasm_SOURCES
 	"include/zasm/base/immediate.hpp"
 	"include/zasm/base/instruction.hpp"
 	"include/zasm/base/label.hpp"
+	"include/zasm/base/memory.hpp"
 	"include/zasm/base/meta.hpp"
 	"include/zasm/base/mode.hpp"
 	"include/zasm/base/register.hpp"
@@ -114,7 +115,6 @@ set(zasm_SOURCES
 	"include/zasm/program/embeddedlabel.hpp"
 	"include/zasm/program/instruction.hpp"
 	"include/zasm/program/labeldata.hpp"
-	"include/zasm/program/memory.hpp"
 	"include/zasm/program/node.hpp"
 	"include/zasm/program/observer.hpp"
 	"include/zasm/program/operand.hpp"

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

diff --git a/include/zasm/x86/memory.hpp b/include/zasm/x86/memory.hpp
@@ -2,7 +2,7 @@
 
 #include "register.hpp"
 
-#include <zasm/program/memory.hpp>
+#include <zasm/base/memory.hpp>
 
 namespace zasm::x86
 {