summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorCyrille Bagard <nocbos@gmail.com>2020-02-18 22:24:55 (GMT)
committerCyrille Bagard <nocbos@gmail.com>2020-02-18 22:24:55 (GMT)
commitd6b2e6639698674cbdaf7dc2e5f5a637abcfadb0 (patch)
tree13394ab4695d8f4b60195961f24dd498c6bcbbe6 /src/arch
parent95e204291faa4800781d2f302c41f86a3f01851d (diff)
Relocated the raw instructions.
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/Makefile.am1
-rw-r--r--src/arch/instructions/Makefile.am1
-rw-r--r--src/arch/instructions/raw.c (renamed from src/arch/raw.c)6
-rw-r--r--src/arch/instructions/raw.h (renamed from src/arch/raw.h)10
-rw-r--r--src/arch/processor.c1
5 files changed, 9 insertions, 10 deletions
diff --git a/src/arch/Makefile.am b/src/arch/Makefile.am
index 46f78e8..af0c79a 100644
--- a/src/arch/Makefile.am
+++ b/src/arch/Makefile.am
@@ -18,7 +18,6 @@ libarch_la_SOURCES = \
processor-int.h \
processor.h processor.c \
proxy.h proxy.c \
- raw.h raw.c \
register-int.h \
register.h register.c \
storage.h storage.c \
diff --git a/src/arch/instructions/Makefile.am b/src/arch/instructions/Makefile.am
index c060c7e..584173f 100644
--- a/src/arch/instructions/Makefile.am
+++ b/src/arch/instructions/Makefile.am
@@ -2,6 +2,7 @@
noinst_LTLIBRARIES = libarchinstructions.la
libarchinstructions_la_SOURCES = \
+ raw.h raw.c \
undefined-int.h \
undefined.h undefined.c
diff --git a/src/arch/raw.c b/src/arch/instructions/raw.c
index 285e168..7c2535c 100644
--- a/src/arch/raw.c
+++ b/src/arch/instructions/raw.c
@@ -32,9 +32,9 @@
#include <i18n.h>
-#include "instruction-int.h"
-#include "target.h"
-#include "operands/immediate.h"
+#include "../instruction-int.h"
+#include "../target.h"
+#include "../operands/immediate.h"
diff --git a/src/arch/raw.h b/src/arch/instructions/raw.h
index c745f4a..4e92cd4 100644
--- a/src/arch/raw.h
+++ b/src/arch/instructions/raw.h
@@ -21,15 +21,15 @@
*/
-#ifndef _ARCH_RAW_H
-#define _ARCH_RAW_H
+#ifndef _ARCH_INSTRUCTIONS_RAW_H
+#define _ARCH_INSTRUCTIONS_RAW_H
#include <glib-object.h>
-#include "instruction.h"
-#include "vmpa.h"
+#include "../instruction.h"
+#include "../vmpa.h"
@@ -88,4 +88,4 @@ bool g_raw_instruction_is_string(const GRawInstruction *);
-#endif /* _ARCH_RAW_H */
+#endif /* _ARCH_INSTRUCTIONS_RAW_H */
diff --git a/src/arch/processor.c b/src/arch/processor.c
index 96007fb..777b01e 100644
--- a/src/arch/processor.c
+++ b/src/arch/processor.c
@@ -35,7 +35,6 @@
#include "instruction-int.h"
#include "processor-int.h"
-#include "raw.h"
#include "../common/sort.h"
#include "../core/logs.h"
#include "../glibext/chrysamarshal.h"