302 files changed, 739 insertions, 313 deletions

diff --git a/.gitignore b/.gitignore
index 1290c57..c609e23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,7 +59,7 @@ __pycache__
 .gen/
 fmk.done
 src/arch/arm/v7/opcodes/
-src/arch/dalvik/opcodes/
+plugins/dalvik/opcodes/
 
 # GLib
 src/glibext/chrysamarshal.*
diff --git a/ChangeLog b/ChangeLog
index d868934..c0e495a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,312 @@
+17-10-18  Cyrille Bagard <nocbos@gmail.com>
+
+	* .gitignore:
+	* autogen.sh:
+	* configure.ac:
+	* plugins/Makefile.am:
+	Update files and code.
+
+	* plugins/dalvik/Makefile.am:
+	* plugins/dalvik/context.c:
+	* plugins/dalvik/context.h:
+	* plugins/dalvik/core.c:
+	* plugins/dalvik/core.h:
+	* plugins/dalvik/fetch.c:
+	* plugins/dalvik/fetch.h:
+	* plugins/dalvik/helpers.h:
+	* plugins/dalvik/instruction-def.h:
+	* plugins/dalvik/instruction-int.h:
+	* plugins/dalvik/instruction.c:
+	* plugins/dalvik/instruction.h:
+	* plugins/dalvik/link.c:
+	* plugins/dalvik/link.h:
+	* plugins/dalvik/opcodes/Makefile.am:
+	* plugins/dalvik/opdefs/Makefile.am:
+	* plugins/dalvik/opdefs/add_90.d:
+	* plugins/dalvik/opdefs/add_9b.d:
+	* plugins/dalvik/opdefs/add_a6.d:
+	* plugins/dalvik/opdefs/add_ab.d:
+	* plugins/dalvik/opdefs/add_b0.d:
+	* plugins/dalvik/opdefs/add_bb.d:
+	* plugins/dalvik/opdefs/add_c6.d:
+	* plugins/dalvik/opdefs/add_cb.d:
+	* plugins/dalvik/opdefs/add_d0.d:
+	* plugins/dalvik/opdefs/add_d8.d:
+	* plugins/dalvik/opdefs/aget_44.d:
+	* plugins/dalvik/opdefs/aget_45.d:
+	* plugins/dalvik/opdefs/aget_46.d:
+	* plugins/dalvik/opdefs/aget_47.d:
+	* plugins/dalvik/opdefs/aget_48.d:
+	* plugins/dalvik/opdefs/aget_49.d:
+	* plugins/dalvik/opdefs/aget_4a.d:
+	* plugins/dalvik/opdefs/and_95.d:
+	* plugins/dalvik/opdefs/and_a0.d:
+	* plugins/dalvik/opdefs/and_b5.d:
+	* plugins/dalvik/opdefs/and_c0.d:
+	* plugins/dalvik/opdefs/and_d5.d:
+	* plugins/dalvik/opdefs/and_dd.d:
+	* plugins/dalvik/opdefs/aput_4b.d:
+	* plugins/dalvik/opdefs/aput_4c.d:
+	* plugins/dalvik/opdefs/aput_4d.d:
+	* plugins/dalvik/opdefs/aput_4e.d:
+	* plugins/dalvik/opdefs/aput_4f.d:
+	* plugins/dalvik/opdefs/aput_50.d:
+	* plugins/dalvik/opdefs/aput_51.d:
+	* plugins/dalvik/opdefs/array_21.d:
+	* plugins/dalvik/opdefs/array_24.d:
+	* plugins/dalvik/opdefs/array_26.d:
+	* plugins/dalvik/opdefs/check_1f.d:
+	* plugins/dalvik/opdefs/cmp_31.d:
+	* plugins/dalvik/opdefs/cmpg_2e.d:
+	* plugins/dalvik/opdefs/cmpg_30.d:
+	* plugins/dalvik/opdefs/cmpl_2d.d:
+	* plugins/dalvik/opdefs/cmpl_2f.d:
+	* plugins/dalvik/opdefs/const_12.d:
+	* plugins/dalvik/opdefs/const_13.d:
+	* plugins/dalvik/opdefs/const_14.d:
+	* plugins/dalvik/opdefs/const_15.d:
+	* plugins/dalvik/opdefs/const_16.d:
+	* plugins/dalvik/opdefs/const_17.d:
+	* plugins/dalvik/opdefs/const_18.d:
+	* plugins/dalvik/opdefs/const_19.d:
+	* plugins/dalvik/opdefs/const_1a.d:
+	* plugins/dalvik/opdefs/const_1b.d:
+	* plugins/dalvik/opdefs/const_1c.d:
+	* plugins/dalvik/opdefs/div_93.d:
+	* plugins/dalvik/opdefs/div_9e.d:
+	* plugins/dalvik/opdefs/div_a9.d:
+	* plugins/dalvik/opdefs/div_ae.d:
+	* plugins/dalvik/opdefs/div_b3.d:
+	* plugins/dalvik/opdefs/div_be.d:
+	* plugins/dalvik/opdefs/div_c9.d:
+	* plugins/dalvik/opdefs/div_ce.d:
+	* plugins/dalvik/opdefs/div_d3.d:
+	* plugins/dalvik/opdefs/div_db.d:
+	* plugins/dalvik/opdefs/filled_25.d:
+	* plugins/dalvik/opdefs/goto_28.d:
+	* plugins/dalvik/opdefs/goto_29.d:
+	* plugins/dalvik/opdefs/goto_2a.d:
+	* plugins/dalvik/opdefs/if_32.d:
+	* plugins/dalvik/opdefs/if_33.d:
+	* plugins/dalvik/opdefs/if_34.d:
+	* plugins/dalvik/opdefs/if_35.d:
+	* plugins/dalvik/opdefs/if_36.d:
+	* plugins/dalvik/opdefs/if_37.d:
+	* plugins/dalvik/opdefs/if_38.d:
+	* plugins/dalvik/opdefs/if_39.d:
+	* plugins/dalvik/opdefs/if_3a.d:
+	* plugins/dalvik/opdefs/if_3b.d:
+	* plugins/dalvik/opdefs/if_3c.d:
+	* plugins/dalvik/opdefs/if_3d.d:
+	* plugins/dalvik/opdefs/iget_52.d:
+	* plugins/dalvik/opdefs/iget_53.d:
+	* plugins/dalvik/opdefs/iget_54.d:
+	* plugins/dalvik/opdefs/iget_55.d:
+	* plugins/dalvik/opdefs/iget_56.d:
+	* plugins/dalvik/opdefs/iget_57.d:
+	* plugins/dalvik/opdefs/iget_58.d:
+	* plugins/dalvik/opdefs/instanceof_20.d:
+	* plugins/dalvik/opdefs/invoke_6e.d:
+	* plugins/dalvik/opdefs/invoke_6f.d:
+	* plugins/dalvik/opdefs/invoke_70.d:
+	* plugins/dalvik/opdefs/invoke_71.d:
+	* plugins/dalvik/opdefs/invoke_72.d:
+	* plugins/dalvik/opdefs/invoke_74.d:
+	* plugins/dalvik/opdefs/invoke_75.d:
+	* plugins/dalvik/opdefs/invoke_76.d:
+	* plugins/dalvik/opdefs/invoke_77.d:
+	* plugins/dalvik/opdefs/invoke_78.d:
+	* plugins/dalvik/opdefs/iput_59.d:
+	* plugins/dalvik/opdefs/iput_5a.d:
+	* plugins/dalvik/opdefs/iput_5b.d:
+	* plugins/dalvik/opdefs/iput_5c.d:
+	* plugins/dalvik/opdefs/iput_5d.d:
+	* plugins/dalvik/opdefs/iput_5e.d:
+	* plugins/dalvik/opdefs/iput_5f.d:
+	* plugins/dalvik/opdefs/monitor_1d.d:
+	* plugins/dalvik/opdefs/monitor_1e.d:
+	* plugins/dalvik/opdefs/move_01.d:
+	* plugins/dalvik/opdefs/move_02.d:
+	* plugins/dalvik/opdefs/move_03.d:
+	* plugins/dalvik/opdefs/move_04.d:
+	* plugins/dalvik/opdefs/move_05.d:
+	* plugins/dalvik/opdefs/move_06.d:
+	* plugins/dalvik/opdefs/move_07.d:
+	* plugins/dalvik/opdefs/move_08.d:
+	* plugins/dalvik/opdefs/move_09.d:
+	* plugins/dalvik/opdefs/move_0a.d:
+	* plugins/dalvik/opdefs/move_0b.d:
+	* plugins/dalvik/opdefs/move_0c.d:
+	* plugins/dalvik/opdefs/move_0d.d:
+	* plugins/dalvik/opdefs/mul_92.d:
+	* plugins/dalvik/opdefs/mul_9d.d:
+	* plugins/dalvik/opdefs/mul_a8.d:
+	* plugins/dalvik/opdefs/mul_ad.d:
+	* plugins/dalvik/opdefs/mul_b2.d:
+	* plugins/dalvik/opdefs/mul_bd.d:
+	* plugins/dalvik/opdefs/mul_c8.d:
+	* plugins/dalvik/opdefs/mul_cd.d:
+	* plugins/dalvik/opdefs/mul_d2.d:
+	* plugins/dalvik/opdefs/mul_da.d:
+	* plugins/dalvik/opdefs/neg_7b.d:
+	* plugins/dalvik/opdefs/neg_7d.d:
+	* plugins/dalvik/opdefs/neg_7f.d:
+	* plugins/dalvik/opdefs/neg_80.d:
+	* plugins/dalvik/opdefs/new_22.d:
+	* plugins/dalvik/opdefs/new_23.d:
+	* plugins/dalvik/opdefs/nop_00.d:
+	* plugins/dalvik/opdefs/not_7c.d:
+	* plugins/dalvik/opdefs/not_7e.d:
+	* plugins/dalvik/opdefs/or_96.d:
+	* plugins/dalvik/opdefs/or_a1.d:
+	* plugins/dalvik/opdefs/or_b6.d:
+	* plugins/dalvik/opdefs/or_c1.d:
+	* plugins/dalvik/opdefs/or_d6.d:
+	* plugins/dalvik/opdefs/or_de.d:
+	* plugins/dalvik/opdefs/rem_94.d:
+	* plugins/dalvik/opdefs/rem_9f.d:
+	* plugins/dalvik/opdefs/rem_aa.d:
+	* plugins/dalvik/opdefs/rem_af.d:
+	* plugins/dalvik/opdefs/rem_b4.d:
+	* plugins/dalvik/opdefs/rem_bf.d:
+	* plugins/dalvik/opdefs/rem_ca.d:
+	* plugins/dalvik/opdefs/rem_cf.d:
+	* plugins/dalvik/opdefs/rem_d4.d:
+	* plugins/dalvik/opdefs/rem_dc.d:
+	* plugins/dalvik/opdefs/return_0e.d:
+	* plugins/dalvik/opdefs/return_0f.d:
+	* plugins/dalvik/opdefs/return_10.d:
+	* plugins/dalvik/opdefs/return_11.d:
+	* plugins/dalvik/opdefs/rsub_d1.d:
+	* plugins/dalvik/opdefs/rsub_d9.d:
+	* plugins/dalvik/opdefs/sget_60.d:
+	* plugins/dalvik/opdefs/sget_61.d:
+	* plugins/dalvik/opdefs/sget_62.d:
+	* plugins/dalvik/opdefs/sget_63.d:
+	* plugins/dalvik/opdefs/sget_64.d:
+	* plugins/dalvik/opdefs/sget_65.d:
+	* plugins/dalvik/opdefs/sget_66.d:
+	* plugins/dalvik/opdefs/shl_98.d:
+	* plugins/dalvik/opdefs/shl_a3.d:
+	* plugins/dalvik/opdefs/shl_b8.d:
+	* plugins/dalvik/opdefs/shl_c3.d:
+	* plugins/dalvik/opdefs/shl_e0.d:
+	* plugins/dalvik/opdefs/shr_99.d:
+	* plugins/dalvik/opdefs/shr_a4.d:
+	* plugins/dalvik/opdefs/shr_b9.d:
+	* plugins/dalvik/opdefs/shr_c4.d:
+	* plugins/dalvik/opdefs/shr_e1.d:
+	* plugins/dalvik/opdefs/sput_67.d:
+	* plugins/dalvik/opdefs/sput_68.d:
+	* plugins/dalvik/opdefs/sput_69.d:
+	* plugins/dalvik/opdefs/sput_6a.d:
+	* plugins/dalvik/opdefs/sput_6b.d:
+	* plugins/dalvik/opdefs/sput_6c.d:
+	* plugins/dalvik/opdefs/sput_6d.d:
+	* plugins/dalvik/opdefs/sub_91.d:
+	* plugins/dalvik/opdefs/sub_9c.d:
+	* plugins/dalvik/opdefs/sub_a7.d:
+	* plugins/dalvik/opdefs/sub_ac.d:
+	* plugins/dalvik/opdefs/sub_b1.d:
+	* plugins/dalvik/opdefs/sub_bc.d:
+	* plugins/dalvik/opdefs/sub_c7.d:
+	* plugins/dalvik/opdefs/sub_cc.d:
+	* plugins/dalvik/opdefs/switch_2b.d:
+	* plugins/dalvik/opdefs/switch_2c.d:
+	* plugins/dalvik/opdefs/throw_27.d:
+	* plugins/dalvik/opdefs/to_81.d:
+	* plugins/dalvik/opdefs/to_82.d:
+	* plugins/dalvik/opdefs/to_83.d:
+	* plugins/dalvik/opdefs/to_84.d:
+	* plugins/dalvik/opdefs/to_85.d:
+	* plugins/dalvik/opdefs/to_86.d:
+	* plugins/dalvik/opdefs/to_87.d:
+	* plugins/dalvik/opdefs/to_88.d:
+	* plugins/dalvik/opdefs/to_89.d:
+	* plugins/dalvik/opdefs/to_8a.d:
+	* plugins/dalvik/opdefs/to_8b.d:
+	* plugins/dalvik/opdefs/to_8c.d:
+	* plugins/dalvik/opdefs/to_8d.d:
+	* plugins/dalvik/opdefs/to_8e.d:
+	* plugins/dalvik/opdefs/to_8f.d:
+	* plugins/dalvik/opdefs/ushr_9a.d:
+	* plugins/dalvik/opdefs/ushr_a5.d:
+	* plugins/dalvik/opdefs/ushr_ba.d:
+	* plugins/dalvik/opdefs/ushr_c5.d:
+	* plugins/dalvik/opdefs/ushr_e2.d:
+	* plugins/dalvik/opdefs/xor_97.d:
+	* plugins/dalvik/opdefs/xor_a2.d:
+	* plugins/dalvik/opdefs/xor_b7.d:
+	* plugins/dalvik/opdefs/xor_c2.d:
+	* plugins/dalvik/opdefs/xor_d7.d:
+	* plugins/dalvik/opdefs/xor_df.d:
+	* plugins/dalvik/operand.c:
+	* plugins/dalvik/operand.h:
+	* plugins/dalvik/operands/Makefile.am:
+	* plugins/dalvik/operands/args.c:
+	* plugins/dalvik/operands/args.h:
+	* plugins/dalvik/operands/pool.c:
+	* plugins/dalvik/operands/pool.h:
+	* plugins/dalvik/operands/register.c:
+	* plugins/dalvik/operands/register.h:
+	* plugins/dalvik/post.h:
+	* plugins/dalvik/processor.c:
+	* plugins/dalvik/processor.h:
+	* plugins/dalvik/pseudo/Makefile.am:
+	* plugins/dalvik/pseudo/fill.c:
+	* plugins/dalvik/pseudo/fill.h:
+	* plugins/dalvik/pseudo/switch.c:
+	* plugins/dalvik/pseudo/switch.h:
+	* plugins/dalvik/register.c:
+	* plugins/dalvik/register.h:
+	* plugins/dex/Makefile.am:
+	* plugins/dex/class.c:
+	* plugins/dex/class.h:
+	* plugins/dex/core.c:
+	* plugins/dex/core.h:
+	* plugins/dex/dex-int.c:
+	* plugins/dex/dex-int.h:
+	* plugins/dex/dex_def.h:
+	* plugins/dex/format.c:
+	* plugins/dex/format.h:
+	* plugins/dex/loading.c:
+	* plugins/dex/loading.h:
+	* plugins/dex/method.c:
+	* plugins/dex/method.h:
+	* plugins/dex/pool.c:
+	* plugins/dex/pool.h:
+	* plugins/dex/python/Makefile.am:
+	* plugins/dex/python/class.c:
+	* plugins/dex/python/class.h:
+	* plugins/dex/python/format.c:
+	* plugins/dex/python/format.h:
+	* plugins/dex/python/module.c:
+	* plugins/dex/python/module.h:
+	Moved entries: create plugins for the Dex and Dalvik support.
+
+	* plugins/elf/python/module.h:
+	* plugins/pychrysa/format/Makefile.am:
+	* plugins/pychrysa/format/module.c:
+	* plugins/readdex/class.c:
+	* plugins/readdex/class.h:
+	* plugins/readdex/code.c:
+	* plugins/readdex/code.h:
+	* plugins/readdex/header.c:
+	* plugins/readdex/header.h:
+	* plugins/readdex/ids.c:
+	* plugins/readdex/ids.h:
+	* plugins/readdex/reader.c:
+	* src/arch/Makefile.am:
+	* src/arch/dalvik/core.h:
+	* src/arch/dalvik/operands/Makefile.am:
+	* src/arch/dalvik/pseudo/Makefile.am:
+	* src/core/formats.c:
+	* src/core/processors.c:
+	* src/format/Makefile.am:
+	* src/format/dex/Makefile.am:
+	* tools/d2c/d2c.mk:
+	Update code.
+
 17-10-15  Cyrille Bagard <nocbos@gmail.com>
 
 	* plugins/elf/Makefile.am:
