rename mapping.c, mapping.h, module.c to have arch prefix. suggested …

…by Alex Ionescu
h0ne · Jan 20, 2014 · f328f30 · f328f30
1 parent 747c4ef
commit f328f30
Show file tree

Hide file tree

Showing 23 changed files with 28 additions and 27 deletions.
diff --git a/Makefile b/Makefile
@@ -53,36 +53,37 @@ ifneq (,$(findstring x86,$(CAPSTONE_ARCHS)))
 	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/mapping.o
-	LIBOBJ += arch/ARM/module.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/mapping.o
-	LIBOBJ += arch/Mips/module.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/mapping.o
-	LIBOBJ += arch/PowerPC/module.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
@@ -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 → arch/AArch64/AArch64Mapping.c b/arch/AArch64/mapping.c → 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 → arch/AArch64/AArch64Mapping.h b/arch/AArch64/mapping.h → arch/AArch64/AArch64Mapping.h
diff --git a/arch/AArch64/module.c → arch/AArch64/AArch64Module.c b/arch/AArch64/module.c → 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
@@ -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 → arch/ARM/ARMMapping.c b/arch/ARM/mapping.c → 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 → arch/ARM/ARMMapping.h b/arch/ARM/mapping.h → arch/ARM/ARMMapping.h
diff --git a/arch/ARM/module.c → arch/ARM/ARMModule.c b/arch/ARM/module.c → 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
@@ -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 → arch/Mips/MipsMapping.c b/arch/Mips/mapping.c → 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 → arch/Mips/MipsMapping.h b/arch/Mips/mapping.h → arch/Mips/MipsMapping.h
diff --git a/arch/Mips/module.c → arch/Mips/MipsModule.c b/arch/Mips/module.c → 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
@@ -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 → arch/PowerPC/PPCMapping.c b/arch/PowerPC/mapping.c → 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 → arch/PowerPC/PPCMapping.h b/arch/PowerPC/mapping.h → arch/PowerPC/PPCMapping.h
diff --git a/arch/PowerPC/module.c → arch/PowerPC/PPCModule.c b/arch/PowerPC/module.c → 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
@@ -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
@@ -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
@@ -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 → arch/X86/X86Mapping.c b/arch/X86/mapping.c → 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 → arch/X86/X86Mapping.h b/arch/X86/mapping.h → arch/X86/X86Mapping.h
diff --git a/arch/X86/module.c → arch/X86/X86Module.c b/arch/X86/module.c → 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() {};