rename mapping.c, mapping.h, module.c to have arch prefix. suggested by Alex Ionescu
diff --git a/Makefile b/Makefile
index e015e4a..923c247 100644
--- a/Makefile
+++ b/Makefile
@@ -47,42 +47,43 @@
LIBOBJ =
LIBOBJ += cs.o utils.o SStream.o MCInstrDesc.o MCRegisterInfo.o
-ifneq (,$(findstring arm,$(CAPSTONE_ARCHS)))
- CFLAGS += -DCAPSTONE_HAS_ARM
- LIBOBJ += arch/ARM/ARMDisassembler.o
- LIBOBJ += arch/ARM/ARMInstPrinter.o
- LIBOBJ += arch/ARM/mapping.o
- LIBOBJ += arch/ARM/module.o
-endif
-ifneq (,$(findstring mips,$(CAPSTONE_ARCHS)))
- CFLAGS += -DCAPSTONE_HAS_MIPS
- LIBOBJ += arch/Mips/MipsDisassembler.o
- LIBOBJ += arch/Mips/MipsInstPrinter.o
- LIBOBJ += arch/Mips/mapping.o
- LIBOBJ += arch/Mips/module.o
-endif
-ifneq (,$(findstring powerpc,$(CAPSTONE_ARCHS)))
- CFLAGS += -DCAPSTONE_HAS_POWERPC
- LIBOBJ += arch/PowerPC/PPCDisassembler.o
- LIBOBJ += arch/PowerPC/PPCInstPrinter.o
- LIBOBJ += arch/PowerPC/mapping.o
- LIBOBJ += arch/PowerPC/module.o
-endif
ifneq (,$(findstring x86,$(CAPSTONE_ARCHS)))
CFLAGS += -DCAPSTONE_HAS_X86
LIBOBJ += arch/X86/X86DisassemblerDecoder.o
LIBOBJ += arch/X86/X86Disassembler.o
LIBOBJ += arch/X86/X86IntelInstPrinter.o
LIBOBJ += arch/X86/X86ATTInstPrinter.o
- LIBOBJ += arch/X86/mapping.o arch/X86/module.o
+ LIBOBJ += arch/X86/X86Mapping.o
+ LIBOBJ += arch/X86/X86Module.o
+endif
+ifneq (,$(findstring arm,$(CAPSTONE_ARCHS)))
+ CFLAGS += -DCAPSTONE_HAS_ARM
+ LIBOBJ += arch/ARM/ARMDisassembler.o
+ LIBOBJ += arch/ARM/ARMInstPrinter.o
+ LIBOBJ += arch/ARM/ARMMapping.o
+ LIBOBJ += arch/ARM/ARMModule.o
+endif
+ifneq (,$(findstring mips,$(CAPSTONE_ARCHS)))
+ CFLAGS += -DCAPSTONE_HAS_MIPS
+ LIBOBJ += arch/Mips/MipsDisassembler.o
+ LIBOBJ += arch/Mips/MipsInstPrinter.o
+ LIBOBJ += arch/Mips/MipsMapping.o
+ LIBOBJ += arch/Mips/MipsModule.o
+endif
+ifneq (,$(findstring powerpc,$(CAPSTONE_ARCHS)))
+ CFLAGS += -DCAPSTONE_HAS_POWERPC
+ LIBOBJ += arch/PowerPC/PPCDisassembler.o
+ LIBOBJ += arch/PowerPC/PPCInstPrinter.o
+ LIBOBJ += arch/PowerPC/PPCMapping.o
+ LIBOBJ += arch/PowerPC/PPCModule.o
endif
ifneq (,$(findstring aarch64,$(CAPSTONE_ARCHS)))
CFLAGS += -DCAPSTONE_HAS_ARM64
LIBOBJ += arch/AArch64/AArch64BaseInfo.o
LIBOBJ += arch/AArch64/AArch64Disassembler.o
LIBOBJ += arch/AArch64/AArch64InstPrinter.o
- LIBOBJ += arch/AArch64/mapping.o
- LIBOBJ += arch/AArch64/module.o
+ LIBOBJ += arch/AArch64/AArch64Mapping.o
+ LIBOBJ += arch/AArch64/AArch64Module.o
endif
LIBOBJ += MCInst.o
diff --git a/arch/AArch64/AArch64InstPrinter.c b/arch/AArch64/AArch64InstPrinter.c
index 6a2a3ed..21dc187 100644
--- a/arch/AArch64/AArch64InstPrinter.c
+++ b/arch/AArch64/AArch64InstPrinter.c
@@ -26,7 +26,7 @@
#include "../../MCRegisterInfo.h"
#include "../../MathExtras.h"
-#include "mapping.h"
+#include "AArch64Mapping.h"
static char *getRegisterName(unsigned RegNo);
static void printOperand(MCInst *MI, unsigned OpNo, SStream *O);
diff --git a/arch/AArch64/mapping.c b/arch/AArch64/AArch64Mapping.c
similarity index 99%
rename from arch/AArch64/mapping.c
rename to arch/AArch64/AArch64Mapping.c
index 0250705..ff608a5 100644
--- a/arch/AArch64/mapping.c
+++ b/arch/AArch64/AArch64Mapping.c
@@ -7,7 +7,7 @@
#include "../../include/arm64.h"
#include "../../utils.h"
-#include "mapping.h"
+#include "AArch64Mapping.h"
#define GET_INSTRINFO_ENUM
#include "AArch64GenInstrInfo.inc"
diff --git a/arch/AArch64/mapping.h b/arch/AArch64/AArch64Mapping.h
similarity index 100%
rename from arch/AArch64/mapping.h
rename to arch/AArch64/AArch64Mapping.h
diff --git a/arch/AArch64/module.c b/arch/AArch64/AArch64Module.c
similarity index 96%
rename from arch/AArch64/module.c
rename to arch/AArch64/AArch64Module.c
index e0b8413..785724a 100644
--- a/arch/AArch64/module.c
+++ b/arch/AArch64/AArch64Module.c
@@ -5,7 +5,7 @@
#include "../../MCRegisterInfo.h"
#include "AArch64Disassembler.h"
#include "AArch64InstPrinter.h"
-#include "mapping.h"
+#include "AArch64Mapping.h"
void enable_arm64() {}
diff --git a/arch/ARM/ARMInstPrinter.c b/arch/ARM/ARMInstPrinter.c
index 7851cfe..bef0e14 100644
--- a/arch/ARM/ARMInstPrinter.c
+++ b/arch/ARM/ARMInstPrinter.c
@@ -28,7 +28,7 @@
#include "../../SStream.h"
#include "../../MCRegisterInfo.h"
#include "../../utils.h"
-#include "mapping.h"
+#include "ARMMapping.h"
#define GET_SUBTARGETINFO_ENUM
#include "ARMGenSubtargetInfo.inc"
diff --git a/arch/ARM/mapping.c b/arch/ARM/ARMMapping.c
similarity index 99%
rename from arch/ARM/mapping.c
rename to arch/ARM/ARMMapping.c
index 49bcf0b..61d0420 100644
--- a/arch/ARM/mapping.c
+++ b/arch/ARM/ARMMapping.c
@@ -7,7 +7,7 @@
#include "../../include/arm.h"
#include "../../cs_priv.h"
-#include "mapping.h"
+#include "ARMMapping.h"
#define GET_INSTRINFO_ENUM
#include "ARMGenInstrInfo.inc"
diff --git a/arch/ARM/mapping.h b/arch/ARM/ARMMapping.h
similarity index 100%
rename from arch/ARM/mapping.h
rename to arch/ARM/ARMMapping.h
diff --git a/arch/ARM/module.c b/arch/ARM/ARMModule.c
similarity index 97%
rename from arch/ARM/module.c
rename to arch/ARM/ARMModule.c
index f4307db..7837204 100644
--- a/arch/ARM/module.c
+++ b/arch/ARM/ARMModule.c
@@ -5,7 +5,7 @@
#include "../../MCRegisterInfo.h"
#include "ARMDisassembler.h"
#include "ARMInstPrinter.h"
-#include "mapping.h"
+#include "ARMMapping.h"
static cs_err init(cs_struct *ud)
{
diff --git a/arch/Mips/MipsInstPrinter.c b/arch/Mips/MipsInstPrinter.c
index 288727e..a991bc1 100644
--- a/arch/Mips/MipsInstPrinter.c
+++ b/arch/Mips/MipsInstPrinter.c
@@ -24,7 +24,7 @@
#include "../../utils.h"
#include "../../SStream.h"
#include "../../MCRegisterInfo.h"
-#include "mapping.h"
+#include "MipsMapping.h"
#include "MipsInstPrinter.h"
diff --git a/arch/Mips/mapping.c b/arch/Mips/MipsMapping.c
similarity index 99%
rename from arch/Mips/mapping.c
rename to arch/Mips/MipsMapping.c
index 4d9ce7a..ebbf139 100644
--- a/arch/Mips/mapping.c
+++ b/arch/Mips/MipsMapping.c
@@ -7,7 +7,7 @@
#include "../../include/mips.h"
#include "../../utils.h"
-#include "mapping.h"
+#include "MipsMapping.h"
#define GET_INSTRINFO_ENUM
#include "MipsGenInstrInfo.inc"
diff --git a/arch/Mips/mapping.h b/arch/Mips/MipsMapping.h
similarity index 100%
rename from arch/Mips/mapping.h
rename to arch/Mips/MipsMapping.h
diff --git a/arch/Mips/module.c b/arch/Mips/MipsModule.c
similarity index 97%
rename from arch/Mips/module.c
rename to arch/Mips/MipsModule.c
index 1b16108..8aa4002 100644
--- a/arch/Mips/module.c
+++ b/arch/Mips/MipsModule.c
@@ -5,7 +5,7 @@
#include "../../MCRegisterInfo.h"
#include "MipsDisassembler.h"
#include "MipsInstPrinter.h"
-#include "mapping.h"
+#include "MipsMapping.h"
void enable_mips() {};
diff --git a/arch/PowerPC/PPCInstPrinter.c b/arch/PowerPC/PPCInstPrinter.c
index db5982b..ea6bdc2 100644
--- a/arch/PowerPC/PPCInstPrinter.c
+++ b/arch/PowerPC/PPCInstPrinter.c
@@ -25,9 +25,9 @@
#include "../../SStream.h"
#include "../../MCRegisterInfo.h"
#include "../../MathExtras.h"
-#include "mapping.h"
+#include "PPCMapping.h"
-//#include "mapping.h"
+//#include "PPCMapping.h"
static const char *getRegisterName(unsigned RegNo);
static void printOperand(MCInst *MI, unsigned OpNo, SStream *O);
diff --git a/arch/PowerPC/mapping.c b/arch/PowerPC/PPCMapping.c
similarity index 99%
rename from arch/PowerPC/mapping.c
rename to arch/PowerPC/PPCMapping.c
index f35166c..378e1bc 100644
--- a/arch/PowerPC/mapping.c
+++ b/arch/PowerPC/PPCMapping.c
@@ -7,7 +7,7 @@
#include "../../include/ppc.h"
#include "../../utils.h"
-#include "mapping.h"
+#include "PPCMapping.h"
#define GET_INSTRINFO_ENUM
#include "PPCGenInstrInfo.inc"
diff --git a/arch/PowerPC/mapping.h b/arch/PowerPC/PPCMapping.h
similarity index 100%
rename from arch/PowerPC/mapping.h
rename to arch/PowerPC/PPCMapping.h
diff --git a/arch/PowerPC/module.c b/arch/PowerPC/PPCModule.c
similarity index 97%
rename from arch/PowerPC/module.c
rename to arch/PowerPC/PPCModule.c
index 2af9d0d..1b0f850 100644
--- a/arch/PowerPC/module.c
+++ b/arch/PowerPC/PPCModule.c
@@ -5,7 +5,7 @@
#include "../../MCRegisterInfo.h"
#include "PPCDisassembler.h"
#include "PPCInstPrinter.h"
-#include "mapping.h"
+#include "PPCMapping.h"
void enable_powerpc() {};
diff --git a/arch/X86/X86ATTInstPrinter.c b/arch/X86/X86ATTInstPrinter.c
index 77519e1..c88ff2f 100644
--- a/arch/X86/X86ATTInstPrinter.c
+++ b/arch/X86/X86ATTInstPrinter.c
@@ -25,7 +25,7 @@
#include "../../MCInst.h"
#include "../../SStream.h"
#include "../../MCRegisterInfo.h"
-#include "mapping.h"
+#include "X86Mapping.h"
#define markup(x) ""
diff --git a/arch/X86/X86Disassembler.c b/arch/X86/X86Disassembler.c
index 679a014..c9d22ca 100644
--- a/arch/X86/X86Disassembler.c
+++ b/arch/X86/X86Disassembler.c
@@ -26,7 +26,7 @@
#include "X86DisassemblerDecoderCommon.h"
#include "X86DisassemblerDecoder.h"
#include "../../MCInst.h"
-#include "mapping.h"
+#include "X86Mapping.h"
#define GET_REGINFO_ENUM
#include "X86GenRegisterInfo.inc"
diff --git a/arch/X86/X86IntelInstPrinter.c b/arch/X86/X86IntelInstPrinter.c
index 853a7ce..c9f2432 100644
--- a/arch/X86/X86IntelInstPrinter.c
+++ b/arch/X86/X86IntelInstPrinter.c
@@ -26,7 +26,7 @@
#include "../../SStream.h"
#include "../../MCRegisterInfo.h"
-#include "mapping.h"
+#include "X86Mapping.h"
static void printMemReference(MCInst *MI, unsigned Op, SStream *O);
diff --git a/arch/X86/mapping.c b/arch/X86/X86Mapping.c
similarity index 99%
rename from arch/X86/mapping.c
rename to arch/X86/X86Mapping.c
index 81b06c4..272e975 100644
--- a/arch/X86/mapping.c
+++ b/arch/X86/X86Mapping.c
@@ -3,7 +3,7 @@
#include <string.h>
-#include "mapping.h"
+#include "X86Mapping.h"
#include "X86DisassemblerDecoder.h"
#include "../../utils.h"
diff --git a/arch/X86/mapping.h b/arch/X86/X86Mapping.h
similarity index 100%
rename from arch/X86/mapping.h
rename to arch/X86/X86Mapping.h
diff --git a/arch/X86/module.c b/arch/X86/X86Module.c
similarity index 97%
rename from arch/X86/module.c
rename to arch/X86/X86Module.c
index 05c0746..411a722 100644
--- a/arch/X86/module.c
+++ b/arch/X86/X86Module.c
@@ -5,7 +5,7 @@
#include "../../MCRegisterInfo.h"
#include "X86Disassembler.h"
#include "X86InstPrinter.h"
-#include "mapping.h"
+#include "X86Mapping.h"
void enable_x86() {};