diff --git a/autogen.sh b/autogen.sh
index 52b8007..68fbb58 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,7 +19,7 @@ echo "timestamp" > stamp-h.in
 
 # As some Makefiles expect an external fragment built dynamically, ensure these files exist
 touch src/arch/arm/v7/opcodes/gencode.mk
-touch src/arch/dalvik/opcodes/gencode.mk
+touch plugins/dalvik/opcodes/gencode.mk
 
 # Run the GNU tools
 libtoolize --force
diff --git a/configure.ac b/configure.ac
index 80afa2e..7f572e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -319,7 +319,14 @@ AC_CONFIG_COMMANDS([marshal], [echo -e "VOID:UINT64\nVOID:INT,UINT64,INT\nVOID:O
 AC_CONFIG_FILES([Makefile
                  pixmaps/Makefile
                  plugins/Makefile
+                 plugins/dalvik/Makefile
+                 plugins/dalvik/opdefs/Makefile
+                 plugins/dalvik/opcodes/Makefile
+                 plugins/dalvik/operands/Makefile
+                 plugins/dalvik/pseudo/Makefile
                  plugins/devdbg/Makefile
+                 plugins/dex/Makefile
+                 plugins/dex/python/Makefile
                  plugins/elf/Makefile
                  plugins/elf/python/Makefile
                  plugins/fmtp/Makefile
@@ -338,7 +345,6 @@ AC_CONFIG_FILES([Makefile
                  plugins/pychrysa/debug/Makefile
                  plugins/pychrysa/debug/gdbrsp/Makefile
                  plugins/pychrysa/format/Makefile
-                 plugins/pychrysa/format/dex/Makefile
                  plugins/pychrysa/glibext/Makefile
                  plugins/pychrysa/gtkext/Makefile
                  plugins/pychrysa/gui/Makefile
@@ -366,17 +372,11 @@ AC_CONFIG_FILES([Makefile
                  src/arch/arm/v7/opdefs/Makefile
                  src/arch/arm/v7/opcodes/Makefile
                  src/arch/arm/v7/operands/Makefile
-                 src/arch/dalvik/Makefile
-                 src/arch/dalvik/opdefs/Makefile
-                 src/arch/dalvik/opcodes/Makefile
-                 src/arch/dalvik/operands/Makefile
-                 src/arch/dalvik/pseudo/Makefile
                  src/common/Makefile
                  src/core/Makefile
                  src/debug/Makefile
                  src/debug/gdbrsp/Makefile
                  src/format/Makefile
-                 src/format/dex/Makefile
                  src/format/dwarf/Makefile
                  src/format/dwarf/v2/Makefile
                  src/format/dwarf/v3/Makefile
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index d8d771f..1070742 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -4,4 +4,4 @@ if HAVE_PYTHON3_CONFIG
 endif
 
 # androhelpers
-SUBDIRS = devdbg elf fmtp libcsem mobicore $(PYTHON3_SUBDIRS) readdex readelf readmc ropgadgets
+SUBDIRS = dalvik devdbg dex elf fmtp libcsem mobicore $(PYTHON3_SUBDIRS) readdex readelf readmc ropgadgets
diff --git a/src/arch/dalvik/Makefile.am b/plugins/dalvik/Makefile.am
index d994242..d12f733 100644
--- a/src/arch/dalvik/Makefile.am
+++ b/plugins/dalvik/Makefile.am
@@ -1,7 +1,7 @@
 
-noinst_LTLIBRARIES = libarchdalvik.la
+lib_LTLIBRARIES = libdalvik.la
 
-libarchdalvik_la_SOURCES =				\
+libdalvik_la_SOURCES =					\
 	context.h context.c					\
 	core.h core.c						\
 	fetch.h fetch.c						\
@@ -15,15 +15,15 @@ libarchdalvik_la_SOURCES =				\
 	processor.h processor.c				\
 	register.h register.c
 
-libarchdalvik_la_LIBADD =				\
-	opcodes/libarchdalvikopcodes.la		\
-	operands/libarchdalvikoperands.la	\
-	pseudo/libarchdalvikpseudo.la
+libdalvik_la_LIBADD =					\
+	opcodes/libdalvikopcodes.la			\
+	operands/libdalvikoperands.la		\
+	pseudo/libdalvikpseudo.la
 
-libarchdalvik_la_CFLAGS = $(AM_CFLAGS)
+libdalvik_la_CFLAGS = $(AM_CFLAGS)
 
 
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
+AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
 
 AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
 
diff --git a/src/arch/dalvik/context.c b/plugins/dalvik/context.c
index 277fad0..a48a9f3 100644
--- a/src/arch/dalvik/context.c
+++ b/plugins/dalvik/context.c
@@ -29,12 +29,14 @@
 #include <string.h>
 
 
+#include <analysis/contents/restricted.h>
+#include <arch/context-int.h>
+#include <arch/raw.h>
+#include <common/sort.h>
+#include <plugins/dex/dex-int.h>
+
+
 #include "operands/register.h"
-#include "../context-int.h"
-#include "../raw.h"
-#include "../../analysis/contents/restricted.h"
-#include "../../common/sort.h"
-#include "../../format/dex/dex-int.h"
 
 
 
diff --git a/src/arch/dalvik/context.h b/plugins/dalvik/context.h
index 68ef685..fbee9e0 100644
--- a/src/arch/dalvik/context.h
+++ b/plugins/dalvik/context.h
@@ -29,8 +29,10 @@
 #include <stdbool.h>
 
 
+#include <arch/archbase.h>
+
+
 #include "instruction.h"
-#include "../archbase.h"
 
 
 
diff --git a/src/arch/dalvik/core.c b/plugins/dalvik/core.c
index acf6ff5..f5b2f91 100644
--- a/src/arch/dalvik/core.c
+++ b/plugins/dalvik/core.c
@@ -1,8 +1,8 @@
 
 /* Chrysalide - Outil d'analyse de fichiers binaires
- * core.c - chargement et déchargement des mécanismes internes de l'architecture Dalvik
+ * core.c - intégration du support de l'architecture Dalvik
  *
- * Copyright (C) 2016-2017 Cyrille Bagard
+ * Copyright (C) 2017 Cyrille Bagard
  *
  *  This file is part of Chrysalide.
  *
@@ -24,35 +24,25 @@
 #include "core.h"
 
 
+#include <core/processors.h>
+#include <plugins/plugin-def.h>
 
-/******************************************************************************
-*                                                                             *
-*  Paramètres  : -                                                            *
-*                                                                             *
-*  Description : Met en place les mécanismes internes de l'architecture.      *
-*                                                                             *
-*  Retour      : Bilan de l'opération.                                        *
-*                                                                             *
-*  Remarques   : -                                                            *
-*                                                                             *
-******************************************************************************/
 
-bool init_dalvik_core(void)
-{
-    bool result;                            /* Bilan à renvoyer            */
+#include "processor.h"
 
-    result = true;
 
-    return result;
 
-}
+DEFINE_CHRYSALIDE_PLUGIN("dalvik", "Add suport for the Dalvik architecture", "0.1.0",
+                         RL("PyChrysalide"), AL(PGA_PLUGIN_INIT));
+
 
 
 /******************************************************************************
 *                                                                             *
-*  Paramètres  : -                                                            *
+*  Paramètres  : plugin = greffon à manipuler.                                *
+*                ref    = espace de référencement global.                     *
 *                                                                             *
-*  Description : Supprime les mécanismes internes de l'architecture Dalvik.   *
+*  Description : Prend acte du chargement du greffon.                         *
 *                                                                             *
 *  Retour      : -                                                            *
 *                                                                             *
@@ -60,7 +50,13 @@ bool init_dalvik_core(void)
 *                                                                             *
 ******************************************************************************/
 
-void exit_dalvik_core(void)
+G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin)
 {
+    bool result;                            /* Bilan à retourner           */
+
+    result = register_processor_type("dalvik", "Dalvik Virtual Machine", G_TYPE_DALVIK_PROCESSOR,
+                                     NULL, NULL);
+
+    return result;
 
 }
diff --git a/plugins/dalvik/core.h b/plugins/dalvik/core.h
new file mode 100644
index 0000000..e72abaa
--- /dev/null
+++ b/plugins/dalvik/core.h
@@ -0,0 +1,38 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * core.h - prototypes pour l'intégration du support de l'architecture Dalvik
+ *
+ * Copyright (C) 2017 Cyrille Bagard
+ *
+ *  This file is part of Chrysalide.
+ *
+ *  Chrysalide is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Chrysalide is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef _PLUGINS_DALVIK_CORE_H
+#define _PLUGINS_DALVIK_CORE_H
+
+
+#include <plugins/plugin.h>
+#include <plugins/plugin-int.h>
+
+
+
+/* Prend acte du chargement du greffon. */
+G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *);
+
+
+
+#endif  /* _PLUGINS_DALVIK_CORE_H */
diff --git a/src/arch/dalvik/fetch.c b/plugins/dalvik/fetch.c
index aa17a9f..aa17a9f 100644
--- a/src/arch/dalvik/fetch.c
+++ b/plugins/dalvik/fetch.c
diff --git a/src/arch/dalvik/fetch.h b/plugins/dalvik/fetch.h
index 47c00af..e9ea340 100644
--- a/src/arch/dalvik/fetch.h
+++ b/plugins/dalvik/fetch.h
@@ -25,8 +25,10 @@
 #define _ARCH_DALVIK_FETCH_H
 
 
+#include <arch/instruction.h>
+
+
 #include "context.h"
-#include "../instruction.h"
 
 
 
diff --git a/src/arch/dalvik/helpers.h b/plugins/dalvik/helpers.h
index 6a0ba5c..6a0ba5c 100644
--- a/src/arch/dalvik/helpers.h
+++ b/plugins/dalvik/helpers.h
diff --git a/src/arch/dalvik/instruction-def.h b/plugins/dalvik/instruction-def.h
index af6e308..af6e308 100644
--- a/src/arch/dalvik/instruction-def.h
+++ b/plugins/dalvik/instruction-def.h
diff --git a/src/arch/dalvik/instruction-int.h b/plugins/dalvik/instruction-int.h
index 322bed4..b4e59b0 100644
--- a/src/arch/dalvik/instruction-int.h
+++ b/plugins/dalvik/instruction-int.h
@@ -25,8 +25,10 @@
 #define _ARCH_DALVIK_INSTRUCTION_INT_H
 
 
+#include <arch/instruction-int.h>
+
+
 #include "instruction-def.h"
-#include "../instruction-int.h"
 
 
 
diff --git a/src/arch/dalvik/instruction.c b/plugins/dalvik/instruction.c
index 6fff211..aafd34e 100644
--- a/src/arch/dalvik/instruction.c
+++ b/plugins/dalvik/instruction.c
@@ -27,10 +27,12 @@
 #include <string.h>
 
 
+#include <arch/instruction-int.h>
+#include <arch/register-int.h>
+
+
 #include "instruction-int.h"
 #include "operands/register.h"
-#include "../instruction-int.h"
-#include "../register-int.h"
 
 
 
diff --git a/src/arch/dalvik/instruction.h b/plugins/dalvik/instruction.h
index 1189bef..8f05cc5 100644
--- a/src/arch/dalvik/instruction.h
+++ b/plugins/dalvik/instruction.h
@@ -25,8 +25,10 @@
 #define _ARCH_DALVIK_INSTRUCTION_H
 
 
+#include <arch/instruction.h>
+
+
 #include "instruction-def.h"
-#include "../instruction.h"
 
 
 
diff --git a/src/arch/dalvik/link.c b/plugins/dalvik/link.c
index 6508b03..ae7aa63 100644
--- a/src/arch/dalvik/link.c
+++ b/plugins/dalvik/link.c
@@ -31,12 +31,12 @@
 
 
 #include <i18n.h>
+#include <analysis/db/items/comment.h>
+#include <arch/target.h>
+#include <common/extstr.h>
 
 
 #include "pseudo/switch.h"
-#include "../target.h"
-#include "../../analysis/db/items/comment.h"
-#include "../../common/extstr.h"
 
 
 
diff --git a/src/arch/dalvik/link.h b/plugins/dalvik/link.h
index 2bb1548..41d03ec 100644
--- a/src/arch/dalvik/link.h
+++ b/plugins/dalvik/link.h
@@ -25,7 +25,7 @@
 #define _ARCH_DALVIK_LINK_H
 
 
-#include "../link.h"
+#include <arch/link.h>
 
 
 
diff --git a/src/arch/dalvik/opcodes/Makefile.am b/plugins/dalvik/opcodes/Makefile.am
index e4f90da..9889cfa 100644
--- a/src/arch/dalvik/opcodes/Makefile.am
+++ b/plugins/dalvik/opcodes/Makefile.am
@@ -9,15 +9,15 @@ am__depfiles_maybe = depfiles
 
 include gencode.mk
 
-noinst_LTLIBRARIES = libarchdalvikopcodes.la
+noinst_LTLIBRARIES = libdalvikopcodes.la
 
-libarchdalvikopcodes_la_SOURCES = $(GENERATED_FILES)
+libdalvikopcodes_la_SOURCES = $(GENERATED_FILES)
 
-libarchdalvikopcodes_la_LIBADD =
+libdalvikopcodes_la_LIBADD =
 
-libarchdalvikopcodes_la_CFLAGS = $(AM_CFLAGS)
+libdalvikopcodes_la_CFLAGS = $(AM_CFLAGS)
 
 
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
+AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
 
 AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
diff --git a/src/arch/dalvik/opdefs/Makefile.am b/plugins/dalvik/opdefs/Makefile.am
index 822e593..fed398f 100644
--- a/src/arch/dalvik/opdefs/Makefile.am
+++ b/plugins/dalvik/opdefs/Makefile.am
@@ -1,9 +1,9 @@
 
-include ../../../../tools/d2c/d2c.mk
+include $(top_srcdir)/tools/d2c/d2c.mk
 
 
-D2C_BIN = ../../../../tools/d2c/d2c
-GEN_BIN = ../../../../tools/d2c/d2c_genmakefile.sh
+D2C_BIN = $(top_srcdir)/tools/d2c/d2c
+GEN_BIN = $(top_srcdir)/tools/d2c/d2c_genmakefile.sh
 
 D2C_TYPE = format
 
@@ -22,25 +22,26 @@ D2C_MACROS =										\
 FIXED_C_INCLUDES = \
 	\n\#include \<stdint.h\> \
 	\n \
+	\n\#include <analysis\/content.h> \
+	\n\#include <arch/context.h> \
+	\n\#include <format\/executable.h> \
+	\n \
 	\n\#include \"..\/fetch.h\" \
 	\n\#include \"..\/helpers.h\" \
 	\n\#include \"..\/instruction.h\" \
 	\n\#include \"..\/link.h\" \
 	\n\#include \"..\/post.h\" \
 	\n\#include \"..\/processor.h\" \
-	\n\#include \"..\/..\/context.h\" \
-	\n\#include \"..\/..\/..\/analysis\/content.h\" \
-	\n\#include \"..\/..\/..\/format\/executable.h\" \
 	\n\n
 
 FIXED_H_INCLUDES = \
-	\n\#include \<stdint.h\> \
+	\#include <stdint.h> \
 	\n \
-	\n\#include \"..\/processor.h\" \
-	\n\#include \"..\/..\/context.h\" \
-	\n\#include \"..\/..\/..\/analysis\/content.h\" \
-	\n\#include \"..\/..\/..\/format\/executable.h\" \
-	\n\n
+	\n\#include <arch/context.h> \
+	\n\#include <analysis/content.h> \
+	\n\#include <format/executable.h> \
+	\n \
+	\n\#include "../processor.h"
 
 # for (( i = 0; i < 256; i++)); do def=$(ls `printf "*_%02x.d" $i` 2> /dev/null); test -z "$def" || echo -e "\t$def\t\t\t\t\t\t\t\\" ; done
 DALVIK_DEFS = 							\
@@ -278,7 +279,7 @@ dist-hook:
 all: $(DALVIK_DEFS:.d=.g) fmk.done d2c_final_rules
 
 fmk.done: $(DALVIK_DEFS)
-	$(GEN_BIN) ../opcodes/ ../opdefs/.gen ../../../../tools/d2c/globalgen.mk -
+	$(GEN_BIN) ../opcodes/ ../opdefs/.gen $(top_srcdir)/tools/d2c/globalgen.mk -
 	touch $@
 
 clean:
diff --git a/src/arch/dalvik/opdefs/add_90.d b/plugins/dalvik/opdefs/add_90.d
index 04168ab..04168ab 100644
--- a/src/arch/dalvik/opdefs/add_90.d
+++ b/plugins/dalvik/opdefs/add_90.d
diff --git a/src/arch/dalvik/opdefs/add_9b.d b/plugins/dalvik/opdefs/add_9b.d
index fc40b13..fc40b13 100644
--- a/src/arch/dalvik/opdefs/add_9b.d
+++ b/plugins/dalvik/opdefs/add_9b.d
diff --git a/src/arch/dalvik/opdefs/add_a6.d b/plugins/dalvik/opdefs/add_a6.d
index 055358b..055358b 100644
--- a/src/arch/dalvik/opdefs/add_a6.d
+++ b/plugins/dalvik/opdefs/add_a6.d
diff --git a/src/arch/dalvik/opdefs/add_ab.d b/plugins/dalvik/opdefs/add_ab.d
index 1506483..1506483 100644
--- a/src/arch/dalvik/opdefs/add_ab.d
+++ b/plugins/dalvik/opdefs/add_ab.d
diff --git a/src/arch/dalvik/opdefs/add_b0.d b/plugins/dalvik/opdefs/add_b0.d
index 9c5605e..9c5605e 100644
--- a/src/arch/dalvik/opdefs/add_b0.d
+++ b/plugins/dalvik/opdefs/add_b0.d
diff --git a/src/arch/dalvik/opdefs/add_bb.d b/plugins/dalvik/opdefs/add_bb.d
index aba27f3..aba27f3 100644
--- a/src/arch/dalvik/opdefs/add_bb.d
+++ b/plugins/dalvik/opdefs/add_bb.d
diff --git a/src/arch/dalvik/opdefs/add_c6.d b/plugins/dalvik/opdefs/add_c6.d
index 3394b92..3394b92 100644
--- a/src/arch/dalvik/opdefs/add_c6.d
+++ b/plugins/dalvik/opdefs/add_c6.d
diff --git a/src/arch/dalvik/opdefs/add_cb.d b/plugins/dalvik/opdefs/add_cb.d
index 896f614..896f614 100644
--- a/src/arch/dalvik/opdefs/add_cb.d
+++ b/plugins/dalvik/opdefs/add_cb.d
diff --git a/src/arch/dalvik/opdefs/add_d0.d b/plugins/dalvik/opdefs/add_d0.d
index f6f4324..f6f4324 100644
--- a/src/arch/dalvik/opdefs/add_d0.d
+++ b/plugins/dalvik/opdefs/add_d0.d
diff --git a/src/arch/dalvik/opdefs/add_d8.d b/plugins/dalvik/opdefs/add_d8.d
index ec4ee01..ec4ee01 100644
--- a/src/arch/dalvik/opdefs/add_d8.d
+++ b/plugins/dalvik/opdefs/add_d8.d
diff --git a/src/arch/dalvik/opdefs/aget_44.d b/plugins/dalvik/opdefs/aget_44.d
index b3a26cb..b3a26cb 100644
--- a/src/arch/dalvik/opdefs/aget_44.d
+++ b/plugins/dalvik/opdefs/aget_44.d
diff --git a/src/arch/dalvik/opdefs/aget_45.d b/plugins/dalvik/opdefs/aget_45.d
index 184667b..184667b 100644
--- a/src/arch/dalvik/opdefs/aget_45.d
+++ b/plugins/dalvik/opdefs/aget_45.d
diff --git a/src/arch/dalvik/opdefs/aget_46.d b/plugins/dalvik/opdefs/aget_46.d
index b951c09..b951c09 100644
--- a/src/arch/dalvik/opdefs/aget_46.d
+++ b/plugins/dalvik/opdefs/aget_46.d
diff --git a/src/arch/dalvik/opdefs/aget_47.d b/plugins/dalvik/opdefs/aget_47.d
index 0a5e90b..0a5e90b 100644
--- a/src/arch/dalvik/opdefs/aget_47.d
+++ b/plugins/dalvik/opdefs/aget_47.d
diff --git a/src/arch/dalvik/opdefs/aget_48.d b/plugins/dalvik/opdefs/aget_48.d
index c84f513..c84f513 100644
--- a/src/arch/dalvik/opdefs/aget_48.d
+++ b/plugins/dalvik/opdefs/aget_48.d
diff --git a/src/arch/dalvik/opdefs/aget_49.d b/plugins/dalvik/opdefs/aget_49.d
index 396434b..396434b 100644
--- a/src/arch/dalvik/opdefs/aget_49.d
+++ b/plugins/dalvik/opdefs/aget_49.d
diff --git a/src/arch/dalvik/opdefs/aget_4a.d b/plugins/dalvik/opdefs/aget_4a.d
index ce9497f..ce9497f 100644
--- a/src/arch/dalvik/opdefs/aget_4a.d
+++ b/plugins/dalvik/opdefs/aget_4a.d
diff --git a/src/arch/dalvik/opdefs/and_95.d b/plugins/dalvik/opdefs/and_95.d
index 3926c05..3926c05 100644
--- a/src/arch/dalvik/opdefs/and_95.d
+++ b/plugins/dalvik/opdefs/and_95.d
diff --git a/src/arch/dalvik/opdefs/and_a0.d b/plugins/dalvik/opdefs/and_a0.d
index b011156..b011156 100644
--- a/src/arch/dalvik/opdefs/and_a0.d
+++ b/plugins/dalvik/opdefs/and_a0.d
diff --git a/src/arch/dalvik/opdefs/and_b5.d b/plugins/dalvik/opdefs/and_b5.d
index dec2ffb..dec2ffb 100644
--- a/src/arch/dalvik/opdefs/and_b5.d
+++ b/plugins/dalvik/opdefs/and_b5.d
diff --git a/src/arch/dalvik/opdefs/and_c0.d b/plugins/dalvik/opdefs/and_c0.d
index 6fb52b6..6fb52b6 100644
--- a/src/arch/dalvik/opdefs/and_c0.d
+++ b/plugins/dalvik/opdefs/and_c0.d
diff --git a/src/arch/dalvik/opdefs/and_d5.d b/plugins/dalvik/opdefs/and_d5.d
index 081c0d0..081c0d0 100644
--- a/src/arch/dalvik/opdefs/and_d5.d
+++ b/plugins/dalvik/opdefs/and_d5.d
diff --git a/src/arch/dalvik/opdefs/and_dd.d b/plugins/dalvik/opdefs/and_dd.d
index 8adae05..8adae05 100644
--- a/src/arch/dalvik/opdefs/and_dd.d
+++ b/plugins/dalvik/opdefs/and_dd.d
diff --git a/src/arch/dalvik/opdefs/aput_4b.d b/plugins/dalvik/opdefs/aput_4b.d
index 90cc75f..90cc75f 100644
--- a/src/arch/dalvik/opdefs/aput_4b.d
+++ b/plugins/dalvik/opdefs/aput_4b.d
diff --git a/src/arch/dalvik/opdefs/aput_4c.d b/plugins/dalvik/opdefs/aput_4c.d
index ff545f4..ff545f4 100644
--- a/src/arch/dalvik/opdefs/aput_4c.d
+++ b/plugins/dalvik/opdefs/aput_4c.d
diff --git a/src/arch/dalvik/opdefs/aput_4d.d b/plugins/dalvik/opdefs/aput_4d.d
index 4c9ae98..4c9ae98 100644
--- a/src/arch/dalvik/opdefs/aput_4d.d
+++ b/plugins/dalvik/opdefs/aput_4d.d
diff --git a/src/arch/dalvik/opdefs/aput_4e.d b/plugins/dalvik/opdefs/aput_4e.d
index 1602e62..1602e62 100644
--- a/src/arch/dalvik/opdefs/aput_4e.d
+++ b/plugins/dalvik/opdefs/aput_4e.d
diff --git a/src/arch/dalvik/opdefs/aput_4f.d b/plugins/dalvik/opdefs/aput_4f.d
index 3632974..3632974 100644
--- a/src/arch/dalvik/opdefs/aput_4f.d
+++ b/plugins/dalvik/opdefs/aput_4f.d
diff --git a/src/arch/dalvik/opdefs/aput_50.d b/plugins/dalvik/opdefs/aput_50.d
index c295386..c295386 100644
--- a/src/arch/dalvik/opdefs/aput_50.d
+++ b/plugins/dalvik/opdefs/aput_50.d
diff --git a/src/arch/dalvik/opdefs/aput_51.d b/plugins/dalvik/opdefs/aput_51.d
index 11ad5b2..11ad5b2 100644
--- a/src/arch/dalvik/opdefs/aput_51.d
+++ b/plugins/dalvik/opdefs/aput_51.d
diff --git a/src/arch/dalvik/opdefs/array_21.d b/plugins/dalvik/opdefs/array_21.d
index e0ca860..e0ca860 100644
--- a/src/arch/dalvik/opdefs/array_21.d
+++ b/plugins/dalvik/opdefs/array_21.d
diff --git a/src/arch/dalvik/opdefs/array_24.d b/plugins/dalvik/opdefs/array_24.d
index 00b7896..00b7896 100644
--- a/src/arch/dalvik/opdefs/array_24.d
+++ b/plugins/dalvik/opdefs/array_24.d
diff --git a/src/arch/dalvik/opdefs/array_26.d b/plugins/dalvik/opdefs/array_26.d
index f57afd1..f57afd1 100644
--- a/src/arch/dalvik/opdefs/array_26.d
+++ b/plugins/dalvik/opdefs/array_26.d
diff --git a/src/arch/dalvik/opdefs/check_1f.d b/plugins/dalvik/opdefs/check_1f.d
index 0f59ba7..0f59ba7 100644
--- a/src/arch/dalvik/opdefs/check_1f.d
+++ b/plugins/dalvik/opdefs/check_1f.d
diff --git a/src/arch/dalvik/opdefs/cmp_31.d b/plugins/dalvik/opdefs/cmp_31.d
index baedee6..baedee6 100644
--- a/src/arch/dalvik/opdefs/cmp_31.d
+++ b/plugins/dalvik/opdefs/cmp_31.d
diff --git a/src/arch/dalvik/opdefs/cmpg_2e.d b/plugins/dalvik/opdefs/cmpg_2e.d
index 296337c..296337c 100644
--- a/src/arch/dalvik/opdefs/cmpg_2e.d
+++ b/plugins/dalvik/opdefs/cmpg_2e.d
diff --git a/src/arch/dalvik/opdefs/cmpg_30.d b/plugins/dalvik/opdefs/cmpg_30.d
index dbb66ae..dbb66ae 100644
--- a/src/arch/dalvik/opdefs/cmpg_30.d
+++ b/plugins/dalvik/opdefs/cmpg_30.d
diff --git a/src/arch/dalvik/opdefs/cmpl_2d.d b/plugins/dalvik/opdefs/cmpl_2d.d
index b76b73e..b76b73e 100644
--- a/src/arch/dalvik/opdefs/cmpl_2d.d
+++ b/plugins/dalvik/opdefs/cmpl_2d.d
diff --git a/src/arch/dalvik/opdefs/cmpl_2f.d b/plugins/dalvik/opdefs/cmpl_2f.d
index cebd732..cebd732 100644
--- a/src/arch/dalvik/opdefs/cmpl_2f.d
+++ b/plugins/dalvik/opdefs/cmpl_2f.d
diff --git a/src/arch/dalvik/opdefs/const_12.d b/plugins/dalvik/opdefs/const_12.d
index bc4e4f8..bc4e4f8 100644
--- a/src/arch/dalvik/opdefs/const_12.d
+++ b/plugins/dalvik/opdefs/const_12.d
diff --git a/src/arch/dalvik/opdefs/const_13.d b/plugins/dalvik/opdefs/const_13.d
index 9b65ba4..9b65ba4 100644
--- a/src/arch/dalvik/opdefs/const_13.d
+++ b/plugins/dalvik/opdefs/const_13.d
diff --git a/src/arch/dalvik/opdefs/const_14.d b/plugins/dalvik/opdefs/const_14.d
index 039d372..039d372 100644
--- a/src/arch/dalvik/opdefs/const_14.d
+++ b/plugins/dalvik/opdefs/const_14.d
diff --git a/src/arch/dalvik/opdefs/const_15.d b/plugins/dalvik/opdefs/const_15.d
index add0673..add0673 100644
--- a/src/arch/dalvik/opdefs/const_15.d
+++ b/plugins/dalvik/opdefs/const_15.d
diff --git a/src/arch/dalvik/opdefs/const_16.d b/plugins/dalvik/opdefs/const_16.d
index cb1ce25..cb1ce25 100644
--- a/src/arch/dalvik/opdefs/const_16.d
+++ b/plugins/dalvik/opdefs/const_16.d
diff --git a/src/arch/dalvik/opdefs/const_17.d b/plugins/dalvik/opdefs/const_17.d
index 88a9f0c..88a9f0c 100644
--- a/src/arch/dalvik/opdefs/const_17.d
+++ b/plugins/dalvik/opdefs/const_17.d
diff --git a/src/arch/dalvik/opdefs/const_18.d b/plugins/dalvik/opdefs/const_18.d
index d792add..d792add 100644
--- a/src/arch/dalvik/opdefs/const_18.d
+++ b/plugins/dalvik/opdefs/const_18.d
diff --git a/src/arch/dalvik/opdefs/const_19.d b/plugins/dalvik/opdefs/const_19.d
index 577eaf3..577eaf3 100644
--- a/src/arch/dalvik/opdefs/const_19.d
+++ b/plugins/dalvik/opdefs/const_19.d
diff --git a/src/arch/dalvik/opdefs/const_1a.d b/plugins/dalvik/opdefs/const_1a.d
index 22c11ae..22c11ae 100644
--- a/src/arch/dalvik/opdefs/const_1a.d
+++ b/plugins/dalvik/opdefs/const_1a.d
diff --git a/src/arch/dalvik/opdefs/const_1b.d b/plugins/dalvik/opdefs/const_1b.d
index 699cef6..699cef6 100644
--- a/src/arch/dalvik/opdefs/const_1b.d
+++ b/plugins/dalvik/opdefs/const_1b.d
diff --git a/src/arch/dalvik/opdefs/const_1c.d b/plugins/dalvik/opdefs/const_1c.d
index c539ee9..c539ee9 100644
--- a/src/arch/dalvik/opdefs/const_1c.d
+++ b/plugins/dalvik/opdefs/const_1c.d
diff --git a/src/arch/dalvik/opdefs/div_93.d b/plugins/dalvik/opdefs/div_93.d
index cfb7f34..cfb7f34 100644
--- a/src/arch/dalvik/opdefs/div_93.d
+++ b/plugins/dalvik/opdefs/div_93.d
diff --git a/src/arch/dalvik/opdefs/div_9e.d b/plugins/dalvik/opdefs/div_9e.d
index b12ebd1..b12ebd1 100644
--- a/src/arch/dalvik/opdefs/div_9e.d
+++ b/plugins/dalvik/opdefs/div_9e.d
diff --git a/src/arch/dalvik/opdefs/div_a9.d b/plugins/dalvik/opdefs/div_a9.d
index f7ce52e..f7ce52e 100644
--- a/src/arch/dalvik/opdefs/div_a9.d
+++ b/plugins/dalvik/opdefs/div_a9.d
diff --git a/src/arch/dalvik/opdefs/div_ae.d b/plugins/dalvik/opdefs/div_ae.d
index fae8164..fae8164 100644
--- a/src/arch/dalvik/opdefs/div_ae.d
+++ b/plugins/dalvik/opdefs/div_ae.d
diff --git a/src/arch/dalvik/opdefs/div_b3.d b/plugins/dalvik/opdefs/div_b3.d
index d1cf5d9..d1cf5d9 100644
--- a/src/arch/dalvik/opdefs/div_b3.d
+++ b/plugins/dalvik/opdefs/div_b3.d
diff --git a/src/arch/dalvik/opdefs/div_be.d b/plugins/dalvik/opdefs/div_be.d
index a146c29..a146c29 100644
--- a/src/arch/dalvik/opdefs/div_be.d
+++ b/plugins/dalvik/opdefs/div_be.d
diff --git a/src/arch/dalvik/opdefs/div_c9.d b/plugins/dalvik/opdefs/div_c9.d
index 541ed90..541ed90 100644
--- a/src/arch/dalvik/opdefs/div_c9.d
+++ b/plugins/dalvik/opdefs/div_c9.d
diff --git a/src/arch/dalvik/opdefs/div_ce.d b/plugins/dalvik/opdefs/div_ce.d
index 2c735e4..2c735e4 100644
--- a/src/arch/dalvik/opdefs/div_ce.d
+++ b/plugins/dalvik/opdefs/div_ce.d
diff --git a/src/arch/dalvik/opdefs/div_d3.d b/plugins/dalvik/opdefs/div_d3.d
index 9dde5bd..9dde5bd 100644
--- a/src/arch/dalvik/opdefs/div_d3.d
+++ b/plugins/dalvik/opdefs/div_d3.d
diff --git a/src/arch/dalvik/opdefs/div_db.d b/plugins/dalvik/opdefs/div_db.d
index 6754ed8..6754ed8 100644
--- a/src/arch/dalvik/opdefs/div_db.d
+++ b/plugins/dalvik/opdefs/div_db.d
diff --git a/src/arch/dalvik/opdefs/filled_25.d b/plugins/dalvik/opdefs/filled_25.d
index cf31e09..cf31e09 100644
--- a/src/arch/dalvik/opdefs/filled_25.d
+++ b/plugins/dalvik/opdefs/filled_25.d
diff --git a/src/arch/dalvik/opdefs/goto_28.d b/plugins/dalvik/opdefs/goto_28.d
index a9c12d1..a9c12d1 100644
--- a/src/arch/dalvik/opdefs/goto_28.d
+++ b/plugins/dalvik/opdefs/goto_28.d
diff --git a/src/arch/dalvik/opdefs/goto_29.d b/plugins/dalvik/opdefs/goto_29.d
index 8272a7d..8272a7d 100644
--- a/src/arch/dalvik/opdefs/goto_29.d
+++ b/plugins/dalvik/opdefs/goto_29.d
diff --git a/src/arch/dalvik/opdefs/goto_2a.d b/plugins/dalvik/opdefs/goto_2a.d
index 937b10d..937b10d 100644
--- a/src/arch/dalvik/opdefs/goto_2a.d
+++ b/plugins/dalvik/opdefs/goto_2a.d
diff --git a/src/arch/dalvik/opdefs/if_32.d b/plugins/dalvik/opdefs/if_32.d
index f88098a..f88098a 100644
--- a/src/arch/dalvik/opdefs/if_32.d
+++ b/plugins/dalvik/opdefs/if_32.d
diff --git a/src/arch/dalvik/opdefs/if_33.d b/plugins/dalvik/opdefs/if_33.d
index f655f67..f655f67 100644
--- a/src/arch/dalvik/opdefs/if_33.d
+++ b/plugins/dalvik/opdefs/if_33.d
diff --git a/src/arch/dalvik/opdefs/if_34.d b/plugins/dalvik/opdefs/if_34.d
index 1146980..1146980 100644
--- a/src/arch/dalvik/opdefs/if_34.d
+++ b/plugins/dalvik/opdefs/if_34.d
diff --git a/src/arch/dalvik/opdefs/if_35.d b/plugins/dalvik/opdefs/if_35.d
index b11b243..b11b243 100644
--- a/src/arch/dalvik/opdefs/if_35.d
+++ b/plugins/dalvik/opdefs/if_35.d
diff --git a/src/arch/dalvik/opdefs/if_36.d b/plugins/dalvik/opdefs/if_36.d
index 7436901..7436901 100644
--- a/src/arch/dalvik/opdefs/if_36.d
+++ b/plugins/dalvik/opdefs/if_36.d
diff --git a/src/arch/dalvik/opdefs/if_37.d b/plugins/dalvik/opdefs/if_37.d
index 9ecbd84..9ecbd84 100644
--- a/src/arch/dalvik/opdefs/if_37.d
+++ b/plugins/dalvik/opdefs/if_37.d
diff --git a/src/arch/dalvik/opdefs/if_38.d b/plugins/dalvik/opdefs/if_38.d
index ff21f2b..ff21f2b 100644
--- a/src/arch/dalvik/opdefs/if_38.d
+++ b/plugins/dalvik/opdefs/if_38.d
diff --git a/src/arch/dalvik/opdefs/if_39.d b/plugins/dalvik/opdefs/if_39.d
index 0dbba57..0dbba57 100644
--- a/src/arch/dalvik/opdefs/if_39.d
+++ b/plugins/dalvik/opdefs/if_39.d
diff --git a/src/arch/dalvik/opdefs/if_3a.d b/plugins/dalvik/opdefs/if_3a.d
index b003824..b003824 100644
--- a/src/arch/dalvik/opdefs/if_3a.d
+++ b/plugins/dalvik/opdefs/if_3a.d
diff --git a/src/arch/dalvik/opdefs/if_3b.d b/plugins/dalvik/opdefs/if_3b.d
index f571d7e..f571d7e 100644
--- a/src/arch/dalvik/opdefs/if_3b.d
+++ b/plugins/dalvik/opdefs/if_3b.d
diff --git a/src/arch/dalvik/opdefs/if_3c.d b/plugins/dalvik/opdefs/if_3c.d
index 154fe2c..154fe2c 100644
--- a/src/arch/dalvik/opdefs/if_3c.d
+++ b/plugins/dalvik/opdefs/if_3c.d
diff --git a/src/arch/dalvik/opdefs/if_3d.d b/plugins/dalvik/opdefs/if_3d.d
index 2aa5f87..2aa5f87 100644
--- a/src/arch/dalvik/opdefs/if_3d.d
+++ b/plugins/dalvik/opdefs/if_3d.d
diff --git a/src/arch/dalvik/opdefs/iget_52.d b/plugins/dalvik/opdefs/iget_52.d
index ca5c140..ca5c140 100644
--- a/src/arch/dalvik/opdefs/iget_52.d
+++ b/plugins/dalvik/opdefs/iget_52.d
diff --git a/src/arch/dalvik/opdefs/iget_53.d b/plugins/dalvik/opdefs/iget_53.d
index 3d458d9..3d458d9 100644
--- a/src/arch/dalvik/opdefs/iget_53.d
+++ b/plugins/dalvik/opdefs/iget_53.d
diff --git a/src/arch/dalvik/opdefs/iget_54.d b/plugins/dalvik/opdefs/iget_54.d
index 343accc..343accc 100644
--- a/src/arch/dalvik/opdefs/iget_54.d
+++ b/plugins/dalvik/opdefs/iget_54.d
diff --git a/src/arch/dalvik/opdefs/iget_55.d b/plugins/dalvik/opdefs/iget_55.d
index dc9d7a4..dc9d7a4 100644
--- a/src/arch/dalvik/opdefs/iget_55.d
+++ b/plugins/dalvik/opdefs/iget_55.d
diff --git a/src/arch/dalvik/opdefs/iget_56.d b/plugins/dalvik/opdefs/iget_56.d
index 92e4d6c..92e4d6c 100644
--- a/src/arch/dalvik/opdefs/iget_56.d
+++ b/plugins/dalvik/opdefs/iget_56.d
diff --git a/src/arch/dalvik/opdefs/iget_57.d b/plugins/dalvik/opdefs/iget_57.d
index b8864c7..b8864c7 100644
--- a/src/arch/dalvik/opdefs/iget_57.d
+++ b/plugins/dalvik/opdefs/iget_57.d
diff --git a/src/arch/dalvik/opdefs/iget_58.d b/plugins/dalvik/opdefs/iget_58.d
index 85a3fb8..85a3fb8 100644
--- a/src/arch/dalvik/opdefs/iget_58.d
+++ b/plugins/dalvik/opdefs/iget_58.d
diff --git a/src/arch/dalvik/opdefs/instanceof_20.d b/plugins/dalvik/opdefs/instanceof_20.d
index 7652c56..7652c56 100644
--- a/src/arch/dalvik/opdefs/instanceof_20.d
+++ b/plugins/dalvik/opdefs/instanceof_20.d
diff --git a/src/arch/dalvik/opdefs/invoke_6e.d b/plugins/dalvik/opdefs/invoke_6e.d
index e7b3f0d..e7b3f0d 100644
--- a/src/arch/dalvik/opdefs/invoke_6e.d
+++ b/plugins/dalvik/opdefs/invoke_6e.d
diff --git a/src/arch/dalvik/opdefs/invoke_6f.d b/plugins/dalvik/opdefs/invoke_6f.d
index 9fa4666..9fa4666 100644
--- a/src/arch/dalvik/opdefs/invoke_6f.d
+++ b/plugins/dalvik/opdefs/invoke_6f.d
diff --git a/src/arch/dalvik/opdefs/invoke_70.d b/plugins/dalvik/opdefs/invoke_70.d
index 6662ce3..6662ce3 100644
--- a/src/arch/dalvik/opdefs/invoke_70.d
+++ b/plugins/dalvik/opdefs/invoke_70.d
diff --git a/src/arch/dalvik/opdefs/invoke_71.d b/plugins/dalvik/opdefs/invoke_71.d
index f179dbd..f179dbd 100644
--- a/src/arch/dalvik/opdefs/invoke_71.d
+++ b/plugins/dalvik/opdefs/invoke_71.d
diff --git a/src/arch/dalvik/opdefs/invoke_72.d b/plugins/dalvik/opdefs/invoke_72.d
index 6ad8e09..6ad8e09 100644
--- a/src/arch/dalvik/opdefs/invoke_72.d
+++ b/plugins/dalvik/opdefs/invoke_72.d
diff --git a/src/arch/dalvik/opdefs/invoke_74.d b/plugins/dalvik/opdefs/invoke_74.d
index 77b68de..77b68de 100644
--- a/src/arch/dalvik/opdefs/invoke_74.d
+++ b/plugins/dalvik/opdefs/invoke_74.d
diff --git a/src/arch/dalvik/opdefs/invoke_75.d b/plugins/dalvik/opdefs/invoke_75.d
index e886dad..e886dad 100644
--- a/src/arch/dalvik/opdefs/invoke_75.d
+++ b/plugins/dalvik/opdefs/invoke_75.d
diff --git a/src/arch/dalvik/opdefs/invoke_76.d b/plugins/dalvik/opdefs/invoke_76.d
index 8156689..8156689 100644
--- a/src/arch/dalvik/opdefs/invoke_76.d
+++ b/plugins/dalvik/opdefs/invoke_76.d
diff --git a/src/arch/dalvik/opdefs/invoke_77.d b/plugins/dalvik/opdefs/invoke_77.d
index b5707e2..b5707e2 100644
--- a/src/arch/dalvik/opdefs/invoke_77.d
+++ b/plugins/dalvik/opdefs/invoke_77.d
diff --git a/src/arch/dalvik/opdefs/invoke_78.d b/plugins/dalvik/opdefs/invoke_78.d
index 5589b38..5589b38 100644
--- a/src/arch/dalvik/opdefs/invoke_78.d
+++ b/plugins/dalvik/opdefs/invoke_78.d
diff --git a/src/arch/dalvik/opdefs/iput_59.d b/plugins/dalvik/opdefs/iput_59.d
index fd17db4..fd17db4 100644
--- a/src/arch/dalvik/opdefs/iput_59.d
+++ b/plugins/dalvik/opdefs/iput_59.d
diff --git a/src/arch/dalvik/opdefs/iput_5a.d b/plugins/dalvik/opdefs/iput_5a.d
index 509868c..509868c 100644
--- a/src/arch/dalvik/opdefs/iput_5a.d
+++ b/plugins/dalvik/opdefs/iput_5a.d
diff --git a/src/arch/dalvik/opdefs/iput_5b.d b/plugins/dalvik/opdefs/iput_5b.d
index 9ad7500..9ad7500 100644
--- a/src/arch/dalvik/opdefs/iput_5b.d
+++ b/plugins/dalvik/opdefs/iput_5b.d
diff --git a/src/arch/dalvik/opdefs/iput_5c.d b/plugins/dalvik/opdefs/iput_5c.d
index 9ae86fa..9ae86fa 100644
--- a/src/arch/dalvik/opdefs/iput_5c.d
+++ b/plugins/dalvik/opdefs/iput_5c.d
diff --git a/src/arch/dalvik/opdefs/iput_5d.d b/plugins/dalvik/opdefs/iput_5d.d
index 8a3830e..8a3830e 100644
--- a/src/arch/dalvik/opdefs/iput_5d.d
+++ b/plugins/dalvik/opdefs/iput_5d.d
diff --git a/src/arch/dalvik/opdefs/iput_5e.d b/plugins/dalvik/opdefs/iput_5e.d
index 5120675..5120675 100644
--- a/src/arch/dalvik/opdefs/iput_5e.d
+++ b/plugins/dalvik/opdefs/iput_5e.d
diff --git a/src/arch/dalvik/opdefs/iput_5f.d b/plugins/dalvik/opdefs/iput_5f.d
index 7fe2d80..7fe2d80 100644
--- a/src/arch/dalvik/opdefs/iput_5f.d
+++ b/plugins/dalvik/opdefs/iput_5f.d
diff --git a/src/arch/dalvik/opdefs/monitor_1d.d b/plugins/dalvik/opdefs/monitor_1d.d
index ab7ce5f..ab7ce5f 100644
--- a/src/arch/dalvik/opdefs/monitor_1d.d
+++ b/plugins/dalvik/opdefs/monitor_1d.d
diff --git a/src/arch/dalvik/opdefs/monitor_1e.d b/plugins/dalvik/opdefs/monitor_1e.d
index b5b0d20..b5b0d20 100644
--- a/src/arch/dalvik/opdefs/monitor_1e.d
+++ b/plugins/dalvik/opdefs/monitor_1e.d
diff --git a/src/arch/dalvik/opdefs/move_01.d b/plugins/dalvik/opdefs/move_01.d
index caa2a85..caa2a85 100644
--- a/src/arch/dalvik/opdefs/move_01.d
+++ b/plugins/dalvik/opdefs/move_01.d
diff --git a/src/arch/dalvik/opdefs/move_02.d b/plugins/dalvik/opdefs/move_02.d
index c8b96bd..c8b96bd 100644
--- a/src/arch/dalvik/opdefs/move_02.d
+++ b/plugins/dalvik/opdefs/move_02.d
diff --git a/src/arch/dalvik/opdefs/move_03.d b/plugins/dalvik/opdefs/move_03.d
index 6957de7..6957de7 100644
--- a/src/arch/dalvik/opdefs/move_03.d
+++ b/plugins/dalvik/opdefs/move_03.d
diff --git a/src/arch/dalvik/opdefs/move_04.d b/plugins/dalvik/opdefs/move_04.d
index 57196cc..57196cc 100644
--- a/src/arch/dalvik/opdefs/move_04.d
+++ b/plugins/dalvik/opdefs/move_04.d
diff --git a/src/arch/dalvik/opdefs/move_05.d b/plugins/dalvik/opdefs/move_05.d
index 2b974bb..2b974bb 100644
--- a/src/arch/dalvik/opdefs/move_05.d
+++ b/plugins/dalvik/opdefs/move_05.d
diff --git a/src/arch/dalvik/opdefs/move_06.d b/plugins/dalvik/opdefs/move_06.d
index 4acaf62..4acaf62 100644
--- a/src/arch/dalvik/opdefs/move_06.d
+++ b/plugins/dalvik/opdefs/move_06.d
diff --git a/src/arch/dalvik/opdefs/move_07.d b/plugins/dalvik/opdefs/move_07.d
index cde3102..cde3102 100644
--- a/src/arch/dalvik/opdefs/move_07.d
+++ b/plugins/dalvik/opdefs/move_07.d
diff --git a/src/arch/dalvik/opdefs/move_08.d b/plugins/dalvik/opdefs/move_08.d
index aba0cad..aba0cad 100644
--- a/src/arch/dalvik/opdefs/move_08.d
+++ b/plugins/dalvik/opdefs/move_08.d
diff --git a/src/arch/dalvik/opdefs/move_09.d b/plugins/dalvik/opdefs/move_09.d
index 3bf6a65..3bf6a65 100644
--- a/src/arch/dalvik/opdefs/move_09.d
+++ b/plugins/dalvik/opdefs/move_09.d
diff --git a/src/arch/dalvik/opdefs/move_0a.d b/plugins/dalvik/opdefs/move_0a.d
index b6a185a..b6a185a 100644
--- a/src/arch/dalvik/opdefs/move_0a.d
+++ b/plugins/dalvik/opdefs/move_0a.d
diff --git a/src/arch/dalvik/opdefs/move_0b.d b/plugins/dalvik/opdefs/move_0b.d
index d266cb8..d266cb8 100644
--- a/src/arch/dalvik/opdefs/move_0b.d
+++ b/plugins/dalvik/opdefs/move_0b.d
diff --git a/src/arch/dalvik/opdefs/move_0c.d b/plugins/dalvik/opdefs/move_0c.d
index 8e6f67f..8e6f67f 100644
--- a/src/arch/dalvik/opdefs/move_0c.d
+++ b/plugins/dalvik/opdefs/move_0c.d
diff --git a/src/arch/dalvik/opdefs/move_0d.d b/plugins/dalvik/opdefs/move_0d.d
index f442006..f442006 100644
--- a/src/arch/dalvik/opdefs/move_0d.d
+++ b/plugins/dalvik/opdefs/move_0d.d
diff --git a/src/arch/dalvik/opdefs/mul_92.d b/plugins/dalvik/opdefs/mul_92.d
index 83b5cac..83b5cac 100644
--- a/src/arch/dalvik/opdefs/mul_92.d
+++ b/plugins/dalvik/opdefs/mul_92.d
diff --git a/src/arch/dalvik/opdefs/mul_9d.d b/plugins/dalvik/opdefs/mul_9d.d
index ecc216d..ecc216d 100644
--- a/src/arch/dalvik/opdefs/mul_9d.d
+++ b/plugins/dalvik/opdefs/mul_9d.d
diff --git a/src/arch/dalvik/opdefs/mul_a8.d b/plugins/dalvik/opdefs/mul_a8.d
index 63e51e5..63e51e5 100644
--- a/src/arch/dalvik/opdefs/mul_a8.d
+++ b/plugins/dalvik/opdefs/mul_a8.d
diff --git a/src/arch/dalvik/opdefs/mul_ad.d b/plugins/dalvik/opdefs/mul_ad.d
index 17f950c..17f950c 100644
--- a/src/arch/dalvik/opdefs/mul_ad.d
+++ b/plugins/dalvik/opdefs/mul_ad.d
diff --git a/src/arch/dalvik/opdefs/mul_b2.d b/plugins/dalvik/opdefs/mul_b2.d
index a7b917c..a7b917c 100644
--- a/src/arch/dalvik/opdefs/mul_b2.d
+++ b/plugins/dalvik/opdefs/mul_b2.d
diff --git a/src/arch/dalvik/opdefs/mul_bd.d b/plugins/dalvik/opdefs/mul_bd.d
index 8ce23b1..8ce23b1 100644
--- a/src/arch/dalvik/opdefs/mul_bd.d
+++ b/plugins/dalvik/opdefs/mul_bd.d
diff --git a/src/arch/dalvik/opdefs/mul_c8.d b/plugins/dalvik/opdefs/mul_c8.d
index 1d17cc1..1d17cc1 100644
--- a/src/arch/dalvik/opdefs/mul_c8.d
+++ b/plugins/dalvik/opdefs/mul_c8.d
diff --git a/src/arch/dalvik/opdefs/mul_cd.d b/plugins/dalvik/opdefs/mul_cd.d
index 1816780..1816780 100644
--- a/src/arch/dalvik/opdefs/mul_cd.d
+++ b/plugins/dalvik/opdefs/mul_cd.d
diff --git a/src/arch/dalvik/opdefs/mul_d2.d b/plugins/dalvik/opdefs/mul_d2.d
index 998ecd7..998ecd7 100644
--- a/src/arch/dalvik/opdefs/mul_d2.d
+++ b/plugins/dalvik/opdefs/mul_d2.d
diff --git a/src/arch/dalvik/opdefs/mul_da.d b/plugins/dalvik/opdefs/mul_da.d
index 4c1a264..4c1a264 100644
--- a/src/arch/dalvik/opdefs/mul_da.d
+++ b/plugins/dalvik/opdefs/mul_da.d
diff --git a/src/arch/dalvik/opdefs/neg_7b.d b/plugins/dalvik/opdefs/neg_7b.d
index c8ec7df..c8ec7df 100644
--- a/src/arch/dalvik/opdefs/neg_7b.d
+++ b/plugins/dalvik/opdefs/neg_7b.d
diff --git a/src/arch/dalvik/opdefs/neg_7d.d b/plugins/dalvik/opdefs/neg_7d.d
index 3d442c3..3d442c3 100644
--- a/src/arch/dalvik/opdefs/neg_7d.d
+++ b/plugins/dalvik/opdefs/neg_7d.d
diff --git a/src/arch/dalvik/opdefs/neg_7f.d b/plugins/dalvik/opdefs/neg_7f.d
index d30ede6..d30ede6 100644
--- a/src/arch/dalvik/opdefs/neg_7f.d
+++ b/plugins/dalvik/opdefs/neg_7f.d
diff --git a/src/arch/dalvik/opdefs/neg_80.d b/plugins/dalvik/opdefs/neg_80.d
index 49d6bdd..49d6bdd 100644
--- a/src/arch/dalvik/opdefs/neg_80.d
+++ b/plugins/dalvik/opdefs/neg_80.d
diff --git a/src/arch/dalvik/opdefs/new_22.d b/plugins/dalvik/opdefs/new_22.d
index 4af913c..4af913c 100644
--- a/src/arch/dalvik/opdefs/new_22.d
+++ b/plugins/dalvik/opdefs/new_22.d
diff --git a/src/arch/dalvik/opdefs/new_23.d b/plugins/dalvik/opdefs/new_23.d
index 0a6a863..0a6a863 100644
--- a/src/arch/dalvik/opdefs/new_23.d
+++ b/plugins/dalvik/opdefs/new_23.d
diff --git a/src/arch/dalvik/opdefs/nop_00.d b/plugins/dalvik/opdefs/nop_00.d
index d10d439..d10d439 100644
--- a/src/arch/dalvik/opdefs/nop_00.d
+++ b/plugins/dalvik/opdefs/nop_00.d
diff --git a/src/arch/dalvik/opdefs/not_7c.d b/plugins/dalvik/opdefs/not_7c.d
index d52ad8c..d52ad8c 100644
--- a/src/arch/dalvik/opdefs/not_7c.d
+++ b/plugins/dalvik/opdefs/not_7c.d
diff --git a/src/arch/dalvik/opdefs/not_7e.d b/plugins/dalvik/opdefs/not_7e.d
index 4291d7a..4291d7a 100644
--- a/src/arch/dalvik/opdefs/not_7e.d
+++ b/plugins/dalvik/opdefs/not_7e.d
diff --git a/src/arch/dalvik/opdefs/or_96.d b/plugins/dalvik/opdefs/or_96.d
index 62f24a5..62f24a5 100644
--- a/src/arch/dalvik/opdefs/or_96.d
+++ b/plugins/dalvik/opdefs/or_96.d
diff --git a/src/arch/dalvik/opdefs/or_a1.d b/plugins/dalvik/opdefs/or_a1.d
index 2867a81..2867a81 100644
--- a/src/arch/dalvik/opdefs/or_a1.d
+++ b/plugins/dalvik/opdefs/or_a1.d
diff --git a/src/arch/dalvik/opdefs/or_b6.d b/plugins/dalvik/opdefs/or_b6.d
index 3d56801..3d56801 100644
--- a/src/arch/dalvik/opdefs/or_b6.d
+++ b/plugins/dalvik/opdefs/or_b6.d
diff --git a/src/arch/dalvik/opdefs/or_c1.d b/plugins/dalvik/opdefs/or_c1.d
index 8d13da3..8d13da3 100644
--- a/src/arch/dalvik/opdefs/or_c1.d
+++ b/plugins/dalvik/opdefs/or_c1.d
diff --git a/src/arch/dalvik/opdefs/or_d6.d b/plugins/dalvik/opdefs/or_d6.d
index 71766a3..71766a3 100644
--- a/src/arch/dalvik/opdefs/or_d6.d
+++ b/plugins/dalvik/opdefs/or_d6.d
diff --git a/src/arch/dalvik/opdefs/or_de.d b/plugins/dalvik/opdefs/or_de.d
index 1c293a5..1c293a5 100644
--- a/src/arch/dalvik/opdefs/or_de.d
+++ b/plugins/dalvik/opdefs/or_de.d
diff --git a/src/arch/dalvik/opdefs/rem_94.d b/plugins/dalvik/opdefs/rem_94.d
index 9238d14..9238d14 100644
--- a/src/arch/dalvik/opdefs/rem_94.d
+++ b/plugins/dalvik/opdefs/rem_94.d
diff --git a/src/arch/dalvik/opdefs/rem_9f.d b/plugins/dalvik/opdefs/rem_9f.d
index 6aef568..6aef568 100644
--- a/src/arch/dalvik/opdefs/rem_9f.d
+++ b/plugins/dalvik/opdefs/rem_9f.d
diff --git a/src/arch/dalvik/opdefs/rem_aa.d b/plugins/dalvik/opdefs/rem_aa.d
index 71a0d8b..71a0d8b 100644
--- a/src/arch/dalvik/opdefs/rem_aa.d
+++ b/plugins/dalvik/opdefs/rem_aa.d
diff --git a/src/arch/dalvik/opdefs/rem_af.d b/plugins/dalvik/opdefs/rem_af.d
index dc092a1..dc092a1 100644
--- a/src/arch/dalvik/opdefs/rem_af.d
+++ b/plugins/dalvik/opdefs/rem_af.d
diff --git a/src/arch/dalvik/opdefs/rem_b4.d b/plugins/dalvik/opdefs/rem_b4.d
index fada523..fada523 100644
--- a/src/arch/dalvik/opdefs/rem_b4.d
+++ b/plugins/dalvik/opdefs/rem_b4.d
diff --git a/src/arch/dalvik/opdefs/rem_bf.d b/plugins/dalvik/opdefs/rem_bf.d
index b6b0997..b6b0997 100644
--- a/src/arch/dalvik/opdefs/rem_bf.d
+++ b/plugins/dalvik/opdefs/rem_bf.d
diff --git a/src/arch/dalvik/opdefs/rem_ca.d b/plugins/dalvik/opdefs/rem_ca.d
index 3c6d287..3c6d287 100644
--- a/src/arch/dalvik/opdefs/rem_ca.d
+++ b/plugins/dalvik/opdefs/rem_ca.d
diff --git a/src/arch/dalvik/opdefs/rem_cf.d b/plugins/dalvik/opdefs/rem_cf.d
index 1881502..1881502 100644
--- a/src/arch/dalvik/opdefs/rem_cf.d
+++ b/plugins/dalvik/opdefs/rem_cf.d
diff --git a/src/arch/dalvik/opdefs/rem_d4.d b/plugins/dalvik/opdefs/rem_d4.d
index 84d12b8..84d12b8 100644
--- a/src/arch/dalvik/opdefs/rem_d4.d
+++ b/plugins/dalvik/opdefs/rem_d4.d
diff --git a/src/arch/dalvik/opdefs/rem_dc.d b/plugins/dalvik/opdefs/rem_dc.d
index f70f9e9..f70f9e9 100644
--- a/src/arch/dalvik/opdefs/rem_dc.d
+++ b/plugins/dalvik/opdefs/rem_dc.d
diff --git a/src/arch/dalvik/opdefs/return_0e.d b/plugins/dalvik/opdefs/return_0e.d
index 98fa1a8..98fa1a8 100644
--- a/src/arch/dalvik/opdefs/return_0e.d
+++ b/plugins/dalvik/opdefs/return_0e.d
diff --git a/src/arch/dalvik/opdefs/return_0f.d b/plugins/dalvik/opdefs/return_0f.d
index 7e681ae..7e681ae 100644
--- a/src/arch/dalvik/opdefs/return_0f.d
+++ b/plugins/dalvik/opdefs/return_0f.d
diff --git a/src/arch/dalvik/opdefs/return_10.d b/plugins/dalvik/opdefs/return_10.d
index 644760c..644760c 100644
--- a/src/arch/dalvik/opdefs/return_10.d
+++ b/plugins/dalvik/opdefs/return_10.d
diff --git a/src/arch/dalvik/opdefs/return_11.d b/plugins/dalvik/opdefs/return_11.d
index b8e4e60..b8e4e60 100644
--- a/src/arch/dalvik/opdefs/return_11.d
+++ b/plugins/dalvik/opdefs/return_11.d
diff --git a/src/arch/dalvik/opdefs/rsub_d1.d b/plugins/dalvik/opdefs/rsub_d1.d
index 0d05c84..0d05c84 100644
--- a/src/arch/dalvik/opdefs/rsub_d1.d
+++ b/plugins/dalvik/opdefs/rsub_d1.d
diff --git a/src/arch/dalvik/opdefs/rsub_d9.d b/plugins/dalvik/opdefs/rsub_d9.d
index 0f2f656..0f2f656 100644
--- a/src/arch/dalvik/opdefs/rsub_d9.d
+++ b/plugins/dalvik/opdefs/rsub_d9.d
diff --git a/src/arch/dalvik/opdefs/sget_60.d b/plugins/dalvik/opdefs/sget_60.d
index 90090a2..90090a2 100644
--- a/src/arch/dalvik/opdefs/sget_60.d
+++ b/plugins/dalvik/opdefs/sget_60.d
diff --git a/src/arch/dalvik/opdefs/sget_61.d b/plugins/dalvik/opdefs/sget_61.d
index c3f132c..c3f132c 100644
--- a/src/arch/dalvik/opdefs/sget_61.d
+++ b/plugins/dalvik/opdefs/sget_61.d
diff --git a/src/arch/dalvik/opdefs/sget_62.d b/plugins/dalvik/opdefs/sget_62.d
index 97d41d9..97d41d9 100644
--- a/src/arch/dalvik/opdefs/sget_62.d
+++ b/plugins/dalvik/opdefs/sget_62.d
diff --git a/src/arch/dalvik/opdefs/sget_63.d b/plugins/dalvik/opdefs/sget_63.d
index 0dca873..0dca873 100644
--- a/src/arch/dalvik/opdefs/sget_63.d
+++ b/plugins/dalvik/opdefs/sget_63.d
diff --git a/src/arch/dalvik/opdefs/sget_64.d b/plugins/dalvik/opdefs/sget_64.d
index 507420e..507420e 100644
--- a/src/arch/dalvik/opdefs/sget_64.d
+++ b/plugins/dalvik/opdefs/sget_64.d
diff --git a/src/arch/dalvik/opdefs/sget_65.d b/plugins/dalvik/opdefs/sget_65.d
index 5236314..5236314 100644
--- a/src/arch/dalvik/opdefs/sget_65.d
+++ b/plugins/dalvik/opdefs/sget_65.d
diff --git a/src/arch/dalvik/opdefs/sget_66.d b/plugins/dalvik/opdefs/sget_66.d
index 9f8b4fa..9f8b4fa 100644
--- a/src/arch/dalvik/opdefs/sget_66.d
+++ b/plugins/dalvik/opdefs/sget_66.d
diff --git a/src/arch/dalvik/opdefs/shl_98.d b/plugins/dalvik/opdefs/shl_98.d
index bfb92bd..bfb92bd 100644
--- a/src/arch/dalvik/opdefs/shl_98.d
+++ b/plugins/dalvik/opdefs/shl_98.d
diff --git a/src/arch/dalvik/opdefs/shl_a3.d b/plugins/dalvik/opdefs/shl_a3.d
index c3772b0..c3772b0 100644
--- a/src/arch/dalvik/opdefs/shl_a3.d
+++ b/plugins/dalvik/opdefs/shl_a3.d
diff --git a/src/arch/dalvik/opdefs/shl_b8.d b/plugins/dalvik/opdefs/shl_b8.d
index 70f99e1..70f99e1 100644
--- a/src/arch/dalvik/opdefs/shl_b8.d
+++ b/plugins/dalvik/opdefs/shl_b8.d
diff --git a/src/arch/dalvik/opdefs/shl_c3.d b/plugins/dalvik/opdefs/shl_c3.d
index 94d35e5..94d35e5 100644
--- a/src/arch/dalvik/opdefs/shl_c3.d
+++ b/plugins/dalvik/opdefs/shl_c3.d
diff --git a/src/arch/dalvik/opdefs/shl_e0.d b/plugins/dalvik/opdefs/shl_e0.d
index c5c8d50..c5c8d50 100644
--- a/src/arch/dalvik/opdefs/shl_e0.d
+++ b/plugins/dalvik/opdefs/shl_e0.d
diff --git a/src/arch/dalvik/opdefs/shr_99.d b/plugins/dalvik/opdefs/shr_99.d
index 203e4d5..203e4d5 100644
--- a/src/arch/dalvik/opdefs/shr_99.d
+++ b/plugins/dalvik/opdefs/shr_99.d
diff --git a/src/arch/dalvik/opdefs/shr_a4.d b/plugins/dalvik/opdefs/shr_a4.d
index 16e07a6..16e07a6 100644
--- a/src/arch/dalvik/opdefs/shr_a4.d
+++ b/plugins/dalvik/opdefs/shr_a4.d
diff --git a/src/arch/dalvik/opdefs/shr_b9.d b/plugins/dalvik/opdefs/shr_b9.d
index 5f48795..5f48795 100644
--- a/src/arch/dalvik/opdefs/shr_b9.d
+++ b/plugins/dalvik/opdefs/shr_b9.d
diff --git a/src/arch/dalvik/opdefs/shr_c4.d b/plugins/dalvik/opdefs/shr_c4.d
index 80cbfee..80cbfee 100644
--- a/src/arch/dalvik/opdefs/shr_c4.d
+++ b/plugins/dalvik/opdefs/shr_c4.d
diff --git a/src/arch/dalvik/opdefs/shr_e1.d b/plugins/dalvik/opdefs/shr_e1.d
index 38a30dc..38a30dc 100644
--- a/src/arch/dalvik/opdefs/shr_e1.d
+++ b/plugins/dalvik/opdefs/shr_e1.d
diff --git a/src/arch/dalvik/opdefs/sput_67.d b/plugins/dalvik/opdefs/sput_67.d
index 149337a..149337a 100644
--- a/src/arch/dalvik/opdefs/sput_67.d
+++ b/plugins/dalvik/opdefs/sput_67.d
diff --git a/src/arch/dalvik/opdefs/sput_68.d b/plugins/dalvik/opdefs/sput_68.d
index 3709445..3709445 100644
--- a/src/arch/dalvik/opdefs/sput_68.d
+++ b/plugins/dalvik/opdefs/sput_68.d
diff --git a/src/arch/dalvik/opdefs/sput_69.d b/plugins/dalvik/opdefs/sput_69.d
index 89302eb..89302eb 100644
--- a/src/arch/dalvik/opdefs/sput_69.d
+++ b/plugins/dalvik/opdefs/sput_69.d
diff --git a/src/arch/dalvik/opdefs/sput_6a.d b/plugins/dalvik/opdefs/sput_6a.d
index 91f5f4f..91f5f4f 100644
--- a/src/arch/dalvik/opdefs/sput_6a.d
+++ b/plugins/dalvik/opdefs/sput_6a.d
diff --git a/src/arch/dalvik/opdefs/sput_6b.d b/plugins/dalvik/opdefs/sput_6b.d
index 72338a0..72338a0 100644
--- a/src/arch/dalvik/opdefs/sput_6b.d
+++ b/plugins/dalvik/opdefs/sput_6b.d
diff --git a/src/arch/dalvik/opdefs/sput_6c.d b/plugins/dalvik/opdefs/sput_6c.d
index 1f0a7c5..1f0a7c5 100644
--- a/src/arch/dalvik/opdefs/sput_6c.d
+++ b/plugins/dalvik/opdefs/sput_6c.d
diff --git a/src/arch/dalvik/opdefs/sput_6d.d b/plugins/dalvik/opdefs/sput_6d.d
index d164858..d164858 100644
--- a/src/arch/dalvik/opdefs/sput_6d.d
+++ b/plugins/dalvik/opdefs/sput_6d.d
diff --git a/src/arch/dalvik/opdefs/sub_91.d b/plugins/dalvik/opdefs/sub_91.d
index 34fd476..34fd476 100644
--- a/src/arch/dalvik/opdefs/sub_91.d
+++ b/plugins/dalvik/opdefs/sub_91.d
diff --git a/src/arch/dalvik/opdefs/sub_9c.d b/plugins/dalvik/opdefs/sub_9c.d
index 566cb80..566cb80 100644
--- a/src/arch/dalvik/opdefs/sub_9c.d
+++ b/plugins/dalvik/opdefs/sub_9c.d
diff --git a/src/arch/dalvik/opdefs/sub_a7.d b/plugins/dalvik/opdefs/sub_a7.d
index 22851c6..22851c6 100644
--- a/src/arch/dalvik/opdefs/sub_a7.d
+++ b/plugins/dalvik/opdefs/sub_a7.d
diff --git a/src/arch/dalvik/opdefs/sub_ac.d b/plugins/dalvik/opdefs/sub_ac.d
index c818423..c818423 100644
--- a/src/arch/dalvik/opdefs/sub_ac.d
+++ b/plugins/dalvik/opdefs/sub_ac.d
diff --git a/src/arch/dalvik/opdefs/sub_b1.d b/plugins/dalvik/opdefs/sub_b1.d
index 4102367..4102367 100644
--- a/src/arch/dalvik/opdefs/sub_b1.d
+++ b/plugins/dalvik/opdefs/sub_b1.d
diff --git a/src/arch/dalvik/opdefs/sub_bc.d b/plugins/dalvik/opdefs/sub_bc.d
index b0a22ae..b0a22ae 100644
--- a/src/arch/dalvik/opdefs/sub_bc.d
+++ b/plugins/dalvik/opdefs/sub_bc.d
diff --git a/src/arch/dalvik/opdefs/sub_c7.d b/plugins/dalvik/opdefs/sub_c7.d
index dc8fd47..dc8fd47 100644
--- a/src/arch/dalvik/opdefs/sub_c7.d
+++ b/plugins/dalvik/opdefs/sub_c7.d
diff --git a/src/arch/dalvik/opdefs/sub_cc.d b/plugins/dalvik/opdefs/sub_cc.d
index d24b702..d24b702 100644
--- a/src/arch/dalvik/opdefs/sub_cc.d
+++ b/plugins/dalvik/opdefs/sub_cc.d
diff --git a/src/arch/dalvik/opdefs/switch_2b.d b/plugins/dalvik/opdefs/switch_2b.d
index 2ff6b33..2ff6b33 100644
--- a/src/arch/dalvik/opdefs/switch_2b.d
+++ b/plugins/dalvik/opdefs/switch_2b.d
diff --git a/src/arch/dalvik/opdefs/switch_2c.d b/plugins/dalvik/opdefs/switch_2c.d
index 0a4d248..0a4d248 100644
--- a/src/arch/dalvik/opdefs/switch_2c.d
+++ b/plugins/dalvik/opdefs/switch_2c.d
diff --git a/src/arch/dalvik/opdefs/throw_27.d b/plugins/dalvik/opdefs/throw_27.d
index 79c71dd..79c71dd 100644
--- a/src/arch/dalvik/opdefs/throw_27.d
+++ b/plugins/dalvik/opdefs/throw_27.d
diff --git a/src/arch/dalvik/opdefs/to_81.d b/plugins/dalvik/opdefs/to_81.d
index e1b45b3..e1b45b3 100644
--- a/src/arch/dalvik/opdefs/to_81.d
+++ b/plugins/dalvik/opdefs/to_81.d
diff --git a/src/arch/dalvik/opdefs/to_82.d b/plugins/dalvik/opdefs/to_82.d
index 4d5e667..4d5e667 100644
--- a/src/arch/dalvik/opdefs/to_82.d
+++ b/plugins/dalvik/opdefs/to_82.d
diff --git a/src/arch/dalvik/opdefs/to_83.d b/plugins/dalvik/opdefs/to_83.d
index 6f764c1..6f764c1 100644
--- a/src/arch/dalvik/opdefs/to_83.d
+++ b/plugins/dalvik/opdefs/to_83.d
diff --git a/src/arch/dalvik/opdefs/to_84.d b/plugins/dalvik/opdefs/to_84.d
index f3076ae..f3076ae 100644
--- a/src/arch/dalvik/opdefs/to_84.d
+++ b/plugins/dalvik/opdefs/to_84.d
diff --git a/src/arch/dalvik/opdefs/to_85.d b/plugins/dalvik/opdefs/to_85.d
index 3ac252c..3ac252c 100644
--- a/src/arch/dalvik/opdefs/to_85.d
+++ b/plugins/dalvik/opdefs/to_85.d
diff --git a/src/arch/dalvik/opdefs/to_86.d b/plugins/dalvik/opdefs/to_86.d
index 80e9a28..80e9a28 100644
--- a/src/arch/dalvik/opdefs/to_86.d
+++ b/plugins/dalvik/opdefs/to_86.d
diff --git a/src/arch/dalvik/opdefs/to_87.d b/plugins/dalvik/opdefs/to_87.d
index 55028e3..55028e3 100644
--- a/src/arch/dalvik/opdefs/to_87.d
+++ b/plugins/dalvik/opdefs/to_87.d
diff --git a/src/arch/dalvik/opdefs/to_88.d b/plugins/dalvik/opdefs/to_88.d
index 2eaa85b..2eaa85b 100644
--- a/src/arch/dalvik/opdefs/to_88.d
+++ b/plugins/dalvik/opdefs/to_88.d
diff --git a/src/arch/dalvik/opdefs/to_89.d b/plugins/dalvik/opdefs/to_89.d
index 147f280..147f280 100644
--- a/src/arch/dalvik/opdefs/to_89.d
+++ b/plugins/dalvik/opdefs/to_89.d
diff --git a/src/arch/dalvik/opdefs/to_8a.d b/plugins/dalvik/opdefs/to_8a.d
index c089942..c089942 100644
--- a/src/arch/dalvik/opdefs/to_8a.d
+++ b/plugins/dalvik/opdefs/to_8a.d
diff --git a/src/arch/dalvik/opdefs/to_8b.d b/plugins/dalvik/opdefs/to_8b.d
index e60ba2f..e60ba2f 100644
--- a/src/arch/dalvik/opdefs/to_8b.d
+++ b/plugins/dalvik/opdefs/to_8b.d
diff --git a/src/arch/dalvik/opdefs/to_8c.d b/plugins/dalvik/opdefs/to_8c.d
index b7ee496..b7ee496 100644
--- a/src/arch/dalvik/opdefs/to_8c.d
+++ b/plugins/dalvik/opdefs/to_8c.d
diff --git a/src/arch/dalvik/opdefs/to_8d.d b/plugins/dalvik/opdefs/to_8d.d
index 28a194e..28a194e 100644
--- a/src/arch/dalvik/opdefs/to_8d.d
+++ b/plugins/dalvik/opdefs/to_8d.d
diff --git a/src/arch/dalvik/opdefs/to_8e.d b/plugins/dalvik/opdefs/to_8e.d
index c8b2598..c8b2598 100644
--- a/src/arch/dalvik/opdefs/to_8e.d
+++ b/plugins/dalvik/opdefs/to_8e.d
diff --git a/src/arch/dalvik/opdefs/to_8f.d b/plugins/dalvik/opdefs/to_8f.d
index 697c102..697c102 100644
--- a/src/arch/dalvik/opdefs/to_8f.d
+++ b/plugins/dalvik/opdefs/to_8f.d
diff --git a/src/arch/dalvik/opdefs/ushr_9a.d b/plugins/dalvik/opdefs/ushr_9a.d
index d3f48ba..d3f48ba 100644
--- a/src/arch/dalvik/opdefs/ushr_9a.d
+++ b/plugins/dalvik/opdefs/ushr_9a.d
diff --git a/src/arch/dalvik/opdefs/ushr_a5.d b/plugins/dalvik/opdefs/ushr_a5.d
index 11578c3..11578c3 100644
--- a/src/arch/dalvik/opdefs/ushr_a5.d
+++ b/plugins/dalvik/opdefs/ushr_a5.d
diff --git a/src/arch/dalvik/opdefs/ushr_ba.d b/plugins/dalvik/opdefs/ushr_ba.d
index d9c0ab7..d9c0ab7 100644
--- a/src/arch/dalvik/opdefs/ushr_ba.d
+++ b/plugins/dalvik/opdefs/ushr_ba.d
diff --git a/src/arch/dalvik/opdefs/ushr_c5.d b/plugins/dalvik/opdefs/ushr_c5.d
index b0117a7..b0117a7 100644
--- a/src/arch/dalvik/opdefs/ushr_c5.d
+++ b/plugins/dalvik/opdefs/ushr_c5.d
diff --git a/src/arch/dalvik/opdefs/ushr_e2.d b/plugins/dalvik/opdefs/ushr_e2.d
index 5ade4f7..5ade4f7 100644
--- a/src/arch/dalvik/opdefs/ushr_e2.d
+++ b/plugins/dalvik/opdefs/ushr_e2.d
diff --git a/src/arch/dalvik/opdefs/xor_97.d b/plugins/dalvik/opdefs/xor_97.d
index 3bdfc05..3bdfc05 100644
--- a/src/arch/dalvik/opdefs/xor_97.d
+++ b/plugins/dalvik/opdefs/xor_97.d
diff --git a/src/arch/dalvik/opdefs/xor_a2.d b/plugins/dalvik/opdefs/xor_a2.d
index d651f66..d651f66 100644
--- a/src/arch/dalvik/opdefs/xor_a2.d
+++ b/plugins/dalvik/opdefs/xor_a2.d
diff --git a/src/arch/dalvik/opdefs/xor_b7.d b/plugins/dalvik/opdefs/xor_b7.d
index b42da76..b42da76 100644
--- a/src/arch/dalvik/opdefs/xor_b7.d
+++ b/plugins/dalvik/opdefs/xor_b7.d
diff --git a/src/arch/dalvik/opdefs/xor_c2.d b/plugins/dalvik/opdefs/xor_c2.d
index 3fd2660..3fd2660 100644
--- a/src/arch/dalvik/opdefs/xor_c2.d
+++ b/plugins/dalvik/opdefs/xor_c2.d
diff --git a/src/arch/dalvik/opdefs/xor_d7.d b/plugins/dalvik/opdefs/xor_d7.d
index 2351a21..2351a21 100644
--- a/src/arch/dalvik/opdefs/xor_d7.d
+++ b/plugins/dalvik/opdefs/xor_d7.d
diff --git a/src/arch/dalvik/opdefs/xor_df.d b/plugins/dalvik/opdefs/xor_df.d
index 04443f7..04443f7 100644
--- a/src/arch/dalvik/opdefs/xor_df.d
+++ b/plugins/dalvik/opdefs/xor_df.d
diff --git a/src/arch/dalvik/operand.c b/plugins/dalvik/operand.c
index e37a0bb..e37a0bb 100644
--- a/src/arch/dalvik/operand.c
+++ b/plugins/dalvik/operand.c
diff --git a/src/arch/dalvik/operand.h b/plugins/dalvik/operand.h
index d561bc1..b34c87c 100644
--- a/src/arch/dalvik/operand.h
+++ b/plugins/dalvik/operand.h
@@ -25,11 +25,13 @@
 #define _ARCH_DALVIK_OPERAND_H
 
 
+#include <arch/instruction.h>
+#include <plugins/dex/format.h>
+
+
 #include "operands/args.h"
 #include "operands/pool.h"
 #include "operands/register.h"
-#include "../instruction.h"
-#include "../../format/dex/dex.h"
 
 
 
diff --git a/plugins/dalvik/operands/Makefile.am b/plugins/dalvik/operands/Makefile.am
new file mode 100644
index 0000000..2c2ba27
--- /dev/null
+++ b/plugins/dalvik/operands/Makefile.am
@@ -0,0 +1,17 @@
+
+noinst_LTLIBRARIES = libdalvikoperands.la
+
+libdalvikoperands_la_SOURCES =			\
+	args.h args.c						\
+	pool.h pool.c						\
+	register.h register.c
+
+libdalvik_la_CFLAGS = $(AM_CFLAGS)
+
+
+AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
+
+AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
+
+
+SUBDIRS = 
diff --git a/src/arch/dalvik/operands/args.c b/plugins/dalvik/operands/args.c
index f33f887..a4f4b11 100644
--- a/src/arch/dalvik/operands/args.c
+++ b/plugins/dalvik/operands/args.c
@@ -28,8 +28,8 @@
 #include <malloc.h>
 
 
-#include "../../operand-int.h"
-#include "../../../common/sort.h"
+#include <arch/operand-int.h>
+#include <common/sort.h>
 
 
 
diff --git a/src/arch/dalvik/operands/args.h b/plugins/dalvik/operands/args.h
index 993e551..354333d 100644
--- a/src/arch/dalvik/operands/args.h
+++ b/plugins/dalvik/operands/args.h
@@ -28,7 +28,7 @@
 #include <glib-object.h>
 
 
-#include "../../operand.h"
+#include <arch/operand.h>
 
 
 
diff --git a/src/arch/dalvik/operands/pool.c b/plugins/dalvik/operands/pool.c
index d4d3a51..a6dc5f2 100644
--- a/src/arch/dalvik/operands/pool.c
+++ b/plugins/dalvik/operands/pool.c
@@ -31,9 +31,9 @@
 #include <i18n.h>
 
 
-#include "../../operand-int.h"
-#include "../../../common/sort.h"
-#include "../../../format/dex/pool.h"
+#include <arch/operand-int.h>
+#include <common/sort.h>
+#include <plugins/dex/pool.h>
 
 
 
diff --git a/src/arch/dalvik/operands/pool.h b/plugins/dalvik/operands/pool.h
index 3319f66..3045a2c 100644
--- a/src/arch/dalvik/operands/pool.h
+++ b/plugins/dalvik/operands/pool.h
@@ -29,9 +29,9 @@
 #include <stdint.h>
 
 
-#include "../../operand.h"
-#include "../../../common/endianness.h"
-#include "../../../format/dex/pool.h"
+#include <arch/operand.h>
+#include <common/endianness.h>
+#include <plugins/dex/pool.h>
 
 
 
diff --git a/src/arch/dalvik/operands/register.c b/plugins/dalvik/operands/register.c
index 1516e8e..4268252 100644
--- a/src/arch/dalvik/operands/register.c
+++ b/plugins/dalvik/operands/register.c
@@ -24,8 +24,8 @@
 #include "register.h"
 
 
-#include "../../operand-int.h"
-#include "../../register.h"
+#include <arch/operand-int.h>
+#include <arch/register.h>
 
 
 
diff --git a/src/arch/dalvik/operands/register.h b/plugins/dalvik/operands/register.h
index 5798e5c..f1dec72 100644
--- a/src/arch/dalvik/operands/register.h
+++ b/plugins/dalvik/operands/register.h
@@ -29,9 +29,11 @@
 #include <stdbool.h>
 
 
+#include <analysis/content.h>
+#include <arch/operand.h>
+
+
 #include "../register.h"
-#include "../../operand.h"
-#include "../../../analysis/content.h"
 
 
 
diff --git a/src/arch/dalvik/post.h b/plugins/dalvik/post.h
index a0520e4..63d35c3 100644
--- a/src/arch/dalvik/post.h
+++ b/plugins/dalvik/post.h
@@ -25,7 +25,7 @@
 #define _ARCH_DALVIK_POST_H
 
 
-#include "../post.h"
+#include <arch/post.h>
 
 
 
diff --git a/src/arch/dalvik/processor.c b/plugins/dalvik/processor.c
index d35f0b6..16d6644 100644
--- a/src/arch/dalvik/processor.c
+++ b/plugins/dalvik/processor.c
@@ -27,13 +27,15 @@
 #include <assert.h>
 
 
+#include <arch/processor-int.h>
+#include <plugins/dex/format.h>
+
+
 #include "context.h"
 #include "instruction.h"
 #include "opcodes/opcodes.h"
 #include "pseudo/fill.h"
 #include "pseudo/switch.h"
-#include "../processor-int.h"
-#include "../../format/dex/dex.h"
 
 
 
diff --git a/src/arch/dalvik/processor.h b/plugins/dalvik/processor.h
index 9b9906d..c6c1278 100644
--- a/src/arch/dalvik/processor.h
+++ b/plugins/dalvik/processor.h
@@ -25,7 +25,7 @@
 #define _ARCH_DALVIK_PROCESSOR_H
 
 
-#include "../processor.h"
+#include <arch/processor.h>
 
 
 
diff --git a/plugins/dalvik/pseudo/Makefile.am b/plugins/dalvik/pseudo/Makefile.am
new file mode 100644
index 0000000..6f49159
--- /dev/null
+++ b/plugins/dalvik/pseudo/Makefile.am
@@ -0,0 +1,15 @@
+
+noinst_LTLIBRARIES = libdalvikpseudo.la
+
+libdalvikpseudo_la_SOURCES =			\
+	fill.h fill.c						\
+	switch.h switch.c
+
+libdalvikpseudo_la_LIBADD = 
+
+libdalvikpseudo_la_CFLAGS = $(AM_CFLAGS)
+
+
+AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
+
+AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
diff --git a/src/arch/dalvik/pseudo/fill.c b/plugins/dalvik/pseudo/fill.c
index dc5683c..dc5683c 100644
--- a/src/arch/dalvik/pseudo/fill.c
+++ b/plugins/dalvik/pseudo/fill.c
diff --git a/src/arch/dalvik/pseudo/fill.h b/plugins/dalvik/pseudo/fill.h
index 2a63df9..2a63df9 100644
--- a/src/arch/dalvik/pseudo/fill.h
+++ b/plugins/dalvik/pseudo/fill.h
diff --git a/src/arch/dalvik/pseudo/switch.c b/plugins/dalvik/pseudo/switch.c
index 90cff87..90cff87 100644
--- a/src/arch/dalvik/pseudo/switch.c
+++ b/plugins/dalvik/pseudo/switch.c
diff --git a/src/arch/dalvik/pseudo/switch.h b/plugins/dalvik/pseudo/switch.h
index d672f86..d672f86 100644
--- a/src/arch/dalvik/pseudo/switch.h
+++ b/plugins/dalvik/pseudo/switch.h
diff --git a/src/arch/dalvik/register.c b/plugins/dalvik/register.c
index 068b925..00e9757 100644
--- a/src/arch/dalvik/register.c
+++ b/plugins/dalvik/register.c
@@ -27,8 +27,8 @@
 #include <stdio.h>
 
 
-#include "../register-int.h"
-#include "../../common/sort.h"
+#include <arch/register-int.h>
+#include <common/sort.h>
 
 
 
diff --git a/src/arch/dalvik/register.h b/plugins/dalvik/register.h
index b20bdf5..460edd7 100644
--- a/src/arch/dalvik/register.h
+++ b/plugins/dalvik/register.h
@@ -29,8 +29,7 @@
 #include <stdbool.h>
 
 
-#include "../archbase.h"
-#include "../../glibext/gbufferline.h"
+#include <arch/archbase.h>
 
 
 
diff --git a/plugins/dex/Makefile.am b/plugins/dex/Makefile.am
new file mode 100755
index 0000000..a17b0f2
--- /dev/null
+++ b/plugins/dex/Makefile.am
@@ -0,0 +1,25 @@
+
+lib_LTLIBRARIES = libdex.la
+
+libdex_la_SOURCES =						\
+	core.h core.c						\
+	class.h class.c						\
+	dex-int.h dex-int.c					\
+	dex_def.h							\
+	format.h format.c					\
+	loading.h loading.c					\
+	method.h method.c					\
+	pool.h pool.c
+
+libdex_la_LIBADD =						\
+	python/libdexpython.la
+
+libdex_la_LDFLAGS = 					\
+	$(LIBPYTHON_LIBS) $(LIBPYGOBJECT_LIBS)
+
+
+AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
+
+AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
+
+SUBDIRS = python
diff --git a/src/format/dex/class.c b/plugins/dex/class.c
index bb2ae71..bb2ae71 100644
--- a/src/format/dex/class.c
+++ b/plugins/dex/class.c
diff --git a/src/format/dex/class.h b/plugins/dex/class.h
index f829ba6..73dd5df 100644
--- a/src/format/dex/class.h
+++ b/plugins/dex/class.h
@@ -21,14 +21,14 @@
  */
 
 
-#ifndef _FORMAT_DEX_CLASS_H
-#define _FORMAT_DEX_CLASS_H
+#ifndef _PLUGINS_DEX_CLASS_H
+#define _PLUGINS_DEX_CLASS_H
 
 
 #include <glib-object.h>
 
 
-#include "dex.h"
+#include "format.h"
 #include "method.h"
 
 
@@ -86,4 +86,4 @@ const char *g_dex_class_get_source_file(const GDexClass *, const GDexFormat *);
 
 
 
-#endif  /* _FORMAT_DEX_CLASS_H */
+#endif  /* _PLUGINS_DEX_CLASS_H */
diff --git a/plugins/dex/core.c b/plugins/dex/core.c
new file mode 100644
index 0000000..c69904c
--- /dev/null
+++ b/plugins/dex/core.c
@@ -0,0 +1,68 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * core.c - intégration du support du format ELF
+ *
+ * Copyright (C) 2017 Cyrille Bagard
+ *
+ *  This file is part of Chrysalide.
+ *
+ *  Chrysalide is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Chrysalide is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "core.h"
+
+
+#include <core/formats.h>
+#include <plugins/plugin-def.h>
+
+
+#include "format.h"
+#include "python/module.h"
+
+
+
+DEFINE_CHRYSALIDE_PLUGIN("dex", "Add suport for the DEX format", "0.1.0",
+                         RL("PyChrysalide"), AL(PGA_PLUGIN_INIT));
+
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : plugin = greffon à manipuler.                                *
+*                ref    = espace de référencement global.                     *
+*                                                                             *
+*  Description : Prend acte du chargement du greffon.                         *
+*                                                                             *
+*  Retour      : -                                                            *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin)
+{
+    bool result;                            /* Bilan à retourner           */
+
+    result = register_format_matcher(dex_is_matching, NULL);
+
+    if (result)
+        result = register_format_loader("dex", "Dalvik Executable format", g_dex_format_new);
+
+    if (result)
+        result = add_format_dex_module_to_python_module();
+
+    return result;
+
+}
diff --git a/plugins/dex/core.h b/plugins/dex/core.h
new file mode 100644
index 0000000..9852948
--- /dev/null
+++ b/plugins/dex/core.h
@@ -0,0 +1,38 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * core.h - prototypes pour l'intégration du support du format ELF
+ *
+ * Copyright (C) 2017 Cyrille Bagard
+ *
+ *  This file is part of Chrysalide.
+ *
+ *  Chrysalide is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Chrysalide is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef _PLUGINS_DEX_CORE_H
+#define _PLUGINS_DEX_CORE_H
+
+
+#include <plugins/plugin.h>
+#include <plugins/plugin-int.h>
+
+
+
+/* Prend acte du chargement du greffon. */
+G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *);
+
+
+
+#endif  /* _PLUGINS_DEX_CORE_H */
diff --git a/src/format/dex/dex-int.c b/plugins/dex/dex-int.c
index 043d8cc..3f3eccb 100644
--- a/src/format/dex/dex-int.c
+++ b/plugins/dex/dex-int.c
@@ -31,8 +31,8 @@
 #include <i18n.h>
 
 
-#include "../../arch/dalvik/instruction-def.h"
-#include "../../common/endianness.h"
+#include <common/endianness.h>
+#include <plugins/dalvik/instruction-def.h>
 
 
 
diff --git a/src/format/dex/dex-int.h b/plugins/dex/dex-int.h
index c950c16..60d2f4d 100755
--- a/src/format/dex/dex-int.h
+++ b/plugins/dex/dex-int.h
@@ -21,16 +21,16 @@
  */
 
 
-#ifndef _FORMAT_DEX_DEX_INT_H
-#define _FORMAT_DEX_DEX_INT_H
+#ifndef _PLUGINS_DEX_DEX_INT_H
+#define _PLUGINS_DEX_DEX_INT_H
 
 
-#include "class.h"
-#include "dex.h"
-#include "dex_def.h"
-#include "../executable-int.h"
+#include <format/executable-int.h>
 
 
+#include "class.h"
+#include "dex_def.h"
+#include "format.h"
 
 
 
@@ -174,4 +174,4 @@ void reset_dex_switch(dex_switch *);
 
 
 
-#endif  /* _FORMAT_DEX_DEX_INT_H */
+#endif  /* _PLUGINS_DEX_DEX_INT_H */
diff --git a/src/format/dex/dex_def.h b/plugins/dex/dex_def.h
index e1521e8..1d2e0d7 100755
--- a/src/format/dex/dex_def.h
+++ b/plugins/dex/dex_def.h
@@ -21,11 +21,11 @@
  */
 
 
-#ifndef _FORMAT_DEX_DEX_DEF_H
-#define _FORMAT_DEX_DEX_DEF_H
+#ifndef _PLUGINS_DEX_DEX_DEF_H
+#define _PLUGINS_DEX_DEX_DEF_H
 
 
-#include "../../common/leb128.h"
+#include <common/leb128.h>
 
 
 
@@ -324,4 +324,4 @@ typedef union _dex_switch
 
 
 
-#endif  /* _FORMAT_DEX_DEX_DEF_H */
+#endif  /* _PLUGINS_DEX_DEX_DEF_H */
diff --git a/src/format/dex/dex.c b/plugins/dex/format.c
index c2eaece..72d0dd5 100755
--- a/src/format/dex/dex.c
+++ b/plugins/dex/format.c
@@ -1,6 +1,6 @@
 
 /* Chrysalide - Outil d'analyse de fichiers binaires
- * dex.c - support du format DEX
+ * format.c - support du format DEX
  *
  * Copyright (C) 2010-2017 Cyrille Bagard
  *
@@ -21,26 +21,19 @@
  */
 
 
-#include "dex.h"
+#include "format.h"
 
 
 #include <string.h>
 
 
 #include <i18n.h>
+#include <core/global.h>
+#include <plugins/pglist.h>
 
 
 #include "dex-int.h"
 #include "pool.h"
-#include "../../core/global.h"
-#include "../../plugins/pglist.h"
-
-
-
-
-
-
-
 
 
 
diff --git a/src/format/dex/dex.h b/plugins/dex/format.h
index 32bcad8..0398b9c 100755
--- a/src/format/dex/dex.h
+++ b/plugins/dex/format.h
@@ -1,6 +1,6 @@
 
 /* Chrysalide - Outil d'analyse de fichiers binaires
- * dex.h - prototypes pour le support du format DEX
+ * format.h - prototypes pour le support du format DEX
  *
  * Copyright (C) 2010-2017 Cyrille Bagard
  *
@@ -21,8 +21,8 @@
  */
 
 
-#ifndef _FORMAT_DEX_DEX_H
-#define _FORMAT_DEX_DEX_H
+#ifndef _PLUGINS_DEX_FORMAT_H
+#define _PLUGINS_DEX_FORMAT_H
 
 
 #include <glib-object.h>
@@ -30,8 +30,10 @@
 #include <sys/types.h>
 
 
+#include <core/formats.h>
+
+
 #include "dex_def.h"
-#include "../../core/formats.h"
 
 
 
@@ -72,4 +74,4 @@ GDexClass *g_dex_format_get_class(const GDexFormat *, size_t);
 
 
 
-#endif  /* _FORMAT_DEX_DEX_H */
+#endif  /* _PLUGINS_DEX_FORMAT_H */
diff --git a/src/format/dex/loading.c b/plugins/dex/loading.c
index f34c36b..c00d0c5 100644
--- a/src/format/dex/loading.c
+++ b/plugins/dex/loading.c
@@ -25,11 +25,11 @@
 
 
 #include <i18n.h>
+#include <glibext/delayed-int.h>
+#include <gui/panels/log.h>
 
 
 #include "pool.h"
-#include "../../glibext/delayed-int.h"
-#include "../../gui/panels/log.h"
 
 
 
diff --git a/src/format/dex/loading.h b/plugins/dex/loading.h
index 55f6479..612f962 100644
--- a/src/format/dex/loading.h
+++ b/plugins/dex/loading.h
@@ -21,12 +21,14 @@
  */
 
 
-#ifndef _FORMAT_DEX_LOADING_H
-#define _FORMAT_DEX_LOADING_H
+#ifndef _PLUGINS_DEX_LOADING_H
+#define _PLUGINS_DEX_LOADING_H
 
 
-#include "dex.h"
-#include "../../gtkext/gtkstatusstack.h"
+#include <gtkext/gtkstatusstack.h>
+
+
+#include "format.h"
 
 
 
@@ -58,4 +60,4 @@ GDexLoading *g_dex_loading_new(GDexFormat *, uint32_t, uint32_t, activity_id_t,
 
 
 
-#endif  /* _FORMAT_DEX_LOADING_H */
+#endif  /* _PLUGINS_DEX_LOADING_H */
diff --git a/src/format/dex/method.c b/plugins/dex/method.c
index 0f49154..0f49154 100644
--- a/src/format/dex/method.c
+++ b/plugins/dex/method.c
diff --git a/src/format/dex/method.h b/plugins/dex/method.h
index 47e90b8..6716713 100644
--- a/src/format/dex/method.h
+++ b/plugins/dex/method.h
@@ -21,16 +21,18 @@
  */
 
 
-#ifndef _FORMAT_DEX_METHOD_H
-#define _FORMAT_DEX_METHOD_H
+#ifndef _PLUGINS_DEX_METHOD_H
+#define _PLUGINS_DEX_METHOD_H
 
 
 #include <glib-object.h>
 
 
-#include "dex.h"
+#include <analysis/routine.h>
+
+
 #include "dex_def.h"
-#include "../../analysis/routine.h"
+#include "format.h"
 
 
 
@@ -99,4 +101,4 @@ DexVariableIndex g_dex_method_get_variable(const GDexMethod *, uint32_t);
 
 
 
-#endif  /* _FORMAT_DEX_METHOD_H */
+#endif  /* _PLUGINS_DEX_METHOD_H */
diff --git a/src/format/dex/pool.c b/plugins/dex/pool.c
index a561a8f..3c97da3 100644
--- a/src/format/dex/pool.c
+++ b/plugins/dex/pool.c
@@ -29,13 +29,13 @@
 
 
 #include <i18n.h>
+#include <core/global.h>
+#include <format/mangling/demangler.h>
+#include <format/mangling/dex/context.h>
 
 
 #include "dex-int.h"
 #include "loading.h"
-#include "../mangling/demangler.h"
-#include "../mangling/dex/context.h"
-#include "../../core/global.h"
 
 
 
diff --git a/src/format/dex/pool.h b/plugins/dex/pool.h
index 207f88c..56bcd64 100644
--- a/src/format/dex/pool.h
+++ b/plugins/dex/pool.h
@@ -21,15 +21,17 @@
  */
 
 
-#ifndef _FORMAT_DEX_POOL_H
-#define _FORMAT_DEX_POOL_H
+#ifndef _PLUGINS_DEX_POOL_H
+#define _PLUGINS_DEX_POOL_H
+
+
+#include <analysis/routine.h>
+#include <glibext/delayed.h>
 
 
 #include "class.h"
-#include "dex.h"
+#include "format.h"
 #include "method.h"
-#include "../../analysis/routine.h"
-#include "../../glibext/delayed.h"
 
 
 
@@ -69,4 +71,4 @@ GDexClass *get_class_from_dex_pool(GDexFormat *, uint32_t);
 
 
 
-#endif  /* _FORMAT_DEX_POOL_H */
+#endif  /* _PLUGINS_DEX_POOL_H */
diff --git a/plugins/pychrysa/format/dex/Makefile.am b/plugins/dex/python/Makefile.am
index ebf8966..fc6f85e 100644
--- a/plugins/pychrysa/format/dex/Makefile.am
+++ b/plugins/dex/python/Makefile.am
@@ -1,16 +1,16 @@
 
-noinst_LTLIBRARIES = libpychrysaformatdex.la
+noinst_LTLIBRARIES = libdexpython.la
 
-libpychrysaformatdex_la_SOURCES =		\
+libdexpython_la_SOURCES =				\
 	class.h class.c						\
-	dex.h dex.c							\
+	format.h format.c					\
 	module.h module.c
 
 
-libpychrysaformatdex_la_LDFLAGS = 
+libdexpython_la_LDFLAGS = 
 
 
 AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I../../../../src
+	-I$(top_srcdir)/src
 
 AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
diff --git a/plugins/pychrysa/format/dex/class.c b/plugins/dex/python/class.c
index 13b1f2a..ec1c3f7 100644
--- a/plugins/pychrysa/format/dex/class.c
+++ b/plugins/dex/python/class.c
@@ -1,6 +1,6 @@
 
 /* Chrysalide - Outil d'analyse de fichiers binaires
- * class.c - équivalent Python du fichier "format/dex/class.c"
+ * class.c - équivalent Python du fichier "plugins/dex/class.c"
  *
  * Copyright (C) 2012-2017 Cyrille Bagard
  *
@@ -28,10 +28,10 @@
 #include <pygobject.h>
 
 
-#include <format/dex/class.h>
+#include <plugins/pychrysa/helpers.h>
 
 
-#include "../../helpers.h"
+#include "../class.h"
 
 
 
diff --git a/plugins/pychrysa/format/dex/class.h b/plugins/dex/python/class.h
index bd2d2a5..02ec882 100644
--- a/plugins/pychrysa/format/dex/class.h
+++ b/plugins/dex/python/class.h
@@ -1,6 +1,6 @@
 
 /* Chrysalide - Outil d'analyse de fichiers binaires
- * class.h - prototypes pour l'équivalent Python du fichier "format/dex/class.h"
+ * class.h - prototypes pour l'équivalent Python du fichier "plugins/dex/class.h"
  *
  * Copyright (C) 2012-2017 Cyrille Bagard
  *
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_FORMAT_DEX_CLASS_H
-#define _PLUGINS_PYCHRYSA_FORMAT_DEX_CLASS_H
+#ifndef _PLUGINS_DEX_PYTHON_CLASS_H
+#define _PLUGINS_DEX_PYTHON_CLASS_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_dex_class(PyObject *module);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_FORMAT_DEX_CLASS_H */
+#endif  /* _PLUGINS_DEX_PYTHON_CLASS_H */
diff --git a/plugins/pychrysa/format/dex/dex.c b/plugins/dex/python/format.c
index 0eaf8a1..74f6eae 100644
--- a/plugins/pychrysa/format/dex/dex.c
+++ b/plugins/dex/python/format.c
@@ -1,6 +1,6 @@
 
 /* Chrysalide - Outil d'analyse de fichiers binaires
- * dex.c - équivalent Python du fichier "format/dex/dex.c"
+ * format.c - équivalent Python du fichier "plugins/dex/format.c"
  *
  * Copyright (C) 2012-2017 Cyrille Bagard
  *
@@ -22,22 +22,21 @@
  */
 
 
-#include "dex.h"
+#include "format.h"
 
 
 #include <pygobject.h>
 
 
 #include <i18n.h>
+#include <plugins/pychrysa/helpers.h>
+#include <plugins/pychrysa/analysis/binary.h>
+#include <plugins/pychrysa/analysis/content.h>
+#include <plugins/pychrysa/format/executable.h>
 
 
-#include <format/dex/class.h>
-#include <format/dex/dex.h>
-
-
-#include "../executable.h"
-#include "../../analysis/content.h"
-#include "../../helpers.h"
+#include "../class.h"
+#include "../format.h"
 
 
 
diff --git a/plugins/pychrysa/format/dex/dex.h b/plugins/dex/python/format.h
index 0871875..4a365c9 100644
--- a/plugins/pychrysa/format/dex/dex.h
+++ b/plugins/dex/python/format.h
@@ -1,6 +1,6 @@
 
 /* Chrysalide - Outil d'analyse de fichiers binaires
- * dex.h - prototypes pour l'équivalent Python du fichier "format/dex/dex.h"
+ * format.h - prototypes pour l'équivalent Python du fichier "plugins/dex/format.h"
  *
  * Copyright (C) 2012-2017 Cyrille Bagard
  *
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_FORMAT_DEX_DEX_H
-#define _PLUGINS_PYCHRYSA_FORMAT_DEX_DEX_H
+#ifndef _PLUGINS_DEX_PYTHON_FORMAT_H
+#define _PLUGINS_DEX_PYTHON_FORMAT_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_dex_format(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_FORMAT_DEX_DEX_H */
+#endif  /* _PLUGINS_DEX_PYTHON_FORMAT_H */
diff --git a/plugins/pychrysa/format/dex/module.c b/plugins/dex/python/module.c
index 49004b7..8d5092d 100644
--- a/plugins/pychrysa/format/dex/module.c
+++ b/plugins/dex/python/module.c
@@ -25,14 +25,20 @@
 #include "module.h"
 
 
+#include <Python.h>
+
+
+#include <plugins/pychrysa/access.h>
+
+
 #include "class.h"
-#include "dex.h"
+#include "format.h"
 
 
 
 /******************************************************************************
 *                                                                             *
-*  Paramètres  : module = module dont la définition est à compléter.          *
+*  Paramètres  : -                                                            *
 *                                                                             *
 *  Description : Ajoute le module 'format.dex' au module Python.              *
 *                                                                             *
@@ -42,9 +48,10 @@
 *                                                                             *
 ******************************************************************************/
 
-bool add_format_dex_module_to_python_module(PyObject *super)
+bool add_format_dex_module_to_python_module(void)
 {
     bool result;                            /* Bilan à retourner           */
+    PyObject *super;                        /* Module à compléter          */
     PyObject *module;                       /* Sous-module mis en place    */
     int ret;                                /* Bilan d'un appel            */
 
@@ -61,6 +68,8 @@ bool add_format_dex_module_to_python_module(PyObject *super)
 
     result = false;
 
+    super = get_access_to_python_module("pychrysalide.format");
+
     module = PyModule_Create(&py_chrysalide_dex_module);
     if (module == NULL) return false;
 
@@ -74,10 +83,10 @@ bool add_format_dex_module_to_python_module(PyObject *super)
     ret = PyModule_AddObject(super, "dex", module);
     if (ret != 0) goto loading_failed;
 
-    result = true;
+    result = register_python_dex_class(module);
 
-    result &= register_python_dex_class(module);
-    result &= register_python_dex_format(module);
+    if (result)
+        result = register_python_dex_format(module);
 
  loading_failed:
 
diff --git a/plugins/pychrysa/format/dex/module.h b/plugins/dex/python/module.h
index c43e12a..d1540d7 100644
--- a/plugins/pychrysa/format/dex/module.h
+++ b/plugins/dex/python/module.h
@@ -22,18 +22,17 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_FORMAT_DEX_MODULE_H
-#define _PLUGINS_PYCHRYSA_FORMAT_DEX_MODULE_H
+#ifndef _PLUGINS_DEX_PYTHON_MODULE_H
+#define _PLUGINS_DEX_PYTHON_MODULE_H
 
 
-#include <Python.h>
 #include <stdbool.h>
 
 
 
 /* Ajoute le module 'format.dex' au module Python. */
-bool add_format_dex_module_to_python_module(PyObject *);
+bool add_format_dex_module_to_python_module(void);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSA_FORMAT_DEX_MODULE_H */
+#endif  /* _PLUGINS_DEX_PYTHON_MODULE_H */
diff --git a/plugins/elf/python/module.h b/plugins/elf/python/module.h
index de3ce42..f011ef9 100644
--- a/plugins/elf/python/module.h
+++ b/plugins/elf/python/module.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSA_FORMAT_ELF_MODULE_H
-#define _PLUGINS_PYCHRYSA_FORMAT_ELF_MODULE_H
+#ifndef _PLUGINS_ELF_PYTHON_MODULE_H
+#define _PLUGINS_ELF_PYTHON_MODULE_H
 
 
 #include <stdbool.h>
diff --git a/plugins/pychrysa/format/Makefile.am b/plugins/pychrysa/format/Makefile.am
index 71f0022..e59cf8a 100644
--- a/plugins/pychrysa/format/Makefile.am
+++ b/plugins/pychrysa/format/Makefile.am
@@ -7,8 +7,7 @@ libpychrysaformat_la_SOURCES =			\
 	module.h module.c					\
 	symbol.h symbol.c
 
-libpychrysaformat_la_LIBADD =			\
-	dex/libpychrysaformatdex.la
+libpychrysaformat_la_LIBADD = 
 
 libpychrysaformat_la_LDFLAGS = 
 
@@ -18,4 +17,4 @@ AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJE
 
 AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
 
-SUBDIRS = dex
+SUBDIRS = 
diff --git a/plugins/pychrysa/format/module.c b/plugins/pychrysa/format/module.c
index d15fea8..642b1dc 100644
--- a/plugins/pychrysa/format/module.c
+++ b/plugins/pychrysa/format/module.c
@@ -31,7 +31,6 @@
 #include "executable.h"
 #include "format.h"
 #include "symbol.h"
-#include "dex/module.h"
 #include "../access.h"
 
 
@@ -87,8 +86,6 @@ bool add_format_module_to_python_module(PyObject *super)
     result &= register_python_executable_format(module);
     result &= register_python_binary_symbol(module);
 
-    result &= add_format_dex_module_to_python_module(module);
-
     if (result)
         register_access_to_python_module("pychrysalide.format", module);
 
diff --git a/plugins/readdex/class.c b/plugins/readdex/class.c
index 7911c6f..c5cb35f 100644
--- a/plugins/readdex/class.c
+++ b/plugins/readdex/class.c
@@ -25,8 +25,8 @@
 
 
 #include <i18n.h>
-#include <format/dex/class.h>
-#include <format/dex/dex_def.h>
+#include <plugins/dex/class.h>
+#include <plugins/dex/dex_def.h>
 #include <plugins/fmtp/parser.h>
 
 
diff --git a/plugins/readdex/class.h b/plugins/readdex/class.h
index 4e71fb2..c24ced1 100644
--- a/plugins/readdex/class.h
+++ b/plugins/readdex/class.h
@@ -26,7 +26,7 @@
 
 
 #include <format/preload.h>
-#include <format/dex/dex.h>
+#include <plugins/dex/format.h>
 
 
 
diff --git a/plugins/readdex/code.c b/plugins/readdex/code.c
index 3a36c19..d17c4cc 100644
--- a/plugins/readdex/code.c
+++ b/plugins/readdex/code.c
@@ -24,7 +24,7 @@
 #include "code.h"
 
 
-#include <format/dex/dex_def.h>
+#include <plugins/dex/dex_def.h>
 #include <plugins/fmtp/parser.h>
 
 
diff --git a/plugins/readdex/code.h b/plugins/readdex/code.h
index ea70df8..fc52dd0 100644
--- a/plugins/readdex/code.h
+++ b/plugins/readdex/code.h
@@ -26,7 +26,7 @@
 
 
 #include <format/preload.h>
-#include <format/dex/dex.h>
+#include <plugins/dex/format.h>
 
 
 
diff --git a/plugins/readdex/header.c b/plugins/readdex/header.c
index b5ea776..860638c 100644
--- a/plugins/readdex/header.c
+++ b/plugins/readdex/header.c
@@ -25,7 +25,7 @@
 
 
 #include <i18n.h>
-#include <format/dex/dex_def.h>
+#include <plugins/dex/dex_def.h>
 #include <plugins/fmtp/parser.h>
 
 
diff --git a/plugins/readdex/header.h b/plugins/readdex/header.h
index 17c6ccd..63d7c68 100644
--- a/plugins/readdex/header.h
+++ b/plugins/readdex/header.h
@@ -26,7 +26,7 @@
 
 
 #include <format/preload.h>
-#include <format/dex/dex.h>
+#include <plugins/dex/format.h>
 
 
 
diff --git a/plugins/readdex/ids.c b/plugins/readdex/ids.c
index 88a60b0..73187cb 100644
--- a/plugins/readdex/ids.c
+++ b/plugins/readdex/ids.c
@@ -31,7 +31,7 @@
 #include <i18n.h>
 #include <arch/raw.h>
 #include <format/symbol.h>
-#include <format/dex/dex_def.h>
+#include <plugins/dex/dex_def.h>
 #include <plugins/fmtp/parser.h>
 
 
diff --git a/plugins/readdex/ids.h b/plugins/readdex/ids.h
index 79618ce..b4a1dbf 100644
--- a/plugins/readdex/ids.h
+++ b/plugins/readdex/ids.h
@@ -26,7 +26,7 @@
 
 
 #include <format/preload.h>
-#include <format/dex/dex.h>
+#include <plugins/dex/format.h>
 
 
 
diff --git a/plugins/readdex/reader.c b/plugins/readdex/reader.c
index a10ba90..cab6058 100644
--- a/plugins/readdex/reader.c
+++ b/plugins/readdex/reader.c
@@ -24,7 +24,7 @@
 #include "reader.h"
 
 
-#include <format/dex/dex.h>
+#include <plugins/dex/format.h>
 #include <plugins/plugin-def.h>
 
 
diff --git a/src/arch/Makefile.am b/src/arch/Makefile.am
index 0c0a901..005f640 100644
--- a/src/arch/Makefile.am
+++ b/src/arch/Makefile.am
@@ -30,8 +30,7 @@ libarch_la_SOURCES =					\
 # 	x86/libarchx86.la
 
 libarch_la_LIBADD =						\
-	arm/libarcharm.la					\
-	dalvik/libarchdalvik.la
+	arm/libarcharm.la
 
 libarch_la_LDFLAGS = 
 
@@ -42,4 +41,4 @@ AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
 
 
 #SUBDIRS = arm dalvik jvm mips x86
-SUBDIRS = arm dalvik
+SUBDIRS = arm
diff --git a/src/arch/dalvik/core.h b/src/arch/dalvik/core.h
deleted file mode 100644
index f22d0ea..0000000
--- a/src/arch/dalvik/core.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-/* Chrysalide - Outil d'analyse de fichiers binaires
- * core.h - prototypes pour le chargement et le déchargement des mécanismes internes de l'architecture Dalvik
- *
- * Copyright (C) 2016-2017 Cyrille Bagard
- *
- *  This file is part of Chrysalide.
- *
- *  Chrysalide is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Chrysalide is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef _ARCH_DALVIK_CORE_H
-#define _ARCH_DALVIK_CORE_H
-
-
-#include <stdbool.h>
-
-
-
-/* Met en place les mécanismes internes de l'architecture. */
-bool init_dalvik_core(void);
-
-/* Supprime les mécanismes internes de l'architecture Dalvik. */
-void exit_dalvik_core(void);
-
-
-
-#endif  /* _ARCH_DALVIK_CORE_H */
diff --git a/src/arch/dalvik/operands/Makefile.am b/src/arch/dalvik/operands/Makefile.am
deleted file mode 100644
index e7ad751..0000000
--- a/src/arch/dalvik/operands/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-
-noinst_LTLIBRARIES = libarchdalvikoperands.la
-
-libarchdalvikoperands_la_SOURCES =		\
-	args.h args.c						\
-	pool.h pool.c						\
-	register.h register.c
-
-libarchdalvik_la_CFLAGS = $(AM_CFLAGS)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-
-SUBDIRS = 
diff --git a/src/arch/dalvik/pseudo/Makefile.am b/src/arch/dalvik/pseudo/Makefile.am
deleted file mode 100644
index 9743220..0000000
--- a/src/arch/dalvik/pseudo/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-
-noinst_LTLIBRARIES = libarchdalvikpseudo.la
-
-libarchdalvikpseudo_la_SOURCES =		\
-	fill.h fill.c						\
-	switch.h switch.c
-
-libarchdalvikpseudo_la_LIBADD = 
-
-libarchdalvikpseudo_la_CFLAGS = $(AM_CFLAGS)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
diff --git a/src/core/formats.c b/src/core/formats.c
index 0e1e8e7..35d8a46 100644
--- a/src/core/formats.c
+++ b/src/core/formats.c
@@ -29,7 +29,6 @@
 #include <string.h>
 
 
-#include "../format/dex/dex.h"
 #include "../format/dwarf/dwarf.h"
 #include "../format/dwarf/v2/dwarf.h"
 #include "../format/dwarf/v3/dwarf.h"
@@ -195,14 +194,10 @@ bool load_hard_coded_formats_definitions(void)
 
     /* Détections */
 
-    result &= register_format_matcher(dex_is_matching, NULL);
-
     result &= register_format_matcher(dwarf_is_matching, NULL);
 
     /* Chargements */
 
-    result &= register_format_loader("dex", "Dalvik Executable format", g_dex_format_new);
-
     result &= register_format_loader("dwarf_v2", "Debugging With Arbitrary Record Formats (v2)",
                                      g_dwarfv2_format_new);
 
diff --git a/src/core/processors.c b/src/core/processors.c
index dfe74fb..661374e 100644
--- a/src/core/processors.c
+++ b/src/core/processors.c
@@ -31,8 +31,6 @@
 
 #include "../arch/arm/v7/core.h"
 #include "../arch/arm/v7/processor.h"
-#include "../arch/dalvik/core.h"
-#include "../arch/dalvik/processor.h"
 //#include "../arch/jvm/processor.h"
 
 
@@ -90,7 +88,8 @@ bool register_processor_type(const char *key, const char *name, GType instance,
 
     result = (new == NULL);
 
-    result &= init();
+    if (init != NULL)
+        result &= init();
 
     if (result)
     {
@@ -137,10 +136,6 @@ bool load_hard_coded_processors_definitions(void)
         result = register_processor_type("armv7", "ARM v7", G_TYPE_ARMV7_PROCESSOR,
                                          init_armv7_core, exit_armv7_core);
 
-    if (result)
-        result = register_processor_type("dalvik", "Dalvik Virtual Machine", G_TYPE_DALVIK_PROCESSOR,
-                                         init_dalvik_core, exit_dalvik_core);
-
     //result &= register_processor_type("jvm", "Java Virtual Machine", G_TYPE_JVM_PROCESSOR);
 
     return result;
diff --git a/src/format/Makefile.am b/src/format/Makefile.am
index 3a63fbf..dfb9624 100644
--- a/src/format/Makefile.am
+++ b/src/format/Makefile.am
@@ -14,7 +14,6 @@ libformat_la_SOURCES =					\
 	symbol.h symbol.c
 
 libformat_la_LIBADD =					\
-	dex/libformatdex.la					\
 	dwarf/libformatdwarf.la				\
 	java/libformatjava.la				\
 	mangling/libformatmangling.la		\
@@ -27,4 +26,4 @@ AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
 
 AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
 
-SUBDIRS = dex dwarf java mangling pe
+SUBDIRS = dwarf java mangling pe
diff --git a/src/format/dex/Makefile.am b/src/format/dex/Makefile.am
deleted file mode 100755
index 28f8e73..0000000
--- a/src/format/dex/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-
-noinst_LTLIBRARIES = libformatdex.la
-
-libformatdex_la_SOURCES =				\
-	class.h class.c						\
-	dex-int.h dex-int.c					\
-	dex.h dex.c							\
-	dex_def.h							\
-	loading.h loading.c					\
-	method.h method.c					\
-	pool.h pool.c
-
-libformatdex_la_LDFLAGS = 
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
diff --git a/tools/d2c/d2c.mk b/tools/d2c/d2c.mk
index d0a4698..dbc9b83 100644
--- a/tools/d2c/d2c.mk
+++ b/tools/d2c/d2c.mk
@@ -35,14 +35,14 @@ d2c_final_rules: fix_includes_in_c_templates fix_includes_in_h_templates untabif
 fix_includes_in_c_templates:
 	@for f in `find .gen/ -name '*tmpl.c'`; do			\
 		if grep -q '##INCLUDES##' $$f; then				\
-			$(fix_verbose)sed -i 's/##INCLUDES##/$(FIXED_C_INCLUDES)/' $$f;	\
+			$(fix_verbose)sed -i 's@##INCLUDES##@$(FIXED_C_INCLUDES)@' $$f;	\
 		fi;												\
 	done
 
 fix_includes_in_h_templates:
 	@for f in `find .gen/ -name '*tmpl.h'`; do			\
 		if grep -q '##INCLUDES##' $$f; then				\
-			$(fix_verbose)sed -i 's/##INCLUDES##/$(FIXED_H_INCLUDES)/' $$f ;	\
+			$(fix_verbose)sed -i 's@##INCLUDES##@$(FIXED_H_INCLUDES)@' $$f ;	\
 		fi;												\
 	done