Moved the mangling related code.

33 files changed, 120 insertions, 82 deletions

diff --git a/ChangeLog b/ChangeLog
index c1443d2..893f455 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+18-01-30  Cyrille Bagard <nocbos@gmail.com>
+
+	* configure.ac:
+	* plugins/dex/pool.c:
+	* plugins/elf/symbols.c:
+	* plugins/mobicore/symbols.c:
+	* src/Makefile.am:
+	* src/format/Makefile.am:
+	* src/format/dwarf/symbols.c:
+	* src/format/mangling/dex/Makefile.am:
+	Update code.
+
+	* src/mangling/Makefile.am:
+	* src/mangling/context-int.h:
+	* src/mangling/context.c:
+	* src/mangling/context.h:
+	* src/mangling/demangler.c:
+	* src/mangling/demangler.h:
+	* src/mangling/dex/Makefile.am:
+	* src/mangling/dex/context.c:
+	* src/mangling/dex/context.h:
+	* src/mangling/dex/shorty_gram.y:
+	* src/mangling/dex/shorty_tok.l:
+	* src/mangling/dex/type_gram.y:
+	* src/mangling/dex/type_tok.l:
+	* src/mangling/itanium/Makefile.am:
+	* src/mangling/itanium/abi.c:
+	* src/mangling/itanium/abi.h:
+	* src/mangling/itanium/component-int.h:
+	* src/mangling/itanium/component.c:
+	* src/mangling/itanium/component.h:
+	* src/mangling/itanium/context.c:
+	* src/mangling/itanium/context.h:
+	* src/mangling/java.h:
+	* src/mangling/java_gram.y:
+	* src/mangling/java_tok.l:
+	Moved entries: move the mangling related code.
+
 18-01-29  Cyrille Bagard <nocbos@gmail.com>
 
 	* plugins/elf/elf-int.h:
diff --git a/configure.ac b/configure.ac
index b6d2fdf..96d05ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -382,9 +382,6 @@ AC_CONFIG_FILES([Makefile
                  src/format/dwarf/v3/Makefile
                  src/format/dwarf/v4/Makefile
                  src/format/java/Makefile
-                 src/format/mangling/Makefile
-                 src/format/mangling/dex/Makefile
-                 src/format/mangling/itanium/Makefile
                  src/format/pe/Makefile
                  src/glibext/Makefile
                  src/glibext/generators/Makefile
@@ -396,6 +393,9 @@ AC_CONFIG_FILES([Makefile
                  src/gui/menus/Makefile
                  src/gui/panels/Makefile
                  src/gui/tb/Makefile
+                 src/mangling/Makefile
+                 src/mangling/dex/Makefile
+                 src/mangling/itanium/Makefile
                  src/plugins/Makefile
                  tools/Makefile
                  tools/d2c/Makefile
diff --git a/plugins/dex/pool.c b/plugins/dex/pool.c
index 3c97da3..19e9e36 100644
--- a/plugins/dex/pool.c
+++ b/plugins/dex/pool.c
@@ -30,8 +30,8 @@
 
 #include <i18n.h>
 #include <core/global.h>
-#include <format/mangling/demangler.h>
-#include <format/mangling/dex/context.h>
+#include <mangling/demangler.h>
+#include <mangling/dex/context.h>
 
 
 #include "dex-int.h"
diff --git a/plugins/elf/symbols.c b/plugins/elf/symbols.c
index dbf3305..de4d21a 100644
--- a/plugins/elf/symbols.c
+++ b/plugins/elf/symbols.c
@@ -37,7 +37,7 @@
 #include <core/global.h>
 #include <core/logs.h>
 #include <format/symiter.h>
-#include <format/mangling/demangler.h>
+#include <mangling/demangler.h>
 
 
 #include "dynamic.h"
diff --git a/plugins/mobicore/symbols.c b/plugins/mobicore/symbols.c
index ec2dd34..36128d2 100644
--- a/plugins/mobicore/symbols.c
+++ b/plugins/mobicore/symbols.c
@@ -27,7 +27,7 @@
 #include <malloc.h>
 
 
-#include <format/mangling/demangler.h>
+#include <mangling/demangler.h>
 
 
 #include "mclf-int.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index 4b66cfb..d50aedf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,7 +33,8 @@ libchrysadisass_la_LIBADD =				\
 	analysis/libanalysis.la				\
 	arch/libarch.la						\
 	debug/libdebug.la					\
-	format/libformat.la
+	format/libformat.la					\
+	mangling/libmangling.la
 
 
 #--- libchrysaglibext
@@ -121,6 +122,6 @@ csrvmng_LDFLAGS = $(LIBXML_LIBS) -Lcommon/.libs -lcommon
 
 # glibext doit être traité en premier, à cause des marshals GLib
 
-SUBDIRS = core glibext gtkext analysis arch format common debug gui plugins
+SUBDIRS = core glibext gtkext analysis arch format common debug gui mangling plugins
 
 # TODO: rm -rf panels 
diff --git a/src/format/Makefile.am b/src/format/Makefile.am
index 9b42ab0..0407dd7 100644
--- a/src/format/Makefile.am
+++ b/src/format/Makefile.am
@@ -17,7 +17,6 @@ libformat_la_SOURCES =					\
 libformat_la_LIBADD =					\
 	dwarf/libformatdwarf.la				\
 	java/libformatjava.la				\
-	mangling/libformatmangling.la		\
 	pe/libformatpe.la
 
 libformat_la_LDFLAGS = 
@@ -27,4 +26,4 @@ AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
 
 AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
 
-SUBDIRS = dwarf java mangling pe
+SUBDIRS = dwarf java pe
diff --git a/src/format/dwarf/symbols.c b/src/format/dwarf/symbols.c
index d26cc3e..da30816 100644
--- a/src/format/dwarf/symbols.c
+++ b/src/format/dwarf/symbols.c
@@ -27,8 +27,8 @@
 #include "die.h"
 #include "dwarf-int.h"
 #include "form.h"
-#include "../mangling/demangler.h"
 #include "../../core/params.h"
+#include "../../mangling/demangler.h"
 
 
 
diff --git a/src/format/mangling/dex/Makefile.am b/src/format/mangling/dex/Makefile.am
deleted file mode 100644
index bdcbf8c..0000000
--- a/src/format/mangling/dex/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-
-BUILT_SOURCES = libformatmanglingdexshorty_la-shorty_gram.h libformatmanglingdextype_la-type_gram.h
-
-AM_YFLAGS = -d
-
-noinst_LTLIBRARIES = libformatmanglingdex.la libformatmanglingdexshorty.la libformatmanglingdextype.la
-
-libformatmanglingdex_la_SOURCES =		\
-	context.h context.c
-
-libformatmanglingdex_la_LDFLAGS = 
-
-libformatmanglingdex_la_LIBADD =		\
-	libformatmanglingdexshorty.la		\
-	libformatmanglingdextype.la
-
-
-libformatmanglingdexshorty_la_SOURCES =	\
-	shorty_gram.y						\
-	shorty_tok.l
-
-libformatmanglingdexshorty_la_YFLAGS = -d -p shorty_ -o y.tab.c
-
-libformatmanglingdexshorty_la_LFLAGS = -P shorty_ -o lex.yy.c
-
-
-libformatmanglingdextype_la_SOURCES =	\
-	type_gram.y						\
-	type_tok.l
-
-libformatmanglingdextype_la_YFLAGS = -d -p type_ -o y.tab.c
-
-libformatmanglingdextype_la_LFLAGS = -P type_ -o lex.yy.c
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-
-# Automake fait les choses à moitié
-CLEANFILES = \
-	libformatmanglingdexshorty_la-shorty_gram.h libformatmanglingdexshorty_la-shorty_gram.c \
-	libformatmanglingdexshorty_la-shorty_tok.c \
-	libformatmanglingdextype_la-type_gram.h libformatmanglingdextype_la-type_gram.c \
-	libformatmanglingdextype_la-type_tok.c
diff --git a/src/format/mangling/Makefile.am b/src/mangling/Makefile.am
index e92deb2..63b25c7 100644
--- a/src/format/mangling/Makefile.am
+++ b/src/mangling/Makefile.am
@@ -3,19 +3,19 @@ BUILT_SOURCES = libjavamangling_la-java_gram.h
 
 AM_YFLAGS = -d
 
-noinst_LTLIBRARIES = libjavamangling.la libformatmangling.la
+noinst_LTLIBRARIES = libjavamangling.la libmangling.la
 
-libformatmangling_la_SOURCES =			\
+libmangling_la_SOURCES =				\
 	context-int.h						\
 	context.h context.c					\
 	demangler.h demangler.c
 
-libformatmangling_la_LDFLAGS = 
+libmangling_la_LDFLAGS = 
 
-libformatmangling_la_LIBADD =			\
+libmangling_la_LIBADD =					\
 	libjavamangling.la					\
-	dex/libformatmanglingdex.la			\
-	itanium/libformatmanglingitanium.la
+	dex/libmanglingdex.la				\
+	itanium/libmanglingitanium.la
 
 
 # Partie Java
diff --git a/src/format/mangling/context-int.h b/src/mangling/context-int.h
index d361ff7..d361ff7 100644
--- a/src/format/mangling/context-int.h
+++ b/src/mangling/context-int.h
diff --git a/src/format/mangling/context.c b/src/mangling/context.c
index 7a798ac..7a798ac 100644
--- a/src/format/mangling/context.c
+++ b/src/mangling/context.c
diff --git a/src/format/mangling/context.h b/src/mangling/context.h
index a9528e8..705ef83 100644
--- a/src/format/mangling/context.h
+++ b/src/mangling/context.h
@@ -28,7 +28,7 @@
 #include <glib-object.h>
 
 
-#include "../../analysis/routine.h"
+#include "../analysis/routine.h"
 
 
 
diff --git a/src/format/mangling/demangler.c b/src/mangling/demangler.c
index f673a01..f673a01 100644
--- a/src/format/mangling/demangler.c
+++ b/src/mangling/demangler.c
diff --git a/src/format/mangling/demangler.h b/src/mangling/demangler.h
index 3215095..00218e4 100644
--- a/src/format/mangling/demangler.h
+++ b/src/mangling/demangler.h
@@ -25,7 +25,7 @@
 #define _FORMAT_MANGLING_DEMANGLER_H
 
 
-#include "../../analysis/routine.h"
+#include "../analysis/routine.h"
 
 
 
diff --git a/src/mangling/dex/Makefile.am b/src/mangling/dex/Makefile.am
new file mode 100644
index 0000000..547d686
--- /dev/null
+++ b/src/mangling/dex/Makefile.am
@@ -0,0 +1,46 @@
+
+BUILT_SOURCES = libmanglingdexshorty_la-shorty_gram.h libmanglingdextype_la-type_gram.h
+
+AM_YFLAGS = -d
+
+noinst_LTLIBRARIES = libmanglingdex.la libmanglingdexshorty.la libmanglingdextype.la
+
+libmanglingdex_la_SOURCES =				\
+	context.h context.c
+
+libmanglingdex_la_LDFLAGS = 
+
+libmanglingdex_la_LIBADD =				\
+	libmanglingdexshorty.la				\
+	libmanglingdextype.la
+
+
+libmanglingdexshorty_la_SOURCES =		\
+	shorty_gram.y						\
+	shorty_tok.l
+
+libmanglingdexshorty_la_YFLAGS = -d -p shorty_ -o y.tab.c
+
+libmanglingdexshorty_la_LFLAGS = -P shorty_ -o lex.yy.c
+
+
+libmanglingdextype_la_SOURCES =			\
+	type_gram.y							\
+	type_tok.l
+
+libmanglingdextype_la_YFLAGS = -d -p type_ -o y.tab.c
+
+libmanglingdextype_la_LFLAGS = -P type_ -o lex.yy.c
+
+
+AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
+
+AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
+
+
+# Automake fait les choses à moitié
+CLEANFILES = \
+	libmanglingdexshorty_la-shorty_gram.h libmanglingdexshorty_la-shorty_gram.c \
+	libmanglingdexshorty_la-shorty_tok.c \
+	libmanglingdextype_la-type_gram.h libmanglingdextype_la-type_gram.c \
+	libmanglingdextype_la-type_tok.c
diff --git a/src/format/mangling/dex/context.c b/src/mangling/dex/context.c
index 9dd9b9c..9dd9b9c 100644
--- a/src/format/mangling/dex/context.c
+++ b/src/mangling/dex/context.c
diff --git a/src/format/mangling/dex/context.h b/src/mangling/dex/context.h
index 1af7a9d..1af7a9d 100644
--- a/src/format/mangling/dex/context.h
+++ b/src/mangling/dex/context.h
diff --git a/src/format/mangling/dex/shorty_gram.y b/src/mangling/dex/shorty_gram.y
index 55d849d..b688896 100644
--- a/src/format/mangling/dex/shorty_gram.y
+++ b/src/mangling/dex/shorty_gram.y
@@ -21,8 +21,8 @@ bool demangle_dex_routine(GDexDemangler *, const char *);
 
 %code requires {
 
-#include "../../../analysis/types/basic.h"
-#include "../../../analysis/types/cse.h"
+#include "../../analysis/types/basic.h"
+#include "../../analysis/types/cse.h"
 
 }
 
diff --git a/src/format/mangling/dex/shorty_tok.l b/src/mangling/dex/shorty_tok.l
index 92c264a..92c264a 100644
--- a/src/format/mangling/dex/shorty_tok.l
+++ b/src/mangling/dex/shorty_tok.l
diff --git a/src/format/mangling/dex/type_gram.y b/src/mangling/dex/type_gram.y
index 506eb9b..79c9320 100644
--- a/src/format/mangling/dex/type_gram.y
+++ b/src/mangling/dex/type_gram.y
@@ -21,9 +21,9 @@ bool demangle_dex_type(GDexDemangler *, const char *);
 
 %code requires {
 
-#include "../../../analysis/types/basic.h"
-#include "../../../analysis/types/cse.h"
-#include "../../../common/extstr.h"
+#include "../../analysis/types/basic.h"
+#include "../../analysis/types/cse.h"
+#include "../../common/extstr.h"
 
 }
 
diff --git a/src/format/mangling/dex/type_tok.l b/src/mangling/dex/type_tok.l
index 918846a..918846a 100644
--- a/src/format/mangling/dex/type_tok.l
+++ b/src/mangling/dex/type_tok.l
diff --git a/src/format/mangling/itanium/Makefile.am b/src/mangling/itanium/Makefile.am
index 21a62c0..216788b 100755
--- a/src/format/mangling/itanium/Makefile.am
+++ b/src/mangling/itanium/Makefile.am
@@ -1,15 +1,15 @@
 
-noinst_LTLIBRARIES  = libformatmanglingitanium.la
+noinst_LTLIBRARIES  = libmanglingitanium.la
 
-libformatmanglingitanium_la_SOURCES =	\
+libmanglingitanium_la_SOURCES =			\
 	abi.h abi.c							\
 	component-int.h						\
 	component.h component.c				\
 	context.h context.c
 
-libformatmanglingitanium_la_LIBADD = 
+libmanglingitanium_la_LIBADD = 
 
-libformatmanglingitanium_la_LDFLAGS = 
+libmanglingitanium_la_LDFLAGS = 
 
 
 AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
diff --git a/src/format/mangling/itanium/abi.c b/src/mangling/itanium/abi.c
index 5645a05..3970482 100644
--- a/src/format/mangling/itanium/abi.c
+++ b/src/mangling/itanium/abi.c
@@ -29,8 +29,8 @@
 
 
 
-#include "../../../analysis/types/basic.h"
-#include "../../../common/cpp.h"
+#include "../../analysis/types/basic.h"
+#include "../../common/cpp.h"
 
 
 
diff --git a/src/format/mangling/itanium/abi.h b/src/mangling/itanium/abi.h
index 1ed21f3..1ed21f3 100644
--- a/src/format/mangling/itanium/abi.h
+++ b/src/mangling/itanium/abi.h
diff --git a/src/format/mangling/itanium/component-int.h b/src/mangling/itanium/component-int.h
index 3d4c1d0..3d4c1d0 100644
--- a/src/format/mangling/itanium/component-int.h
+++ b/src/mangling/itanium/component-int.h
diff --git a/src/format/mangling/itanium/component.c b/src/mangling/itanium/component.c
index c2edc17..e3f3f23 100644
--- a/src/format/mangling/itanium/component.c
+++ b/src/mangling/itanium/component.c
@@ -29,8 +29,8 @@
 
 
 #include "component-int.h"
-#include "../../../common/extstr.h"
-#include "../../../common/fnv1a.h"
+#include "../../common/extstr.h"
+#include "../../common/fnv1a.h"
 
 
 
diff --git a/src/format/mangling/itanium/component.h b/src/mangling/itanium/component.h
index 6aa4e57..7ab2521 100644
--- a/src/format/mangling/itanium/component.h
+++ b/src/mangling/itanium/component.h
@@ -33,8 +33,8 @@
 
 
 #include "context.h"
-#include "../../../analysis/type.h"
-#include "../../../common/fnv1a.h"
+#include "../../analysis/type.h"
+#include "../../common/fnv1a.h"
 
 
 
diff --git a/src/format/mangling/itanium/context.c b/src/mangling/itanium/context.c
index d0a0664..d0a0664 100644
--- a/src/format/mangling/itanium/context.c
+++ b/src/mangling/itanium/context.c
diff --git a/src/format/mangling/itanium/context.h b/src/mangling/itanium/context.h
index 13ec1f4..13ec1f4 100644
--- a/src/format/mangling/itanium/context.h
+++ b/src/mangling/itanium/context.h
diff --git a/src/format/mangling/java.h b/src/mangling/java.h
index ee7f21d..ee7f21d 100644
--- a/src/format/mangling/java.h
+++ b/src/mangling/java.h
diff --git a/src/format/mangling/java_gram.y b/src/mangling/java_gram.y
index fa6895c..cb60d82 100644
--- a/src/format/mangling/java_gram.y
+++ b/src/mangling/java_gram.y
@@ -5,7 +5,7 @@
 
 #include "context-int.h"
 #include "java.h"
-#include "../../analysis/types/cse.h"
+#include "../analysis/types/cse.h"
 
 
 
diff --git a/src/format/mangling/java_tok.l b/src/mangling/java_tok.l
index 4adf623..4adf623 100644
--- a/src/format/mangling/java_tok.l
+++ b/src/mangling/java_tok.l