321 files changed, 789 insertions, 289 deletions

diff --git a/.gitignore b/.gitignore
index c609e23..822478f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,7 +58,7 @@ __pycache__
 *.g
 .gen/
 fmk.done
-src/arch/arm/v7/opcodes/
+plugins/arm/v7/opcodes/
 plugins/dalvik/opcodes/
 
 # GLib
diff --git a/ChangeLog b/ChangeLog
index 07fc007..28ec9d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,333 @@
+17-12-02  Cyrille Bagard <nocbos@gmail.com>
+
+	* .gitignore:
+	* autogen.sh:
+	* configure.ac:
+	* plugins/Makefile.am:
+	Update files and code.
+
+	* plugins/arm/Makefile.am:
+	* plugins/arm/cond.h:
+	* plugins/arm/context-int.h:
+	* plugins/arm/context.c:
+	* plugins/arm/context.h:
+	* plugins/arm/core.c:
+	* plugins/arm/core.h:
+	* plugins/arm/instruction-int.h:
+	* plugins/arm/instruction.c:
+	* plugins/arm/instruction.h:
+	* plugins/arm/link.c:
+	* plugins/arm/link.h:
+	* plugins/arm/processor-int.h:
+	* plugins/arm/processor.c:
+	* plugins/arm/processor.h:
+	* plugins/arm/python/Makefile.am:
+	* plugins/arm/python/instruction.c:
+	* plugins/arm/python/instruction.h:
+	* plugins/arm/python/module.c:
+	* plugins/arm/python/module.h:
+	* plugins/arm/python/processor.c:
+	* plugins/arm/python/processor.h:
+	* plugins/arm/python/v7/Makefile.am:
+	* plugins/arm/python/v7/instruction.c:
+	* plugins/arm/python/v7/instruction.h:
+	* plugins/arm/python/v7/module.c:
+	* plugins/arm/python/v7/module.h:
+	* plugins/arm/python/v7/processor.c:
+	* plugins/arm/python/v7/processor.h:
+	* plugins/arm/register-int.h:
+	* plugins/arm/register.c:
+	* plugins/arm/register.h:
+	* plugins/arm/v7/Makefile.am:
+	* plugins/arm/v7/arm.c:
+	* plugins/arm/v7/arm.h:
+	* plugins/arm/v7/build_tmp_decl.sh:
+	* plugins/arm/v7/context.c:
+	* plugins/arm/v7/context.h:
+	* plugins/arm/v7/core.c:
+	* plugins/arm/v7/core.h:
+	* plugins/arm/v7/cregister.c:
+	* plugins/arm/v7/cregister.h:
+	* plugins/arm/v7/fetch.c:
+	* plugins/arm/v7/fetch.h:
+	* plugins/arm/v7/helpers.c:
+	* plugins/arm/v7/helpers.h:
+	* plugins/arm/v7/instruction.c:
+	* plugins/arm/v7/instruction.h:
+	* plugins/arm/v7/link.c:
+	* plugins/arm/v7/link.h:
+	* plugins/arm/v7/opcodes/Makefile.am:
+	* plugins/arm/v7/opcodes/opcodes_tmp_arm.h:
+	* plugins/arm/v7/opcodes/opcodes_tmp_simd.h:
+	* plugins/arm/v7/opcodes/opcodes_tmp_thumb_16.h:
+	* plugins/arm/v7/opcodes/opcodes_tmp_thumb_32.h:
+	* plugins/arm/v7/opdefs/Makefile.am:
+	* plugins/arm/v7/opdefs/adc_A881.d:
+	* plugins/arm/v7/opdefs/adc_A882.d:
+	* plugins/arm/v7/opdefs/adc_A883.d:
+	* plugins/arm/v7/opdefs/add_A8810.d:
+	* plugins/arm/v7/opdefs/add_A8811.d:
+	* plugins/arm/v7/opdefs/add_A884.d:
+	* plugins/arm/v7/opdefs/add_A885.d:
+	* plugins/arm/v7/opdefs/add_A886.d:
+	* plugins/arm/v7/opdefs/add_A887.d:
+	* plugins/arm/v7/opdefs/add_A888.d:
+	* plugins/arm/v7/opdefs/add_A889.d:
+	* plugins/arm/v7/opdefs/adr_A8812.d:
+	* plugins/arm/v7/opdefs/and_A8813.d:
+	* plugins/arm/v7/opdefs/and_A8814.d:
+	* plugins/arm/v7/opdefs/and_A8815.d:
+	* plugins/arm/v7/opdefs/asr_A8816.d:
+	* plugins/arm/v7/opdefs/asr_A8817.d:
+	* plugins/arm/v7/opdefs/b_A8818.d:
+	* plugins/arm/v7/opdefs/bfc_A8819.d:
+	* plugins/arm/v7/opdefs/bfi_A8820.d:
+	* plugins/arm/v7/opdefs/bic_A8821.d:
+	* plugins/arm/v7/opdefs/bic_A8822.d:
+	* plugins/arm/v7/opdefs/bic_A8823.d:
+	* plugins/arm/v7/opdefs/bkpt_A8824.d:
+	* plugins/arm/v7/opdefs/bl_A8825.d:
+	* plugins/arm/v7/opdefs/blx_A8826.d:
+	* plugins/arm/v7/opdefs/bx_A8827.d:
+	* plugins/arm/v7/opdefs/bxj_A8828.d:
+	* plugins/arm/v7/opdefs/cb_A8829.d:
+	* plugins/arm/v7/opdefs/cdp_A8830.d:
+	* plugins/arm/v7/opdefs/clrex_A8832.d:
+	* plugins/arm/v7/opdefs/clz_A8833.d:
+	* plugins/arm/v7/opdefs/cmn_A8834.d:
+	* plugins/arm/v7/opdefs/cmn_A8835.d:
+	* plugins/arm/v7/opdefs/cmn_A8836.d:
+	* plugins/arm/v7/opdefs/cmp_A8837.d:
+	* plugins/arm/v7/opdefs/cmp_A8838.d:
+	* plugins/arm/v7/opdefs/cmp_A8839.d:
+	* plugins/arm/v7/opdefs/dbg_A8842.d:
+	* plugins/arm/v7/opdefs/dmb_A8843.d:
+	* plugins/arm/v7/opdefs/dsb_A8844.d:
+	* plugins/arm/v7/opdefs/eor_A8846.d:
+	* plugins/arm/v7/opdefs/eor_A8847.d:
+	* plugins/arm/v7/opdefs/eor_A8848.d:
+	* plugins/arm/v7/opdefs/ldr_A8862.d:
+	* plugins/arm/v7/opdefs/ldr_A8863.d:
+	* plugins/arm/v7/opdefs/ldr_A8864.d:
+	* plugins/arm/v7/opdefs/ldr_A8865.d:
+	* plugins/arm/v7/opdefs/ldr_A8866.d:
+	* plugins/arm/v7/opdefs/ldrb_A8867.d:
+	* plugins/arm/v7/opdefs/ldrb_A8868.d:
+	* plugins/arm/v7/opdefs/ldrb_A8869.d:
+	* plugins/arm/v7/opdefs/ldrb_A8870.d:
+	* plugins/arm/v7/opdefs/ldrbt_A8871.d:
+	* plugins/arm/v7/opdefs/ldrd_A8872.d:
+	* plugins/arm/v7/opdefs/ldrd_A8873.d:
+	* plugins/arm/v7/opdefs/ldrd_A8874.d:
+	* plugins/arm/v7/opdefs/ldrex_A8875.d:
+	* plugins/arm/v7/opdefs/ldrexb_A8876.d:
+	* plugins/arm/v7/opdefs/ldrexd_A8877.d:
+	* plugins/arm/v7/opdefs/ldrexh_A8878.d:
+	* plugins/arm/v7/opdefs/ldrh_A8879.d:
+	* plugins/arm/v7/opdefs/ldrh_A8880.d:
+	* plugins/arm/v7/opdefs/ldrh_A8881.d:
+	* plugins/arm/v7/opdefs/ldrh_A8882.d:
+	* plugins/arm/v7/opdefs/ldrht_A8883.d:
+	* plugins/arm/v7/opdefs/ldrsb_A8884.d:
+	* plugins/arm/v7/opdefs/ldrsb_A8885.d:
+	* plugins/arm/v7/opdefs/ldrsb_A8886.d:
+	* plugins/arm/v7/opdefs/ldrsbt_A8887.d:
+	* plugins/arm/v7/opdefs/ldrsh_A8888.d:
+	* plugins/arm/v7/opdefs/ldrsh_A8889.d:
+	* plugins/arm/v7/opdefs/ldrsh_A8890.d:
+	* plugins/arm/v7/opdefs/ldrsht_A8891.d:
+	* plugins/arm/v7/opdefs/ldrt_A8892.d:
+	* plugins/arm/v7/opdefs/lsl_A8894.d:
+	* plugins/arm/v7/opdefs/lsl_A8895.d:
+	* plugins/arm/v7/opdefs/lsr_A8896.d:
+	* plugins/arm/v7/opdefs/lsr_A8897.d:
+	* plugins/arm/v7/opdefs/mcr_A8898.d:
+	* plugins/arm/v7/opdefs/mcrr_A8899.d:
+	* plugins/arm/v7/opdefs/mla_A88100.d:
+	* plugins/arm/v7/opdefs/mls_A88101.d:
+	* plugins/arm/v7/opdefs/mov_A88102.d:
+	* plugins/arm/v7/opdefs/mov_A88103.d:
+	* plugins/arm/v7/opdefs/mov_A88104.d:
+	* plugins/arm/v7/opdefs/movt_A88106.d:
+	* plugins/arm/v7/opdefs/mrc_A88107.d:
+	* plugins/arm/v7/opdefs/mrrc_A88108.d:
+	* plugins/arm/v7/opdefs/mul_A88114.d:
+	* plugins/arm/v7/opdefs/mvn_A88115.d:
+	* plugins/arm/v7/opdefs/mvn_A88116.d:
+	* plugins/arm/v7/opdefs/mvn_A88117.d:
+	* plugins/arm/v7/opdefs/nop_A88119.d:
+	* plugins/arm/v7/opdefs/orn_A88120.d:
+	* plugins/arm/v7/opdefs/orn_A88121.d:
+	* plugins/arm/v7/opdefs/orr_A88122.d:
+	* plugins/arm/v7/opdefs/orr_A88123.d:
+	* plugins/arm/v7/opdefs/orr_A88124.d:
+	* plugins/arm/v7/opdefs/pop_A88131.d:
+	* plugins/arm/v7/opdefs/pop_A88132.d:
+	* plugins/arm/v7/opdefs/push_A88133.d:
+	* plugins/arm/v7/opdefs/qadd16_A88135.d:
+	* plugins/arm/v7/opdefs/qadd8_A88136.d:
+	* plugins/arm/v7/opdefs/qadd_A88134.d:
+	* plugins/arm/v7/opdefs/qasx_A88137.d:
+	* plugins/arm/v7/opdefs/qdadd_A88138.d:
+	* plugins/arm/v7/opdefs/qdsub_A88139.d:
+	* plugins/arm/v7/opdefs/qsax_A88140.d:
+	* plugins/arm/v7/opdefs/qsub16_A88142.d:
+	* plugins/arm/v7/opdefs/qsub8_A88143.d:
+	* plugins/arm/v7/opdefs/qsub_A88141.d:
+	* plugins/arm/v7/opdefs/rbit_A88144.d:
+	* plugins/arm/v7/opdefs/rev16_A88146.d:
+	* plugins/arm/v7/opdefs/rev_A88145.d:
+	* plugins/arm/v7/opdefs/revsh_A88147.d:
+	* plugins/arm/v7/opdefs/ror_A88149.d:
+	* plugins/arm/v7/opdefs/ror_A88150.d:
+	* plugins/arm/v7/opdefs/rrx_A88151.d:
+	* plugins/arm/v7/opdefs/rsb_A88152.d:
+	* plugins/arm/v7/opdefs/rsb_A88153.d:
+	* plugins/arm/v7/opdefs/rsb_A88154.d:
+	* plugins/arm/v7/opdefs/rsc_A88155.d:
+	* plugins/arm/v7/opdefs/rsc_A88156.d:
+	* plugins/arm/v7/opdefs/rsc_A88157.d:
+	* plugins/arm/v7/opdefs/sadd16_A88158.d:
+	* plugins/arm/v7/opdefs/sadd8_A88159.d:
+	* plugins/arm/v7/opdefs/sasx_A88160.d:
+	* plugins/arm/v7/opdefs/sbc_A88161.d:
+	* plugins/arm/v7/opdefs/sbc_A88162.d:
+	* plugins/arm/v7/opdefs/sbc_A88163.d:
+	* plugins/arm/v7/opdefs/sbfx_A88164.d:
+	* plugins/arm/v7/opdefs/sdiv_A88165.d:
+	* plugins/arm/v7/opdefs/sel_A88166.d:
+	* plugins/arm/v7/opdefs/setend_A88167.d:
+	* plugins/arm/v7/opdefs/sev_A88168.d:
+	* plugins/arm/v7/opdefs/shadd16_A88169.d:
+	* plugins/arm/v7/opdefs/shadd8_A88170.d:
+	* plugins/arm/v7/opdefs/shasx_A88171.d:
+	* plugins/arm/v7/opdefs/shsax_A88172.d:
+	* plugins/arm/v7/opdefs/shsub16_A88173.d:
+	* plugins/arm/v7/opdefs/shsub8_A88174.d:
+	* plugins/arm/v7/opdefs/smlad_A88177.d:
+	* plugins/arm/v7/opdefs/smlal_A88178.d:
+	* plugins/arm/v7/opdefs/smlald_A88180.d:
+	* plugins/arm/v7/opdefs/smlsd_A88182.d:
+	* plugins/arm/v7/opdefs/smlsld_A88183.d:
+	* plugins/arm/v7/opdefs/smmla_A88184.d:
+	* plugins/arm/v7/opdefs/smmls_A88185.d:
+	* plugins/arm/v7/opdefs/smmul_A88186.d:
+	* plugins/arm/v7/opdefs/smuad_A88187.d:
+	* plugins/arm/v7/opdefs/smull_A88189.d:
+	* plugins/arm/v7/opdefs/str_A88203.d:
+	* plugins/arm/v7/opdefs/str_A88204.d:
+	* plugins/arm/v7/opdefs/str_A88205.d:
+	* plugins/arm/v7/opdefs/strb_A88206.d:
+	* plugins/arm/v7/opdefs/strb_A88207.d:
+	* plugins/arm/v7/opdefs/strb_A88208.d:
+	* plugins/arm/v7/opdefs/strbt_A88209.d:
+	* plugins/arm/v7/opdefs/strd_A88210.d:
+	* plugins/arm/v7/opdefs/strd_A88211.d:
+	* plugins/arm/v7/opdefs/strex_A88212.d:
+	* plugins/arm/v7/opdefs/strexb_A88213.d:
+	* plugins/arm/v7/opdefs/strexd_A88214.d:
+	* plugins/arm/v7/opdefs/strexh_A88215.d:
+	* plugins/arm/v7/opdefs/strh_A88216.d:
+	* plugins/arm/v7/opdefs/strh_A88217.d:
+	* plugins/arm/v7/opdefs/strh_A88218.d:
+	* plugins/arm/v7/opdefs/strht_A88219.d:
+	* plugins/arm/v7/opdefs/strt_A88220.d:
+	* plugins/arm/v7/opdefs/sub_A88221.d:
+	* plugins/arm/v7/opdefs/sub_A88222.d:
+	* plugins/arm/v7/opdefs/sub_A88223.d:
+	* plugins/arm/v7/opdefs/sub_A88224.d:
+	* plugins/arm/v7/opdefs/sub_A88225.d:
+	* plugins/arm/v7/opdefs/sub_A88226.d:
+	* plugins/arm/v7/opdefs/subs_B9320.d:
+	* plugins/arm/v7/opdefs/svc_A88228.d:
+	* plugins/arm/v7/opdefs/swp_A88229.d:
+	* plugins/arm/v7/opdefs/teq_A88237.d:
+	* plugins/arm/v7/opdefs/teq_A88238.d:
+	* plugins/arm/v7/opdefs/teq_A88239.d:
+	* plugins/arm/v7/opdefs/tst_A88240.d:
+	* plugins/arm/v7/opdefs/tst_A88241.d:
+	* plugins/arm/v7/opdefs/tst_A88242.d:
+	* plugins/arm/v7/opdefs/uadd16_A88243.d:
+	* plugins/arm/v7/opdefs/uadd8_A88244.d:
+	* plugins/arm/v7/opdefs/uasx_A88245.d:
+	* plugins/arm/v7/opdefs/ubfx_A88246.d:
+	* plugins/arm/v7/opdefs/udf_A88247.d:
+	* plugins/arm/v7/opdefs/udiv_A88248.d:
+	* plugins/arm/v7/opdefs/uhadd16_A88249.d:
+	* plugins/arm/v7/opdefs/uhadd8_A88250.d:
+	* plugins/arm/v7/opdefs/uhasx_A88251.d:
+	* plugins/arm/v7/opdefs/uhsax_A88252.d:
+	* plugins/arm/v7/opdefs/uhsub16_A88253.d:
+	* plugins/arm/v7/opdefs/uhsub8_A88254.d:
+	* plugins/arm/v7/opdefs/umaal_A88255.d:
+	* plugins/arm/v7/opdefs/umlal_A88256.d:
+	* plugins/arm/v7/opdefs/umull_A88257.d:
+	* plugins/arm/v7/opdefs/uqadd16_A88258.d:
+	* plugins/arm/v7/opdefs/uqadd8_A88259.d:
+	* plugins/arm/v7/opdefs/uqasx_A88260.d:
+	* plugins/arm/v7/opdefs/uqsax_A88261.d:
+	* plugins/arm/v7/opdefs/uqsub16_A88262.d:
+	* plugins/arm/v7/opdefs/uqsub8_A88263.d:
+	* plugins/arm/v7/opdefs/usad8_A88264.d:
+	* plugins/arm/v7/opdefs/usada8_A88265.d:
+	* plugins/arm/v7/opdefs/usat16_A88267.d:
+	* plugins/arm/v7/opdefs/usat_A88266.d:
+	* plugins/arm/v7/opdefs/usax_A88268.d:
+	* plugins/arm/v7/opdefs/usub16_A88269.d:
+	* plugins/arm/v7/opdefs/usub8_A88270.d:
+	* plugins/arm/v7/opdefs/uxtab16_A88272.d:
+	* plugins/arm/v7/opdefs/uxtab_A88271.d:
+	* plugins/arm/v7/opdefs/uxtah_A88273.d:
+	* plugins/arm/v7/opdefs/uxtb16_A88275.d:
+	* plugins/arm/v7/opdefs/uxtb_A88274.d:
+	* plugins/arm/v7/opdefs/uxth_A88276.d:
+	* plugins/arm/v7/opdefs/wfi_A88425.d:
+	* plugins/arm/v7/opdefs/yield_A88426.d:
+	* plugins/arm/v7/operands/Makefile.am:
+	* plugins/arm/v7/operands/coproc.c:
+	* plugins/arm/v7/operands/coproc.h:
+	* plugins/arm/v7/operands/estate.c:
+	* plugins/arm/v7/operands/estate.h:
+	* plugins/arm/v7/operands/limitation.c:
+	* plugins/arm/v7/operands/limitation.h:
+	* plugins/arm/v7/operands/maccess.c:
+	* plugins/arm/v7/operands/maccess.h:
+	* plugins/arm/v7/operands/offset.c:
+	* plugins/arm/v7/operands/offset.h:
+	* plugins/arm/v7/operands/reglist.c:
+	* plugins/arm/v7/operands/reglist.h:
+	* plugins/arm/v7/operands/rotation.c:
+	* plugins/arm/v7/operands/rotation.h:
+	* plugins/arm/v7/operands/shift.c:
+	* plugins/arm/v7/operands/shift.h:
+	* plugins/arm/v7/post.c:
+	* plugins/arm/v7/post.h:
+	* plugins/arm/v7/processor.c:
+	* plugins/arm/v7/processor.h:
+	* plugins/arm/v7/pseudo.c:
+	* plugins/arm/v7/pseudo.h:
+	* plugins/arm/v7/register.c:
+	* plugins/arm/v7/register.h:
+	* plugins/arm/v7/simd.c:
+	* plugins/arm/v7/simd.h:
+	* plugins/arm/v7/thumb_16.c:
+	* plugins/arm/v7/thumb_16.h:
+	* plugins/arm/v7/thumb_32.c:
+	* plugins/arm/v7/thumb_32.h:
+	Moved entries: create a plugin for the ARM support.
+
+	* plugins/pychrysa/arch/Makefile.am:
+	* plugins/pychrysa/arch/module.c:
+	* plugins/ropgadgets/helper_arm.c:
+	* plugins/ropgadgets/plugin.c:
+	* src/arch/Makefile.am:
+	* src/arch/arm/Makefile.am:
+	* src/core/processors.c:
+	Update files and code.
+
+	* src/plugins/plugin.c:
+	Fix a bug in the dependency tracking.
+
 17-11-30  Cyrille Bagard <nocbos@gmail.com>
 
 	* plugins/dex/python/format.c:
diff --git a/autogen.sh b/autogen.sh
index 68fbb58..01eadf0 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,7 +18,7 @@ cp /usr/share/gettext/gettext.h .
 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 plugins/arm/v7/opcodes/gencode.mk
 touch plugins/dalvik/opcodes/gencode.mk
 
 # Run the GNU tools
diff --git a/configure.ac b/configure.ac
index 7f572e8..902a5a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -319,6 +319,13 @@ AC_CONFIG_COMMANDS([marshal], [echo -e "VOID:UINT64\nVOID:INT,UINT64,INT\nVOID:O
 AC_CONFIG_FILES([Makefile
                  pixmaps/Makefile
                  plugins/Makefile
+                 plugins/arm/Makefile
+                 plugins/arm/python/Makefile
+                 plugins/arm/python/v7/Makefile
+                 plugins/arm/v7/Makefile
+                 plugins/arm/v7/opdefs/Makefile
+                 plugins/arm/v7/opcodes/Makefile
+                 plugins/arm/v7/operands/Makefile
                  plugins/dalvik/Makefile
                  plugins/dalvik/opdefs/Makefile
                  plugins/dalvik/opcodes/Makefile
@@ -338,8 +345,6 @@ AC_CONFIG_FILES([Makefile
                  plugins/pychrysa/analysis/db/Makefile
                  plugins/pychrysa/analysis/db/items/Makefile
                  plugins/pychrysa/arch/Makefile
-                 plugins/pychrysa/arch/arm/Makefile
-                 plugins/pychrysa/arch/arm/v7/Makefile
                  plugins/pychrysa/common/Makefile
                  plugins/pychrysa/core/Makefile
                  plugins/pychrysa/debug/Makefile
@@ -367,11 +372,6 @@ AC_CONFIG_FILES([Makefile
                  src/analysis/human/asm/Makefile
                  src/analysis/types/Makefile
                  src/arch/Makefile
-                 src/arch/arm/Makefile
-                 src/arch/arm/v7/Makefile
-                 src/arch/arm/v7/opdefs/Makefile
-                 src/arch/arm/v7/opcodes/Makefile
-                 src/arch/arm/v7/operands/Makefile
                  src/common/Makefile
                  src/core/Makefile
                  src/debug/Makefile
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 1070742..9f26d8f 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -4,4 +4,4 @@ if HAVE_PYTHON3_CONFIG
 endif
 
 # androhelpers
-SUBDIRS = dalvik devdbg dex elf fmtp libcsem mobicore $(PYTHON3_SUBDIRS) readdex readelf readmc ropgadgets
+SUBDIRS = arm dalvik devdbg dex elf fmtp libcsem mobicore $(PYTHON3_SUBDIRS) readdex readelf readmc ropgadgets
diff --git a/plugins/arm/Makefile.am b/plugins/arm/Makefile.am
new file mode 100644
index 0000000..3e691f4
--- /dev/null
+++ b/plugins/arm/Makefile.am
@@ -0,0 +1,32 @@
+
+lib_LTLIBRARIES = libarm.la
+
+libarm_la_SOURCES =						\
+	cond.h								\
+	context-int.h						\
+	context.h context.c					\
+	core.h core.c						\
+	instruction-int.h					\
+	instruction.h instruction.c			\
+	link.h link.c						\
+	processor-int.h						\
+	processor.h processor.c				\
+	register-int.h						\
+	register.h register.c
+
+libarm_la_LIBADD =						\
+	python/libarmpython.la				\
+	v7/libarmv7.la
+
+libarm_la_CFLAGS = $(AM_CFLAGS)
+
+libarm_la_LDFLAGS = 					\
+	$(LIBPYTHON_LIBS) $(LIBPYGOBJECT_LIBS)
+
+
+AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
+
+AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
+
+
+SUBDIRS = python v7
diff --git a/src/arch/arm/cond.h b/plugins/arm/cond.h
index 549d368..a4c6db0 100644
--- a/src/arch/arm/cond.h
+++ b/plugins/arm/cond.h
@@ -21,8 +21,8 @@
  */
 
 
-#ifndef _ARCH_ARM_ENCODING_H
-#define _ARCH_ARM_ENCODING_H
+#ifndef _PLUGINS_ARM_ENCODING_H
+#define _PLUGINS_ARM_ENCODING_H
 
 
 
@@ -61,4 +61,4 @@ typedef enum _ArmCondCode
 
 
 
-#endif  /* _ARCH_ARM_ENCODING_H */
+#endif  /* _PLUGINS_ARM_ENCODING_H */
diff --git a/src/arch/arm/context-int.h b/plugins/arm/context-int.h
index 4e7d9a3..1ebe0a8 100644
--- a/src/arch/arm/context-int.h
+++ b/plugins/arm/context-int.h
@@ -21,14 +21,14 @@
  */
 
 
-#ifndef _ARCH_ARM_CONTEXT_INT_H
-#define _ARCH_ARM_CONTEXT_INT_H
+#ifndef _PLUGINS_ARM_CONTEXT_INT_H
+#define _PLUGINS_ARM_CONTEXT_INT_H
 
 
-#include "context.h"
+#include <arch/context-int.h>
 
 
-#include "../context-int.h"
+#include "context.h"
 
 
 
@@ -72,4 +72,4 @@ unsigned int _g_arm_context_find_encoding(GArmContext *, virt_t);
 
 
 
-#endif  /* _ARCH_ARM_CONTEXT_INT_H */
+#endif  /* _PLUGINS_ARM_CONTEXT_INT_H */
diff --git a/src/arch/arm/context.c b/plugins/arm/context.c
index 15c7bf5..15c7bf5 100644
--- a/src/arch/arm/context.c
+++ b/plugins/arm/context.c
diff --git a/src/arch/arm/context.h b/plugins/arm/context.h
index 2b5402d..8adf7d8 100644
--- a/src/arch/arm/context.h
+++ b/plugins/arm/context.h
@@ -21,8 +21,8 @@
  */
 
 
-#ifndef _ARCH_ARM_CONTEXT_H
-#define _ARCH_ARM_CONTEXT_H
+#ifndef _PLUGINS_ARM_CONTEXT_H
+#define _PLUGINS_ARM_CONTEXT_H
 
 
 #include <glib-object.h>
@@ -82,4 +82,4 @@ GArmDContext *g_arm_dcontext_new(void);
 
 
 
-#endif  /* _ARCH_ARM_CONTEXT_H */
+#endif  /* _PLUGINS_ARM_CONTEXT_H */
diff --git a/plugins/arm/core.c b/plugins/arm/core.c
new file mode 100644
index 0000000..6dd95d1
--- /dev/null
+++ b/plugins/arm/core.c
@@ -0,0 +1,83 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * core.c - intégration du support de l'architecture ARM
+ *
+ * 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/processors.h>
+#include <plugins/plugin-def.h>
+
+
+#include "python/module.h"
+#include "v7/core.h"
+#include "v7/processor.h"
+
+
+
+DEFINE_CHRYSALIDE_PLUGIN("arm", "Add suport for the ARM architecture", "0.1.0",
+                         RL("PyChrysalide"), AL(PGA_PLUGIN_INIT));
+
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : plugin = greffon à manipuler.                                *
+*                                                                             *
+*  Description : Prend acte du chargement du greffon.                         *
+*                                                                             *
+*  Retour      : -                                                            *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin)
+{
+    bool result;                            /* Bilan à retourner           */
+
+    result = register_processor_type("armv7", "ARM v7", G_TYPE_ARMV7_PROCESSOR,
+                                     init_armv7_core, exit_armv7_core);
+
+    if (result)
+        result = add_arch_arm_module_to_python_module();
+
+    return result;
+
+}
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : plugin = greffon à manipuler.                                *
+*                                                                             *
+*  Description : Prend acte du déchargement du greffon.                       *
+*                                                                             *
+*  Retour      : -                                                            *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+G_MODULE_EXPORT void chrysalide_plugin_exit(GPluginModule *plugin)
+{
+
+}
diff --git a/plugins/arm/core.h b/plugins/arm/core.h
new file mode 100644
index 0000000..9461b5e
--- /dev/null
+++ b/plugins/arm/core.h
@@ -0,0 +1,41 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * core.h - prototypes pour l'intégration du support de l'architecture ARM
+ *
+ * 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_ARM_CORE_H
+#define _PLUGINS_ARM_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 *);
+
+/* Prend acte du déchargement du greffon. */
+G_MODULE_EXPORT void chrysalide_plugin_exit(GPluginModule *);
+
+
+
+#endif  /* _PLUGINS_ARM_CORE_H */
diff --git a/src/arch/arm/instruction-int.h b/plugins/arm/instruction-int.h
index 408b44c..87ddc60 100644
--- a/src/arch/arm/instruction-int.h
+++ b/plugins/arm/instruction-int.h
@@ -21,12 +21,14 @@
  */
 
 
-#ifndef _ARCH_ARM_INSTRUCTION_INT_H
-#define _ARCH_ARM_INSTRUCTION_INT_H
+#ifndef _PLUGINS_ARM_INSTRUCTION_INT_H
+#define _PLUGINS_ARM_INSTRUCTION_INT_H
+
+
+#include <arch/instruction-int.h>
 
 
 #include "instruction.h"
-#include "../instruction-int.h"
 
 
 
@@ -52,4 +54,4 @@ struct _GArmInstructionClass
 
 
 
-#endif  /* _ARCH_ARM_INSTRUCTION_INT_H */
+#endif  /* _PLUGINS_ARM_INSTRUCTION_INT_H */
diff --git a/src/arch/arm/instruction.c b/plugins/arm/instruction.c
index bcd0f74..3a7af7f 100644
--- a/src/arch/arm/instruction.c
+++ b/plugins/arm/instruction.c
@@ -28,8 +28,10 @@
 #include <string.h>
 
 
+#include <common/extstr.h>
+
+
 #include "instruction-int.h"
-#include "../../common/extstr.h"
 
 
 
diff --git a/src/arch/arm/instruction.h b/plugins/arm/instruction.h
index 8b0110d..cebb69c 100644
--- a/src/arch/arm/instruction.h
+++ b/plugins/arm/instruction.h
@@ -21,8 +21,8 @@
  */
 
 
-#ifndef _ARCH_ARM_INSTRUCTION_H
-#define _ARCH_ARM_INSTRUCTION_H
+#ifndef _PLUGINS_ARM_INSTRUCTION_H
+#define _PLUGINS_ARM_INSTRUCTION_H
 
 
 #include <glib-object.h>
@@ -30,8 +30,10 @@
 #include <stdint.h>
 
 
+#include <arch/instruction.h>
+
+
 #include "cond.h"
-#include "../instruction.h"
 
 
 
@@ -64,4 +66,4 @@ ArmCondCode g_arm_instruction_get_cond(const GArmInstruction *);
 
 
 
-#endif  /* _ARCH_ARM_INSTRUCTION_H */
+#endif  /* _PLUGINS_ARM_INSTRUCTION_H */
diff --git a/src/arch/arm/link.c b/plugins/arm/link.c
index 57f0f98..c29a646 100644
--- a/src/arch/arm/link.c
+++ b/plugins/arm/link.c
@@ -24,9 +24,11 @@
 #include "link.h"
 
 
+#include <arch/link.h>
+
+
 #include "cond.h"
 #include "instruction.h"
-#include "../link.h"
 
 
 
diff --git a/src/arch/arm/link.h b/plugins/arm/link.h
index 216277d..de74d8f 100644
--- a/src/arch/arm/link.h
+++ b/plugins/arm/link.h
@@ -21,12 +21,12 @@
  */
 
 
-#ifndef _ARCH_ARM_LINK_H
-#define _ARCH_ARM_LINK_H
+#ifndef _PLUGINS_ARM_LINK_H
+#define _PLUGINS_ARM_LINK_H
 
 
-#include "../instruction.h"
-#include "../processor.h"
+#include <arch/instruction.h>
+#include <arch/processor.h>
 
 
 
@@ -35,4 +35,4 @@ void handle_arm_conditional_branch_as_link(GArchInstruction *, GArchProcessor *,
 
 
 
-#endif  /* _ARCH_ARM_LINK_H */
+#endif  /* _PLUGINS_ARM_LINK_H */
diff --git a/src/arch/arm/processor-int.h b/plugins/arm/processor-int.h
index 45d4380..032ba66 100644
--- a/src/arch/arm/processor-int.h
+++ b/plugins/arm/processor-int.h
@@ -21,12 +21,14 @@
  */
 
 
-#ifndef _ARCH_ARM_PROCESSOR_INT_H
-#define _ARCH_ARM_PROCESSOR_INT_H
+#ifndef _PLUGINS_ARM_PROCESSOR_INT_H
+#define _PLUGINS_ARM_PROCESSOR_INT_H
+
+
+#include <arch/processor-int.h>
 
 
 #include "processor.h"
-#include "../processor-int.h"
 
 
 
@@ -47,4 +49,4 @@ struct _GArmProcessorClass
 
 
 
-#endif  /* _ARCH_ARM_PROCESSOR_INT_H */
+#endif  /* _PLUGINS_ARM_PROCESSOR_INT_H */
diff --git a/src/arch/arm/processor.c b/plugins/arm/processor.c
index 4906799..4906799 100644
--- a/src/arch/arm/processor.c
+++ b/plugins/arm/processor.c
diff --git a/src/arch/arm/processor.h b/plugins/arm/processor.h
index 7f65def..bebbde4 100644
--- a/src/arch/arm/processor.h
+++ b/plugins/arm/processor.h
@@ -21,8 +21,8 @@
  */
 
 
-#ifndef _ARCH_ARM_PROCESSOR_H
-#define _ARCH_ARM_PROCESSOR_H
+#ifndef _PLUGINS_ARM_PROCESSOR_H
+#define _PLUGINS_ARM_PROCESSOR_H
 
 
 #include <glib-object.h>
@@ -50,4 +50,4 @@ GType g_arm_processor_get_type(void);
 
 
 
-#endif  /* _ARCH_ARM_PROCESSOR_H */
+#endif  /* _PLUGINS_ARM_PROCESSOR_H */
diff --git a/plugins/pychrysa/arch/arm/Makefile.am b/plugins/arm/python/Makefile.am
index b081061..63bc7be 100644
--- a/plugins/pychrysa/arch/arm/Makefile.am
+++ b/plugins/arm/python/Makefile.am
@@ -1,19 +1,19 @@
 
-noinst_LTLIBRARIES = libpychrysaarcharm.la
+noinst_LTLIBRARIES = libarmpython.la
 
-libpychrysaarcharm_la_SOURCES =			\
+libarmpython_la_SOURCES =				\
 	instruction.h instruction.c			\
 	module.h module.c					\
 	processor.h processor.c
 
-libpychrysaarcharm_la_LIBADD =			\
-	v7/libpychrysaarcharmv7.la
+libarmpython_la_LIBADD =				\
+	v7/libarmpythonv7.la
 
-libpychrysaarcharm_la_LDFLAGS = 
+libarmpython_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/arch/arm/instruction.c b/plugins/arm/python/instruction.c
index 7c5f41d..bbcde50 100644
--- a/plugins/pychrysa/arch/arm/instruction.c
+++ b/plugins/arm/python/instruction.c
@@ -28,11 +28,11 @@
 #include <pygobject.h>
 
 
-#include <arch/arm/instruction.h>
+#include <plugins/pychrysa/helpers.h>
+#include <plugins/pychrysa/arch/instruction.h>
 
 
 #include "../instruction.h"
-#include "../../helpers.h"
 
 
 
diff --git a/plugins/pychrysa/arch/arm/instruction.h b/plugins/arm/python/instruction.h
index c10c41c..fec82bb 100644
--- a/plugins/pychrysa/arch/arm/instruction.h
+++ b/plugins/arm/python/instruction.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSALIDE_ARCH_ARM_INSTRUCTION_H
-#define _PLUGINS_PYCHRYSALIDE_ARCH_ARM_INSTRUCTION_H
+#ifndef _PLUGINS_ARM_PYTHON_INSTRUCTION_H
+#define _PLUGINS_ARM_PYTHON_INSTRUCTION_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_arm_instruction(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSALIDE_ARCH_ARM_INSTRUCTION_H */
+#endif  /* _PLUGINS_ARM_PYTHON_INSTRUCTION_H */
diff --git a/plugins/pychrysa/arch/arm/module.c b/plugins/arm/python/module.c
index 7036449..6d71afe 100644
--- a/plugins/pychrysa/arch/arm/module.c
+++ b/plugins/arm/python/module.c
@@ -25,6 +25,12 @@
 #include "module.h"
 
 
+#include <Python.h>
+
+
+#include <plugins/pychrysa/access.h>
+
+
 #include "instruction.h"
 #include "processor.h"
 #include "v7/module.h"
@@ -33,7 +39,7 @@
 
 /******************************************************************************
 *                                                                             *
-*  Paramètres  : module = module dont la définition est à compléter.          *
+*  Paramètres  : -                                                            *
 *                                                                             *
 *  Description : Ajoute le module 'arm' au module Python.                     *
 *                                                                             *
@@ -43,9 +49,10 @@
 *                                                                             *
 ******************************************************************************/
 
-bool add_arch_arm_module_to_python_module(PyObject *super)
+bool add_arch_arm_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            */
 
@@ -62,6 +69,8 @@ bool add_arch_arm_module_to_python_module(PyObject *super)
 
     result = false;
 
+    super = get_access_to_python_module("pychrysalide.arch");
+
     module = PyModule_Create(&py_chrysalide_arm_module);
     if (module == NULL) return false;
 
diff --git a/plugins/pychrysa/arch/arm/module.h b/plugins/arm/python/module.h
index 9a945e7..aeacd3d 100644
--- a/plugins/pychrysa/arch/arm/module.h
+++ b/plugins/arm/python/module.h
@@ -22,18 +22,17 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSALIDE_ARCH_ARM_MODULE_H
-#define _PLUGINS_PYCHRYSALIDE_ARCH_ARM_MODULE_H
+#ifndef _PLUGINS_ARM_PYTHON_MODULE_H
+#define _PLUGINS_ARM_PYTHON_MODULE_H
 
 
-#include <Python.h>
 #include <stdbool.h>
 
 
 
 /* Ajoute le module 'arm' au module Python. */
-bool add_arch_arm_module_to_python_module(PyObject *);
+bool add_arch_arm_module_to_python_module(void);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSALIDE_ARCH_ARM_MODULE_H */
+#endif  /* _PLUGINS_ARM_PYTHON_MODULE_H */
diff --git a/plugins/pychrysa/arch/arm/processor.c b/plugins/arm/python/processor.c
index 32cdf0c..818809d 100644
--- a/plugins/pychrysa/arch/arm/processor.c
+++ b/plugins/arm/python/processor.c
@@ -28,11 +28,11 @@
 #include <pygobject.h>
 
 
-#include <arch/arm/processor.h>
+#include <plugins/pychrysa/helpers.h>
+#include <plugins/pychrysa/arch/processor.h>
 
 
 #include "../processor.h"
-#include "../../helpers.h"
 
 
 
diff --git a/plugins/pychrysa/arch/arm/processor.h b/plugins/arm/python/processor.h
index 5039e7b..36512ff 100644
--- a/plugins/pychrysa/arch/arm/processor.h
+++ b/plugins/arm/python/processor.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSALIDE_ARCH_ARM_PROCESSOR_H
-#define _PLUGINS_PYCHRYSALIDE_ARCH_ARM_PROCESSOR_H
+#ifndef _PLUGINS_ARM_PYTHON_PROCESSOR_H
+#define _PLUGINS_ARM_PYTHON_PROCESSOR_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_arm_processor(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSALIDE_ARCH_ARM_PROCESSOR_H */
+#endif  /* _PLUGINS_ARM_PYTHON_PROCESSOR_H */
diff --git a/plugins/pychrysa/arch/arm/v7/Makefile.am b/plugins/arm/python/v7/Makefile.am
index d95aff3..f4f6df4 100644
--- a/plugins/pychrysa/arch/arm/v7/Makefile.am
+++ b/plugins/arm/python/v7/Makefile.am
@@ -1,16 +1,16 @@
 
-noinst_LTLIBRARIES = libpychrysaarcharmv7.la
+noinst_LTLIBRARIES = libarmpythonv7.la
 
-libpychrysaarcharmv7_la_SOURCES =		\
+libarmpythonv7_la_SOURCES =				\
 	instruction.h instruction.c			\
 	module.h module.c					\
 	processor.h processor.c
 
 
-libpychrysaarcharmv7_la_LDFLAGS = 
+libarmpythonv7_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/arch/arm/v7/instruction.c b/plugins/arm/python/v7/instruction.c
index 2964f16..25a49bb 100644
--- a/plugins/pychrysa/arch/arm/v7/instruction.c
+++ b/plugins/arm/python/v7/instruction.c
@@ -28,11 +28,11 @@
 #include <pygobject.h>
 
 
-#include <arch/arm/v7/instruction.h>
+#include <plugins/pychrysa/helpers.h>
 
 
 #include "../instruction.h"
-#include "../../../helpers.h"
+#include "../../v7/instruction.h"
 
 
 
diff --git a/plugins/pychrysa/arch/arm/v7/instruction.h b/plugins/arm/python/v7/instruction.h
index cf10039..a1a04be 100644
--- a/plugins/pychrysa/arch/arm/v7/instruction.h
+++ b/plugins/arm/python/v7/instruction.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSALIDE_ARCH_ARM_V7_INSTRUCTION_H
-#define _PLUGINS_PYCHRYSALIDE_ARCH_ARM_V7_INSTRUCTION_H
+#ifndef _PLUGINS_ARM_PYTHON_V7_INSTRUCTION_H
+#define _PLUGINS_ARM_PYTHON_V7_INSTRUCTION_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_armv7_instruction(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSALIDE_ARCH_ARM_V7_INSTRUCTION_H */
+#endif  /* _PLUGINS_ARM_PYTHON_V7_INSTRUCTION_H */
diff --git a/plugins/pychrysa/arch/arm/v7/module.c b/plugins/arm/python/v7/module.c
index 9188ae4..9188ae4 100644
--- a/plugins/pychrysa/arch/arm/v7/module.c
+++ b/plugins/arm/python/v7/module.c
diff --git a/plugins/pychrysa/arch/arm/v7/module.h b/plugins/arm/python/v7/module.h
index 18e7d47..fc5ba8c 100644
--- a/plugins/pychrysa/arch/arm/v7/module.h
+++ b/plugins/arm/python/v7/module.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSALIDE_ARCH_ARM_V7_MODULE_H
-#define _PLUGINS_PYCHRYSALIDE_ARCH_ARM_V7_MODULE_H
+#ifndef _PLUGINS_ARM_PYTHON_V7_MODULE_H
+#define _PLUGINS_ARM_PYTHON_V7_MODULE_H
 
 
 #include <Python.h>
@@ -36,4 +36,4 @@ bool add_arch_arm_v7_module_to_python_module(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSALIDE_ARCH_ARM_V7_MODULE_H */
+#endif  /* _PLUGINS_ARM_PYTHON_V7_MODULE_H */
diff --git a/plugins/pychrysa/arch/arm/v7/processor.c b/plugins/arm/python/v7/processor.c
index cd0e9eb..9a0911c 100644
--- a/plugins/pychrysa/arch/arm/v7/processor.c
+++ b/plugins/arm/python/v7/processor.c
@@ -28,11 +28,11 @@
 #include <pygobject.h>
 
 
-#include <arch/arm/v7/processor.h>
+#include <plugins/pychrysa/helpers.h>
 
 
 #include "../processor.h"
-#include "../../../helpers.h"
+#include "../../v7/processor.h"
 
 
 
diff --git a/plugins/pychrysa/arch/arm/v7/processor.h b/plugins/arm/python/v7/processor.h
index 6d7cb4a..3226abd 100644
--- a/plugins/pychrysa/arch/arm/v7/processor.h
+++ b/plugins/arm/python/v7/processor.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSALIDE_ARCH_ARM_V7_PROCESSOR_H
-#define _PLUGINS_PYCHRYSALIDE_ARCH_ARM_V7_PROCESSOR_H
+#ifndef _PLUGINS_ARM_PYTHON_V7_PROCESSOR_H
+#define _PLUGINS_ARM_PYTHON_V7_PROCESSOR_H
 
 
 #include <Python.h>
@@ -39,4 +39,4 @@ bool register_python_armv7_processor(PyObject *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSALIDE_ARCH_ARM_V7_PROCESSOR_H */
+#endif  /* _PLUGINS_ARM_PYTHON_V7_PROCESSOR_H */
diff --git a/src/arch/arm/register-int.h b/plugins/arm/register-int.h
index ec80bdd..9032d0f 100644
--- a/src/arch/arm/register-int.h
+++ b/plugins/arm/register-int.h
@@ -21,13 +21,15 @@
  */
 
 
-#ifndef _ARCH_ARM_REGISTER_INT_H
-#define _ARCH_ARM_REGISTER_INT_H
+#ifndef _PLUGINS_ARM_REGISTER_INT_H
+#define _PLUGINS_ARM_REGISTER_INT_H
 
 
 
+#include <arch/register-int.h>
+
+
 #include "register.h"
-#include "../register-int.h"
 
 
 
@@ -53,4 +55,4 @@ struct _GArmRegisterClass
 
 
 
-#endif  /* _ARCH_ARM_REGISTER_INT_H */
+#endif  /* _PLUGINS_ARM_REGISTER_INT_H */
diff --git a/src/arch/arm/register.c b/plugins/arm/register.c
index c351f12..8e1d741 100644
--- a/src/arch/arm/register.c
+++ b/plugins/arm/register.c
@@ -24,8 +24,10 @@
 #include "register.h"
 
 
+#include <common/sort.h>
+
+
 #include "register-int.h"
-#include "../../common/sort.h"
 
 
 
diff --git a/src/arch/arm/register.h b/plugins/arm/register.h
index cb4e492..e9994a7 100644
--- a/src/arch/arm/register.h
+++ b/plugins/arm/register.h
@@ -21,8 +21,8 @@
  */
 
 
-#ifndef _ARCH_ARM_REGISTER_H
-#define _ARCH_ARM_REGISTER_H
+#ifndef _PLUGINS_ARM_REGISTER_H
+#define _PLUGINS_ARM_REGISTER_H
 
 
 #include <glib-object.h>
@@ -53,4 +53,4 @@ uint8_t g_arm_register_get_index(const GArmRegister *);
 
 
 
-#endif  /* _ARCH_ARM_REGISTER_H */
+#endif  /* _PLUGINS_ARM_REGISTER_H */
diff --git a/src/arch/arm/v7/Makefile.am b/plugins/arm/v7/Makefile.am
index 339bc29..e2fc96c 100644
--- a/src/arch/arm/v7/Makefile.am
+++ b/plugins/arm/v7/Makefile.am
@@ -1,7 +1,7 @@
 
-noinst_LTLIBRARIES = libarcharmv7.la
+noinst_LTLIBRARIES = libarmv7.la
 
-libarcharmv7_la_SOURCES =				\
+libarmv7_la_SOURCES =					\
 	arm.h arm.c							\
 	context.h context.c					\
 	core.h core.c						\
@@ -18,14 +18,14 @@ libarcharmv7_la_SOURCES =				\
 	thumb_16.h thumb_16.c				\
 	thumb_32.h thumb_32.c
 
-libarcharmv7_la_LIBADD =				\
-	opcodes/libarcharmv7opcodes.la		\
-	operands/libarcharmv7operands.la
+libarmv7_la_LIBADD =					\
+	opcodes/libarmv7opcodes.la			\
+	operands/libarmv7operands.la
 
-libarcharmv7_la_CFLAGS = $(AM_CFLAGS)
+libarmv7_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/arm/v7/arm.c b/plugins/arm/v7/arm.c
index 55593af..89a17b6 100644
--- a/src/arch/arm/v7/arm.c
+++ b/plugins/arm/v7/arm.c
@@ -27,11 +27,13 @@
 #include <stdint.h>
 
 
+#include <arch/undefined.h>
+#include <common/bconst.h>
+
+
 #include "simd.h"
 #include "opcodes/arm_opcodes.h"
 #include "opcodes/opcodes_tmp_arm.h"
-#include "../../undefined.h"
-#include "../../../common/bconst.h"
 
 
 
diff --git a/src/arch/arm/v7/arm.h b/plugins/arm/v7/arm.h
index 997bf64..015f1d4 100644
--- a/src/arch/arm/v7/arm.h
+++ b/plugins/arm/v7/arm.h
@@ -21,11 +21,11 @@
  */
 
 
-#ifndef _ARCH_ARM_V7_ARM_H
-#define _ARCH_ARM_V7_ARM_H
+#ifndef _PLUGINS_ARM_V7_ARM_H
+#define _PLUGINS_ARM_V7_ARM_H
 
 
-#include "../../instruction.h"
+#include <arch/instruction.h>
 
 
 
@@ -34,4 +34,4 @@ GArchInstruction *process_armv7_arm_instruction_set_encoding(uint32_t raw);
 
 
 
-#endif  /* _ARCH_ARM_V7_ARM_H */
+#endif  /* _PLUGINS_ARM_V7_ARM_H */
diff --git a/src/arch/arm/v7/build_tmp_decl.sh b/plugins/arm/v7/build_tmp_decl.sh
index 0d0feee..0d0feee 100755
--- a/src/arch/arm/v7/build_tmp_decl.sh
+++ b/plugins/arm/v7/build_tmp_decl.sh
diff --git a/src/arch/arm/v7/context.c b/plugins/arm/v7/context.c
index 8fc7fc1..8fc7fc1 100644
--- a/src/arch/arm/v7/context.c
+++ b/plugins/arm/v7/context.c
diff --git a/src/arch/arm/v7/context.h b/plugins/arm/v7/context.h
index 2c3ff03..4a4612d 100644
--- a/src/arch/arm/v7/context.h
+++ b/plugins/arm/v7/context.h
@@ -21,14 +21,14 @@
  */
 
 
-#ifndef _ARCH_ARM_V7_CONTEXT_H
-#define _ARCH_ARM_V7_CONTEXT_H
+#ifndef _PLUGINS_ARM_V7_CONTEXT_H
+#define _PLUGINS_ARM_V7_CONTEXT_H
 
 
 #include <glib-object.h>
 
 
-#include "../../vmpa.h"
+#include <arch/vmpa.h>
 
 
 
@@ -78,4 +78,4 @@ ArmV7InstrSet g_armv7_context_find_encoding(GArmV7Context *, virt_t);
 
 
 
-#endif  /* _ARCH_ARM_V7_CONTEXT_H */
+#endif  /* _PLUGINS_ARM_V7_CONTEXT_H */
diff --git a/src/arch/arm/v7/core.c b/plugins/arm/v7/core.c
index a2d0e45..a2d0e45 100644
--- a/src/arch/arm/v7/core.c
+++ b/plugins/arm/v7/core.c
diff --git a/src/arch/arm/v7/core.h b/plugins/arm/v7/core.h
index b4c254f..0a67baf 100644
--- a/src/arch/arm/v7/core.h
+++ b/plugins/arm/v7/core.h
@@ -21,8 +21,8 @@
  */
 
 
-#ifndef _ARCH_ARM_V7_CORE_H
-#define _ARCH_ARM_V7_CORE_H
+#ifndef _PLUGINS_ARM_V7_CORE_H
+#define _PLUGINS_ARM_V7_CORE_H
 
 
 #include <stdbool.h>
@@ -37,4 +37,4 @@ void exit_armv7_core(void);
 
 
 
-#endif  /* _ARCH_ARM_V7_CORE_H */
+#endif  /* _PLUGINS_ARM_V7_CORE_H */
diff --git a/src/arch/arm/v7/cregister.c b/plugins/arm/v7/cregister.c
index 33564f0..33564f0 100644
--- a/src/arch/arm/v7/cregister.c
+++ b/plugins/arm/v7/cregister.c
diff --git a/src/arch/arm/v7/cregister.h b/plugins/arm/v7/cregister.h
index 5d3a6cf..d6c2c63 100644
--- a/src/arch/arm/v7/cregister.h
+++ b/plugins/arm/v7/cregister.h
@@ -21,8 +21,8 @@
  */
 
 
-#ifndef _ARCH_ARM_V7_CREGISTER_H
-#define _ARCH_ARM_V7_CREGISTER_H
+#ifndef _PLUGINS_ARM_V7_CREGISTER_H
+#define _PLUGINS_ARM_V7_CREGISTER_H
 
 
 #include <glib-object.h>
@@ -53,4 +53,4 @@ GArmV7CRegister *g_armv7_cregister_new(uint8_t);
 
 
 
-#endif  /* _ARCH_ARM_V7_CREGISTER_H */
+#endif  /* _PLUGINS_ARM_V7_CREGISTER_H */
diff --git a/src/arch/arm/v7/fetch.c b/plugins/arm/v7/fetch.c
index dee9aa2..005a48d 100644
--- a/src/arch/arm/v7/fetch.c
+++ b/plugins/arm/v7/fetch.c
@@ -29,13 +29,13 @@
 
 
 #include <i18n.h>
+#include <arch/raw.h>
+#include <format/format.h>
+#include <format/preload.h>
 
 
 #include "operands/offset.h"
 #include "../register.h"
-#include "../../raw.h"
-#include "../../../format/format.h"
-#include "../../../format/preload.h"
 
 
 
diff --git a/src/arch/arm/v7/fetch.h b/plugins/arm/v7/fetch.h
index ece4b42..52777d7 100644
--- a/src/arch/arm/v7/fetch.h
+++ b/plugins/arm/v7/fetch.h
@@ -21,12 +21,14 @@
  */
 
 
-#ifndef _ARCH_ARM_V7_FETCH_H
-#define _ARCH_ARM_V7_FETCH_H
+#ifndef _PLUGINS_ARM_V7_FETCH_H
+#define _PLUGINS_ARM_V7_FETCH_H
+
+
+#include <arch/instruction.h>
 
 
 #include "context.h"
-#include "../../instruction.h"
 
 
 
@@ -109,4 +111,4 @@ static inline void help_fetching_with_instruction_ldr_literal_from_thumb(GArchIn
 
 
 
-#endif  /* _ARCH_ARM_V7_FETCH_H */
+#endif  /* _PLUGINS_ARM_V7_FETCH_H */
diff --git a/src/arch/arm/v7/helpers.c b/plugins/arm/v7/helpers.c
index 4fa3667..03786c0 100644
--- a/src/arch/arm/v7/helpers.c
+++ b/plugins/arm/v7/helpers.c
@@ -24,11 +24,13 @@
 #include "helpers.h"
 
 
+#include <arch/register.h>
+#include <arch/immediate.h>
+#include <common/asm.h>
+#include <common/bconst.h>
+
+
 #include "register.h"
-#include "../../register.h"
-#include "../../immediate.h"
-#include "../../../common/asm.h"
-#include "../../../common/bconst.h"
 
 
 
diff --git a/src/arch/arm/v7/helpers.h b/plugins/arm/v7/helpers.h
index aed7f3f..94b85f9 100644
--- a/src/arch/arm/v7/helpers.h
+++ b/plugins/arm/v7/helpers.h
@@ -21,8 +21,11 @@
  */
 
 
-#ifndef _ARCH_ARM_V7_HELPERS_H
-#define _ARCH_ARM_V7_HELPERS_H
+#ifndef _PLUGINS_ARM_V7_HELPERS_H
+#define _PLUGINS_ARM_V7_HELPERS_H
+
+
+#include <arch/operand.h>
 
 
 #include "cregister.h"
@@ -36,7 +39,6 @@
 #include "operands/rotation.h"
 #include "operands/shift.h"
 #include "../register.h"
-#include "../../operand.h"
 
 
 
@@ -436,4 +438,4 @@ GArchOperand *zero_extend_armv7_imm(uint32_t, unsigned int);
 
 
 
-#endif  /* _ARCH_ARM_V7_HELPERS_H */
+#endif  /* _PLUGINS_ARM_V7_HELPERS_H */
diff --git a/src/arch/arm/v7/instruction.c b/plugins/arm/v7/instruction.c
index d9e4275..d9e4275 100644
--- a/src/arch/arm/v7/instruction.c
+++ b/plugins/arm/v7/instruction.c
diff --git a/src/arch/arm/v7/instruction.h b/plugins/arm/v7/instruction.h
index 4b3c006..2a1ff67 100644
--- a/src/arch/arm/v7/instruction.h
+++ b/plugins/arm/v7/instruction.h
@@ -21,8 +21,8 @@
  */
 
 
-#ifndef _ARCH_ARM_V7_INSTRUCTION_H
-#define _ARCH_ARM_V7_INSTRUCTION_H
+#ifndef _PLUGINS_ARM_V7_INSTRUCTION_H
+#define _PLUGINS_ARM_V7_INSTRUCTION_H
 
 
 #include <glib-object.h>
@@ -30,7 +30,7 @@
 #include <stdint.h>
 
 
-#include "../../instruction.h"
+#include <arch/instruction.h>
 
 
 
@@ -66,4 +66,4 @@ bool g_armv7_instruction_get_setflags(const GArmV7Instruction *);
 
 
 
-#endif  /* _ARCH_ARM_V7_INSTRUCTION_H */
+#endif  /* _PLUGINS_ARM_V7_INSTRUCTION_H */
diff --git a/src/arch/arm/v7/link.c b/plugins/arm/v7/link.c
index 68cde7b..68cde7b 100644
--- a/src/arch/arm/v7/link.c
+++ b/plugins/arm/v7/link.c
diff --git a/src/arch/arm/v7/link.h b/plugins/arm/v7/link.h
index d4e2a60..636e2b3 100644
--- a/src/arch/arm/v7/link.h
+++ b/plugins/arm/v7/link.h
@@ -21,12 +21,14 @@
  */
 
 
-#ifndef _ARCH_ARM_V7_LINK_H
-#define _ARCH_ARM_V7_LINK_H
+#ifndef _PLUGINS_ARM_V7_LINK_H
+#define _PLUGINS_ARM_V7_LINK_H
+
+
+#include <arch/instruction.h>
 
 
 #include "context.h"
-#include "../../instruction.h"
 
 
 
@@ -38,4 +40,4 @@ void handle_armv7_return_from_pop(GArchInstruction *, GArchProcessor *, GProcCon
 
 
 
-#endif  /* _ARCH_ARM_V7_LINK_H */
+#endif  /* _PLUGINS_ARM_V7_LINK_H */
diff --git a/src/arch/arm/v7/opcodes/Makefile.am b/plugins/arm/v7/opcodes/Makefile.am
index fb00143..a169c2b 100644
--- a/src/arch/arm/v7/opcodes/Makefile.am
+++ b/plugins/arm/v7/opcodes/Makefile.am
@@ -9,18 +9,18 @@ am__depfiles_maybe = depfiles
 
 include gencode.mk
 
-noinst_LTLIBRARIES = libarcharmv7opcodes.la
+noinst_LTLIBRARIES = libarmv7opcodes.la
 
-libarcharmv7opcodes_la_SOURCES = $(GENERATED_FILES)
+libarmv7opcodes_la_SOURCES = $(GENERATED_FILES)
 
-libarcharmv7opcodes_la_LIBADD =
+libarmv7opcodes_la_LIBADD =
 
-libarcharmv7opcodes_la_CFLAGS = $(AM_CFLAGS)
+libarmv7opcodes_la_CFLAGS = $(AM_CFLAGS)
 
 
 AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
 
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
+AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) -I$(top_srcdir)/src
 
 
 EXTRA_DIST = opcodes_tmp_arm.h opcodes_tmp_simd.h opcodes_tmp_thumb_16.h opcodes_tmp_thumb_32.h
diff --git a/src/arch/arm/v7/opcodes/opcodes_tmp_arm.h b/plugins/arm/v7/opcodes/opcodes_tmp_arm.h
index 4106cbd..4106cbd 100644
--- a/src/arch/arm/v7/opcodes/opcodes_tmp_arm.h
+++ b/plugins/arm/v7/opcodes/opcodes_tmp_arm.h
diff --git a/src/arch/arm/v7/opcodes/opcodes_tmp_simd.h b/plugins/arm/v7/opcodes/opcodes_tmp_simd.h
index 1d7023e..1d7023e 100644
--- a/src/arch/arm/v7/opcodes/opcodes_tmp_simd.h
+++ b/plugins/arm/v7/opcodes/opcodes_tmp_simd.h
diff --git a/src/arch/arm/v7/opcodes/opcodes_tmp_thumb_16.h b/plugins/arm/v7/opcodes/opcodes_tmp_thumb_16.h
index 1968037..1968037 100644
--- a/src/arch/arm/v7/opcodes/opcodes_tmp_thumb_16.h
+++ b/plugins/arm/v7/opcodes/opcodes_tmp_thumb_16.h
diff --git a/src/arch/arm/v7/opcodes/opcodes_tmp_thumb_32.h b/plugins/arm/v7/opcodes/opcodes_tmp_thumb_32.h
index 1ed547c..1ed547c 100644
--- a/src/arch/arm/v7/opcodes/opcodes_tmp_thumb_32.h
+++ b/plugins/arm/v7/opcodes/opcodes_tmp_thumb_32.h
diff --git a/src/arch/arm/v7/opdefs/Makefile.am b/plugins/arm/v7/opdefs/Makefile.am
index a702d10..3f69a3f 100644
--- a/src/arch/arm/v7/opdefs/Makefile.am
+++ b/plugins/arm/v7/opdefs/Makefile.am
@@ -1,9 +1,9 @@
 
-include ../../../../../tools/d2c/d2c.mk
+include ../../../../tools/d2c/d2c.mk
 
 
-D2C_BIN = ../../../../../tools/d2c/d2c
-GEN_BIN = ../../../../../tools/d2c/d2c_genmakefile.sh
+D2C_BIN = ../../../../tools/d2c/d2c
+GEN_BIN = ../../../../tools/d2c/d2c_genmakefile.sh
 
 D2C_TYPE = raw
 
@@ -38,21 +38,22 @@ D2C_OPERANDS =							\
 	-n ZeroExtend
 
 FIXED_C_INCLUDES = \
-	\n\#include \"..\/helpers.h\" \
-	\n\#include \"..\/instruction.h\" \
-	\n\#include \"..\/fetch.h\" \
-	\n\#include \"..\/link.h\" \
-	\n\#include \"..\/post.h\" \
-	\n\#include \"..\/..\/instruction.h\" \
-	\n\#include \"..\/..\/link.h\" \
-	\n\#include \"..\/..\/..\/link.h\" \
-	\n\#include \"..\/..\/..\/..\/common\/bconst.h\" \
+	\n\#include <arch/link.h> \
+	\n\#include <common/bconst.h> \
+	\n \
+	\n\#include \"../helpers.h\" \
+	\n\#include \"../instruction.h\" \
+	\n\#include \"../fetch.h\" \
+	\n\#include \"../link.h\" \
+	\n\#include \"../post.h\" \
+	\n\#include \"../../instruction.h\" \
+	\n\#include \"../../link.h\" \
 	\n\n
 
 FIXED_H_INCLUDES = \
-        \n\#include \<stdint.h\> \
+        \n\#include <stdint.h> \
         \n \
-        \n\#include \"..\/..\/..\/instruction.h\" \
+        \n\#include <arch/instruction.h> \
         \n\n
 
 
@@ -294,7 +295,7 @@ dist-hook:
 all: $(ARMV7_DEFS:.d=.g) fmk.done d2c_final_rules
 
 fmk.done: $(ARMV7_DEFS)
-	$(GEN_BIN) ../opcodes/ ../opdefs/.gen ../../../../../tools/d2c/globalgen.mk arm thumb_32 thumb_16
+	$(GEN_BIN) ../opcodes/ ../opdefs/.gen ../../../../tools/d2c/globalgen.mk arm thumb_32 thumb_16
 	touch $@
 
 clean:
diff --git a/src/arch/arm/v7/opdefs/adc_A881.d b/plugins/arm/v7/opdefs/adc_A881.d
index 6bc66e2..6bc66e2 100644
--- a/src/arch/arm/v7/opdefs/adc_A881.d
+++ b/plugins/arm/v7/opdefs/adc_A881.d
diff --git a/src/arch/arm/v7/opdefs/adc_A882.d b/plugins/arm/v7/opdefs/adc_A882.d
index 27ce6ad..27ce6ad 100644
--- a/src/arch/arm/v7/opdefs/adc_A882.d
+++ b/plugins/arm/v7/opdefs/adc_A882.d
diff --git a/src/arch/arm/v7/opdefs/adc_A883.d b/plugins/arm/v7/opdefs/adc_A883.d
index a9c56d8..a9c56d8 100644
--- a/src/arch/arm/v7/opdefs/adc_A883.d
+++ b/plugins/arm/v7/opdefs/adc_A883.d
diff --git a/src/arch/arm/v7/opdefs/add_A8810.d b/plugins/arm/v7/opdefs/add_A8810.d
index 2047276..2047276 100644
--- a/src/arch/arm/v7/opdefs/add_A8810.d
+++ b/plugins/arm/v7/opdefs/add_A8810.d
diff --git a/src/arch/arm/v7/opdefs/add_A8811.d b/plugins/arm/v7/opdefs/add_A8811.d
index 5b6c0d1..5b6c0d1 100644
--- a/src/arch/arm/v7/opdefs/add_A8811.d
+++ b/plugins/arm/v7/opdefs/add_A8811.d
diff --git a/src/arch/arm/v7/opdefs/add_A884.d b/plugins/arm/v7/opdefs/add_A884.d
index 8b624a7..8b624a7 100644
--- a/src/arch/arm/v7/opdefs/add_A884.d
+++ b/plugins/arm/v7/opdefs/add_A884.d
diff --git a/src/arch/arm/v7/opdefs/add_A885.d b/plugins/arm/v7/opdefs/add_A885.d
index 0f4a919..0f4a919 100644
--- a/src/arch/arm/v7/opdefs/add_A885.d
+++ b/plugins/arm/v7/opdefs/add_A885.d
diff --git a/src/arch/arm/v7/opdefs/add_A886.d b/plugins/arm/v7/opdefs/add_A886.d
index e4f9e00..e4f9e00 100644
--- a/src/arch/arm/v7/opdefs/add_A886.d
+++ b/plugins/arm/v7/opdefs/add_A886.d
diff --git a/src/arch/arm/v7/opdefs/add_A887.d b/plugins/arm/v7/opdefs/add_A887.d
index 18400a6..18400a6 100644
--- a/src/arch/arm/v7/opdefs/add_A887.d
+++ b/plugins/arm/v7/opdefs/add_A887.d
diff --git a/src/arch/arm/v7/opdefs/add_A888.d b/plugins/arm/v7/opdefs/add_A888.d
index 5549145..5549145 100644
--- a/src/arch/arm/v7/opdefs/add_A888.d
+++ b/plugins/arm/v7/opdefs/add_A888.d
diff --git a/src/arch/arm/v7/opdefs/add_A889.d b/plugins/arm/v7/opdefs/add_A889.d
index 5fab17c..5fab17c 100644
--- a/src/arch/arm/v7/opdefs/add_A889.d
+++ b/plugins/arm/v7/opdefs/add_A889.d
diff --git a/src/arch/arm/v7/opdefs/adr_A8812.d b/plugins/arm/v7/opdefs/adr_A8812.d
index 16615cb..16615cb 100644
--- a/src/arch/arm/v7/opdefs/adr_A8812.d
+++ b/plugins/arm/v7/opdefs/adr_A8812.d
diff --git a/src/arch/arm/v7/opdefs/and_A8813.d b/plugins/arm/v7/opdefs/and_A8813.d
index 3e1d0ed..3e1d0ed 100644
--- a/src/arch/arm/v7/opdefs/and_A8813.d
+++ b/plugins/arm/v7/opdefs/and_A8813.d
diff --git a/src/arch/arm/v7/opdefs/and_A8814.d b/plugins/arm/v7/opdefs/and_A8814.d
index 77f7e55..77f7e55 100644
--- a/src/arch/arm/v7/opdefs/and_A8814.d
+++ b/plugins/arm/v7/opdefs/and_A8814.d
diff --git a/src/arch/arm/v7/opdefs/and_A8815.d b/plugins/arm/v7/opdefs/and_A8815.d
index 5ace3fa..5ace3fa 100644
--- a/src/arch/arm/v7/opdefs/and_A8815.d
+++ b/plugins/arm/v7/opdefs/and_A8815.d
diff --git a/src/arch/arm/v7/opdefs/asr_A8816.d b/plugins/arm/v7/opdefs/asr_A8816.d
index 006a26c..006a26c 100644
--- a/src/arch/arm/v7/opdefs/asr_A8816.d
+++ b/plugins/arm/v7/opdefs/asr_A8816.d
diff --git a/src/arch/arm/v7/opdefs/asr_A8817.d b/plugins/arm/v7/opdefs/asr_A8817.d
index 1e1e9c1..1e1e9c1 100644
--- a/src/arch/arm/v7/opdefs/asr_A8817.d
+++ b/plugins/arm/v7/opdefs/asr_A8817.d
diff --git a/src/arch/arm/v7/opdefs/b_A8818.d b/plugins/arm/v7/opdefs/b_A8818.d
index 9e27753..9e27753 100644
--- a/src/arch/arm/v7/opdefs/b_A8818.d
+++ b/plugins/arm/v7/opdefs/b_A8818.d
diff --git a/src/arch/arm/v7/opdefs/bfc_A8819.d b/plugins/arm/v7/opdefs/bfc_A8819.d
index 0ee99c8..0ee99c8 100644
--- a/src/arch/arm/v7/opdefs/bfc_A8819.d
+++ b/plugins/arm/v7/opdefs/bfc_A8819.d
diff --git a/src/arch/arm/v7/opdefs/bfi_A8820.d b/plugins/arm/v7/opdefs/bfi_A8820.d
index 1d2bb2f..1d2bb2f 100644
--- a/src/arch/arm/v7/opdefs/bfi_A8820.d
+++ b/plugins/arm/v7/opdefs/bfi_A8820.d
diff --git a/src/arch/arm/v7/opdefs/bic_A8821.d b/plugins/arm/v7/opdefs/bic_A8821.d
index 9171b69..9171b69 100644
--- a/src/arch/arm/v7/opdefs/bic_A8821.d
+++ b/plugins/arm/v7/opdefs/bic_A8821.d
diff --git a/src/arch/arm/v7/opdefs/bic_A8822.d b/plugins/arm/v7/opdefs/bic_A8822.d
index 8503460..8503460 100644
--- a/src/arch/arm/v7/opdefs/bic_A8822.d
+++ b/plugins/arm/v7/opdefs/bic_A8822.d
diff --git a/src/arch/arm/v7/opdefs/bic_A8823.d b/plugins/arm/v7/opdefs/bic_A8823.d
index e6903db..e6903db 100644
--- a/src/arch/arm/v7/opdefs/bic_A8823.d
+++ b/plugins/arm/v7/opdefs/bic_A8823.d
diff --git a/src/arch/arm/v7/opdefs/bkpt_A8824.d b/plugins/arm/v7/opdefs/bkpt_A8824.d
index f0aa13a..f0aa13a 100644
--- a/src/arch/arm/v7/opdefs/bkpt_A8824.d
+++ b/plugins/arm/v7/opdefs/bkpt_A8824.d
diff --git a/src/arch/arm/v7/opdefs/bl_A8825.d b/plugins/arm/v7/opdefs/bl_A8825.d
index da0def4..da0def4 100644
--- a/src/arch/arm/v7/opdefs/bl_A8825.d
+++ b/plugins/arm/v7/opdefs/bl_A8825.d
diff --git a/src/arch/arm/v7/opdefs/blx_A8826.d b/plugins/arm/v7/opdefs/blx_A8826.d
index 29719fa..29719fa 100644
--- a/src/arch/arm/v7/opdefs/blx_A8826.d
+++ b/plugins/arm/v7/opdefs/blx_A8826.d
diff --git a/src/arch/arm/v7/opdefs/bx_A8827.d b/plugins/arm/v7/opdefs/bx_A8827.d
index f3681e7..f3681e7 100644
--- a/src/arch/arm/v7/opdefs/bx_A8827.d
+++ b/plugins/arm/v7/opdefs/bx_A8827.d
diff --git a/src/arch/arm/v7/opdefs/bxj_A8828.d b/plugins/arm/v7/opdefs/bxj_A8828.d
index efa2de2..efa2de2 100644
--- a/src/arch/arm/v7/opdefs/bxj_A8828.d
+++ b/plugins/arm/v7/opdefs/bxj_A8828.d
diff --git a/src/arch/arm/v7/opdefs/cb_A8829.d b/plugins/arm/v7/opdefs/cb_A8829.d
index 134e0f4..134e0f4 100644
--- a/src/arch/arm/v7/opdefs/cb_A8829.d
+++ b/plugins/arm/v7/opdefs/cb_A8829.d
diff --git a/src/arch/arm/v7/opdefs/cdp_A8830.d b/plugins/arm/v7/opdefs/cdp_A8830.d
index 109b89b..109b89b 100644
--- a/src/arch/arm/v7/opdefs/cdp_A8830.d
+++ b/plugins/arm/v7/opdefs/cdp_A8830.d
diff --git a/src/arch/arm/v7/opdefs/clrex_A8832.d b/plugins/arm/v7/opdefs/clrex_A8832.d
index 4f313f2..4f313f2 100644
--- a/src/arch/arm/v7/opdefs/clrex_A8832.d
+++ b/plugins/arm/v7/opdefs/clrex_A8832.d
diff --git a/src/arch/arm/v7/opdefs/clz_A8833.d b/plugins/arm/v7/opdefs/clz_A8833.d
index d4fdac6..d4fdac6 100644
--- a/src/arch/arm/v7/opdefs/clz_A8833.d
+++ b/plugins/arm/v7/opdefs/clz_A8833.d
diff --git a/src/arch/arm/v7/opdefs/cmn_A8834.d b/plugins/arm/v7/opdefs/cmn_A8834.d
index fc0b19f..fc0b19f 100644
--- a/src/arch/arm/v7/opdefs/cmn_A8834.d
+++ b/plugins/arm/v7/opdefs/cmn_A8834.d
diff --git a/src/arch/arm/v7/opdefs/cmn_A8835.d b/plugins/arm/v7/opdefs/cmn_A8835.d
index cd228de..cd228de 100644
--- a/src/arch/arm/v7/opdefs/cmn_A8835.d
+++ b/plugins/arm/v7/opdefs/cmn_A8835.d
diff --git a/src/arch/arm/v7/opdefs/cmn_A8836.d b/plugins/arm/v7/opdefs/cmn_A8836.d
index ad58482..ad58482 100644
--- a/src/arch/arm/v7/opdefs/cmn_A8836.d
+++ b/plugins/arm/v7/opdefs/cmn_A8836.d
diff --git a/src/arch/arm/v7/opdefs/cmp_A8837.d b/plugins/arm/v7/opdefs/cmp_A8837.d
index 76b7a76..76b7a76 100644
--- a/src/arch/arm/v7/opdefs/cmp_A8837.d
+++ b/plugins/arm/v7/opdefs/cmp_A8837.d
diff --git a/src/arch/arm/v7/opdefs/cmp_A8838.d b/plugins/arm/v7/opdefs/cmp_A8838.d
index cd02543..cd02543 100644
--- a/src/arch/arm/v7/opdefs/cmp_A8838.d
+++ b/plugins/arm/v7/opdefs/cmp_A8838.d
diff --git a/src/arch/arm/v7/opdefs/cmp_A8839.d b/plugins/arm/v7/opdefs/cmp_A8839.d
index 45ed0f9..45ed0f9 100644
--- a/src/arch/arm/v7/opdefs/cmp_A8839.d
+++ b/plugins/arm/v7/opdefs/cmp_A8839.d
diff --git a/src/arch/arm/v7/opdefs/dbg_A8842.d b/plugins/arm/v7/opdefs/dbg_A8842.d
index 62142f5..62142f5 100644
--- a/src/arch/arm/v7/opdefs/dbg_A8842.d
+++ b/plugins/arm/v7/opdefs/dbg_A8842.d
diff --git a/src/arch/arm/v7/opdefs/dmb_A8843.d b/plugins/arm/v7/opdefs/dmb_A8843.d
index 34f053a..34f053a 100644
--- a/src/arch/arm/v7/opdefs/dmb_A8843.d
+++ b/plugins/arm/v7/opdefs/dmb_A8843.d
diff --git a/src/arch/arm/v7/opdefs/dsb_A8844.d b/plugins/arm/v7/opdefs/dsb_A8844.d
index 512220c..512220c 100644
--- a/src/arch/arm/v7/opdefs/dsb_A8844.d
+++ b/plugins/arm/v7/opdefs/dsb_A8844.d
diff --git a/src/arch/arm/v7/opdefs/eor_A8846.d b/plugins/arm/v7/opdefs/eor_A8846.d
index 38dc858..38dc858 100644
--- a/src/arch/arm/v7/opdefs/eor_A8846.d
+++ b/plugins/arm/v7/opdefs/eor_A8846.d
diff --git a/src/arch/arm/v7/opdefs/eor_A8847.d b/plugins/arm/v7/opdefs/eor_A8847.d
index 66643a1..66643a1 100644
--- a/src/arch/arm/v7/opdefs/eor_A8847.d
+++ b/plugins/arm/v7/opdefs/eor_A8847.d
diff --git a/src/arch/arm/v7/opdefs/eor_A8848.d b/plugins/arm/v7/opdefs/eor_A8848.d
index f38fa74..f38fa74 100644
--- a/src/arch/arm/v7/opdefs/eor_A8848.d
+++ b/plugins/arm/v7/opdefs/eor_A8848.d
diff --git a/src/arch/arm/v7/opdefs/ldr_A8862.d b/plugins/arm/v7/opdefs/ldr_A8862.d
index 03df506..03df506 100644
--- a/src/arch/arm/v7/opdefs/ldr_A8862.d
+++ b/plugins/arm/v7/opdefs/ldr_A8862.d
diff --git a/src/arch/arm/v7/opdefs/ldr_A8863.d b/plugins/arm/v7/opdefs/ldr_A8863.d
index 0d0ce1f..0d0ce1f 100644
--- a/src/arch/arm/v7/opdefs/ldr_A8863.d
+++ b/plugins/arm/v7/opdefs/ldr_A8863.d
diff --git a/src/arch/arm/v7/opdefs/ldr_A8864.d b/plugins/arm/v7/opdefs/ldr_A8864.d
index 74afa2d..74afa2d 100644
--- a/src/arch/arm/v7/opdefs/ldr_A8864.d
+++ b/plugins/arm/v7/opdefs/ldr_A8864.d
diff --git a/src/arch/arm/v7/opdefs/ldr_A8865.d b/plugins/arm/v7/opdefs/ldr_A8865.d
index ebb4e09..ebb4e09 100644
--- a/src/arch/arm/v7/opdefs/ldr_A8865.d
+++ b/plugins/arm/v7/opdefs/ldr_A8865.d
diff --git a/src/arch/arm/v7/opdefs/ldr_A8866.d b/plugins/arm/v7/opdefs/ldr_A8866.d
index b161043..b161043 100644
--- a/src/arch/arm/v7/opdefs/ldr_A8866.d
+++ b/plugins/arm/v7/opdefs/ldr_A8866.d
diff --git a/src/arch/arm/v7/opdefs/ldrb_A8867.d b/plugins/arm/v7/opdefs/ldrb_A8867.d
index 2dea64e..2dea64e 100644
--- a/src/arch/arm/v7/opdefs/ldrb_A8867.d
+++ b/plugins/arm/v7/opdefs/ldrb_A8867.d
diff --git a/src/arch/arm/v7/opdefs/ldrb_A8868.d b/plugins/arm/v7/opdefs/ldrb_A8868.d
index 519c309..519c309 100644
--- a/src/arch/arm/v7/opdefs/ldrb_A8868.d
+++ b/plugins/arm/v7/opdefs/ldrb_A8868.d
diff --git a/src/arch/arm/v7/opdefs/ldrb_A8869.d b/plugins/arm/v7/opdefs/ldrb_A8869.d
index fb80049..fb80049 100644
--- a/src/arch/arm/v7/opdefs/ldrb_A8869.d
+++ b/plugins/arm/v7/opdefs/ldrb_A8869.d
diff --git a/src/arch/arm/v7/opdefs/ldrb_A8870.d b/plugins/arm/v7/opdefs/ldrb_A8870.d
index 35f95ab..35f95ab 100644
--- a/src/arch/arm/v7/opdefs/ldrb_A8870.d
+++ b/plugins/arm/v7/opdefs/ldrb_A8870.d
diff --git a/src/arch/arm/v7/opdefs/ldrbt_A8871.d b/plugins/arm/v7/opdefs/ldrbt_A8871.d
index 0bf9c3c..0bf9c3c 100644
--- a/src/arch/arm/v7/opdefs/ldrbt_A8871.d
+++ b/plugins/arm/v7/opdefs/ldrbt_A8871.d
diff --git a/src/arch/arm/v7/opdefs/ldrd_A8872.d b/plugins/arm/v7/opdefs/ldrd_A8872.d
index c73fdca..c73fdca 100644
--- a/src/arch/arm/v7/opdefs/ldrd_A8872.d
+++ b/plugins/arm/v7/opdefs/ldrd_A8872.d
diff --git a/src/arch/arm/v7/opdefs/ldrd_A8873.d b/plugins/arm/v7/opdefs/ldrd_A8873.d
index 828e4a3..828e4a3 100644
--- a/src/arch/arm/v7/opdefs/ldrd_A8873.d
+++ b/plugins/arm/v7/opdefs/ldrd_A8873.d
diff --git a/src/arch/arm/v7/opdefs/ldrd_A8874.d b/plugins/arm/v7/opdefs/ldrd_A8874.d
index ed055a6..ed055a6 100644
--- a/src/arch/arm/v7/opdefs/ldrd_A8874.d
+++ b/plugins/arm/v7/opdefs/ldrd_A8874.d
diff --git a/src/arch/arm/v7/opdefs/ldrex_A8875.d b/plugins/arm/v7/opdefs/ldrex_A8875.d
index b915061..b915061 100644
--- a/src/arch/arm/v7/opdefs/ldrex_A8875.d
+++ b/plugins/arm/v7/opdefs/ldrex_A8875.d
diff --git a/src/arch/arm/v7/opdefs/ldrexb_A8876.d b/plugins/arm/v7/opdefs/ldrexb_A8876.d
index e398ef2..e398ef2 100644
--- a/src/arch/arm/v7/opdefs/ldrexb_A8876.d
+++ b/plugins/arm/v7/opdefs/ldrexb_A8876.d
diff --git a/src/arch/arm/v7/opdefs/ldrexd_A8877.d b/plugins/arm/v7/opdefs/ldrexd_A8877.d
index 0188cb7..0188cb7 100644
--- a/src/arch/arm/v7/opdefs/ldrexd_A8877.d
+++ b/plugins/arm/v7/opdefs/ldrexd_A8877.d
diff --git a/src/arch/arm/v7/opdefs/ldrexh_A8878.d b/plugins/arm/v7/opdefs/ldrexh_A8878.d
index 8e9366f..8e9366f 100644
--- a/src/arch/arm/v7/opdefs/ldrexh_A8878.d
+++ b/plugins/arm/v7/opdefs/ldrexh_A8878.d
diff --git a/src/arch/arm/v7/opdefs/ldrh_A8879.d b/plugins/arm/v7/opdefs/ldrh_A8879.d
index 3b57bf8..3b57bf8 100644
--- a/src/arch/arm/v7/opdefs/ldrh_A8879.d
+++ b/plugins/arm/v7/opdefs/ldrh_A8879.d
diff --git a/src/arch/arm/v7/opdefs/ldrh_A8880.d b/plugins/arm/v7/opdefs/ldrh_A8880.d
index f5f7ab0..f5f7ab0 100644
--- a/src/arch/arm/v7/opdefs/ldrh_A8880.d
+++ b/plugins/arm/v7/opdefs/ldrh_A8880.d
diff --git a/src/arch/arm/v7/opdefs/ldrh_A8881.d b/plugins/arm/v7/opdefs/ldrh_A8881.d
index 59005e4..59005e4 100644
--- a/src/arch/arm/v7/opdefs/ldrh_A8881.d
+++ b/plugins/arm/v7/opdefs/ldrh_A8881.d
diff --git a/src/arch/arm/v7/opdefs/ldrh_A8882.d b/plugins/arm/v7/opdefs/ldrh_A8882.d
index 823bf24..823bf24 100644
--- a/src/arch/arm/v7/opdefs/ldrh_A8882.d
+++ b/plugins/arm/v7/opdefs/ldrh_A8882.d
diff --git a/src/arch/arm/v7/opdefs/ldrht_A8883.d b/plugins/arm/v7/opdefs/ldrht_A8883.d
index 8f8f015..8f8f015 100644
--- a/src/arch/arm/v7/opdefs/ldrht_A8883.d
+++ b/plugins/arm/v7/opdefs/ldrht_A8883.d
diff --git a/src/arch/arm/v7/opdefs/ldrsb_A8884.d b/plugins/arm/v7/opdefs/ldrsb_A8884.d
index fc41134..fc41134 100644
--- a/src/arch/arm/v7/opdefs/ldrsb_A8884.d
+++ b/plugins/arm/v7/opdefs/ldrsb_A8884.d
diff --git a/src/arch/arm/v7/opdefs/ldrsb_A8885.d b/plugins/arm/v7/opdefs/ldrsb_A8885.d
index 6cb1d34..6cb1d34 100644
--- a/src/arch/arm/v7/opdefs/ldrsb_A8885.d
+++ b/plugins/arm/v7/opdefs/ldrsb_A8885.d
diff --git a/src/arch/arm/v7/opdefs/ldrsb_A8886.d b/plugins/arm/v7/opdefs/ldrsb_A8886.d
index 4a66278..4a66278 100644
--- a/src/arch/arm/v7/opdefs/ldrsb_A8886.d
+++ b/plugins/arm/v7/opdefs/ldrsb_A8886.d
diff --git a/src/arch/arm/v7/opdefs/ldrsbt_A8887.d b/plugins/arm/v7/opdefs/ldrsbt_A8887.d
index b545f32..b545f32 100644
--- a/src/arch/arm/v7/opdefs/ldrsbt_A8887.d
+++ b/plugins/arm/v7/opdefs/ldrsbt_A8887.d
diff --git a/src/arch/arm/v7/opdefs/ldrsh_A8888.d b/plugins/arm/v7/opdefs/ldrsh_A8888.d
index f01024c..f01024c 100644
--- a/src/arch/arm/v7/opdefs/ldrsh_A8888.d
+++ b/plugins/arm/v7/opdefs/ldrsh_A8888.d
diff --git a/src/arch/arm/v7/opdefs/ldrsh_A8889.d b/plugins/arm/v7/opdefs/ldrsh_A8889.d
index 074cd5c..074cd5c 100644
--- a/src/arch/arm/v7/opdefs/ldrsh_A8889.d
+++ b/plugins/arm/v7/opdefs/ldrsh_A8889.d
diff --git a/src/arch/arm/v7/opdefs/ldrsh_A8890.d b/plugins/arm/v7/opdefs/ldrsh_A8890.d
index eac6c09..eac6c09 100644
--- a/src/arch/arm/v7/opdefs/ldrsh_A8890.d
+++ b/plugins/arm/v7/opdefs/ldrsh_A8890.d
diff --git a/src/arch/arm/v7/opdefs/ldrsht_A8891.d b/plugins/arm/v7/opdefs/ldrsht_A8891.d
index 355178b..355178b 100644
--- a/src/arch/arm/v7/opdefs/ldrsht_A8891.d
+++ b/plugins/arm/v7/opdefs/ldrsht_A8891.d
diff --git a/src/arch/arm/v7/opdefs/ldrt_A8892.d b/plugins/arm/v7/opdefs/ldrt_A8892.d
index e13f0e7..e13f0e7 100644
--- a/src/arch/arm/v7/opdefs/ldrt_A8892.d
+++ b/plugins/arm/v7/opdefs/ldrt_A8892.d
diff --git a/src/arch/arm/v7/opdefs/lsl_A8894.d b/plugins/arm/v7/opdefs/lsl_A8894.d
index 89924c6..89924c6 100644
--- a/src/arch/arm/v7/opdefs/lsl_A8894.d
+++ b/plugins/arm/v7/opdefs/lsl_A8894.d
diff --git a/src/arch/arm/v7/opdefs/lsl_A8895.d b/plugins/arm/v7/opdefs/lsl_A8895.d
index 4ac5ab6..4ac5ab6 100644
--- a/src/arch/arm/v7/opdefs/lsl_A8895.d
+++ b/plugins/arm/v7/opdefs/lsl_A8895.d
diff --git a/src/arch/arm/v7/opdefs/lsr_A8896.d b/plugins/arm/v7/opdefs/lsr_A8896.d
index acb9e25..acb9e25 100644
--- a/src/arch/arm/v7/opdefs/lsr_A8896.d
+++ b/plugins/arm/v7/opdefs/lsr_A8896.d
diff --git a/src/arch/arm/v7/opdefs/lsr_A8897.d b/plugins/arm/v7/opdefs/lsr_A8897.d
index 070a152..070a152 100644
--- a/src/arch/arm/v7/opdefs/lsr_A8897.d
+++ b/plugins/arm/v7/opdefs/lsr_A8897.d
diff --git a/src/arch/arm/v7/opdefs/mcr_A8898.d b/plugins/arm/v7/opdefs/mcr_A8898.d
index f710d5d..f710d5d 100644
--- a/src/arch/arm/v7/opdefs/mcr_A8898.d
+++ b/plugins/arm/v7/opdefs/mcr_A8898.d
diff --git a/src/arch/arm/v7/opdefs/mcrr_A8899.d b/plugins/arm/v7/opdefs/mcrr_A8899.d
index f643826..f643826 100644
--- a/src/arch/arm/v7/opdefs/mcrr_A8899.d
+++ b/plugins/arm/v7/opdefs/mcrr_A8899.d
diff --git a/src/arch/arm/v7/opdefs/mla_A88100.d b/plugins/arm/v7/opdefs/mla_A88100.d
index 5d4b4e4..5d4b4e4 100644
--- a/src/arch/arm/v7/opdefs/mla_A88100.d
+++ b/plugins/arm/v7/opdefs/mla_A88100.d
diff --git a/src/arch/arm/v7/opdefs/mls_A88101.d b/plugins/arm/v7/opdefs/mls_A88101.d
index 4d10be8..4d10be8 100644
--- a/src/arch/arm/v7/opdefs/mls_A88101.d
+++ b/plugins/arm/v7/opdefs/mls_A88101.d
diff --git a/src/arch/arm/v7/opdefs/mov_A88102.d b/plugins/arm/v7/opdefs/mov_A88102.d
index d96baab..d96baab 100644
--- a/src/arch/arm/v7/opdefs/mov_A88102.d
+++ b/plugins/arm/v7/opdefs/mov_A88102.d
diff --git a/src/arch/arm/v7/opdefs/mov_A88103.d b/plugins/arm/v7/opdefs/mov_A88103.d
index cd3d75a..cd3d75a 100644
--- a/src/arch/arm/v7/opdefs/mov_A88103.d
+++ b/plugins/arm/v7/opdefs/mov_A88103.d
diff --git a/src/arch/arm/v7/opdefs/mov_A88104.d b/plugins/arm/v7/opdefs/mov_A88104.d
index d164983..d164983 100644
--- a/src/arch/arm/v7/opdefs/mov_A88104.d
+++ b/plugins/arm/v7/opdefs/mov_A88104.d
diff --git a/src/arch/arm/v7/opdefs/movt_A88106.d b/plugins/arm/v7/opdefs/movt_A88106.d
index 265d008..265d008 100644
--- a/src/arch/arm/v7/opdefs/movt_A88106.d
+++ b/plugins/arm/v7/opdefs/movt_A88106.d
diff --git a/src/arch/arm/v7/opdefs/mrc_A88107.d b/plugins/arm/v7/opdefs/mrc_A88107.d
index fb9714c..fb9714c 100644
--- a/src/arch/arm/v7/opdefs/mrc_A88107.d
+++ b/plugins/arm/v7/opdefs/mrc_A88107.d
diff --git a/src/arch/arm/v7/opdefs/mrrc_A88108.d b/plugins/arm/v7/opdefs/mrrc_A88108.d
index 026c0ef..026c0ef 100644
--- a/src/arch/arm/v7/opdefs/mrrc_A88108.d
+++ b/plugins/arm/v7/opdefs/mrrc_A88108.d
diff --git a/src/arch/arm/v7/opdefs/mul_A88114.d b/plugins/arm/v7/opdefs/mul_A88114.d
index fa250b7..fa250b7 100644
--- a/src/arch/arm/v7/opdefs/mul_A88114.d
+++ b/plugins/arm/v7/opdefs/mul_A88114.d
diff --git a/src/arch/arm/v7/opdefs/mvn_A88115.d b/plugins/arm/v7/opdefs/mvn_A88115.d
index 2955439..2955439 100644
--- a/src/arch/arm/v7/opdefs/mvn_A88115.d
+++ b/plugins/arm/v7/opdefs/mvn_A88115.d
diff --git a/src/arch/arm/v7/opdefs/mvn_A88116.d b/plugins/arm/v7/opdefs/mvn_A88116.d
index 1f3f390..1f3f390 100644
--- a/src/arch/arm/v7/opdefs/mvn_A88116.d
+++ b/plugins/arm/v7/opdefs/mvn_A88116.d
diff --git a/src/arch/arm/v7/opdefs/mvn_A88117.d b/plugins/arm/v7/opdefs/mvn_A88117.d
index cc6ef16..cc6ef16 100644
--- a/src/arch/arm/v7/opdefs/mvn_A88117.d
+++ b/plugins/arm/v7/opdefs/mvn_A88117.d
diff --git a/src/arch/arm/v7/opdefs/nop_A88119.d b/plugins/arm/v7/opdefs/nop_A88119.d
index 84c495a..84c495a 100644
--- a/src/arch/arm/v7/opdefs/nop_A88119.d
+++ b/plugins/arm/v7/opdefs/nop_A88119.d
diff --git a/src/arch/arm/v7/opdefs/orn_A88120.d b/plugins/arm/v7/opdefs/orn_A88120.d
index b823b6c..b823b6c 100644
--- a/src/arch/arm/v7/opdefs/orn_A88120.d
+++ b/plugins/arm/v7/opdefs/orn_A88120.d
diff --git a/src/arch/arm/v7/opdefs/orn_A88121.d b/plugins/arm/v7/opdefs/orn_A88121.d
index f1523ec..f1523ec 100644
--- a/src/arch/arm/v7/opdefs/orn_A88121.d
+++ b/plugins/arm/v7/opdefs/orn_A88121.d
diff --git a/src/arch/arm/v7/opdefs/orr_A88122.d b/plugins/arm/v7/opdefs/orr_A88122.d
index 766b5ee..766b5ee 100644
--- a/src/arch/arm/v7/opdefs/orr_A88122.d
+++ b/plugins/arm/v7/opdefs/orr_A88122.d
diff --git a/src/arch/arm/v7/opdefs/orr_A88123.d b/plugins/arm/v7/opdefs/orr_A88123.d
index 2395c89..2395c89 100644
--- a/src/arch/arm/v7/opdefs/orr_A88123.d
+++ b/plugins/arm/v7/opdefs/orr_A88123.d
diff --git a/src/arch/arm/v7/opdefs/orr_A88124.d b/plugins/arm/v7/opdefs/orr_A88124.d
index f4d78b9..f4d78b9 100644
--- a/src/arch/arm/v7/opdefs/orr_A88124.d
+++ b/plugins/arm/v7/opdefs/orr_A88124.d
diff --git a/src/arch/arm/v7/opdefs/pop_A88131.d b/plugins/arm/v7/opdefs/pop_A88131.d
index 2dee09a..2dee09a 100644
--- a/src/arch/arm/v7/opdefs/pop_A88131.d
+++ b/plugins/arm/v7/opdefs/pop_A88131.d
diff --git a/src/arch/arm/v7/opdefs/pop_A88132.d b/plugins/arm/v7/opdefs/pop_A88132.d
index 27bbf3b..27bbf3b 100644
--- a/src/arch/arm/v7/opdefs/pop_A88132.d
+++ b/plugins/arm/v7/opdefs/pop_A88132.d
diff --git a/src/arch/arm/v7/opdefs/push_A88133.d b/plugins/arm/v7/opdefs/push_A88133.d
index 14fc3e9..14fc3e9 100644
--- a/src/arch/arm/v7/opdefs/push_A88133.d
+++ b/plugins/arm/v7/opdefs/push_A88133.d
diff --git a/src/arch/arm/v7/opdefs/qadd16_A88135.d b/plugins/arm/v7/opdefs/qadd16_A88135.d
index 15af29d..15af29d 100644
--- a/src/arch/arm/v7/opdefs/qadd16_A88135.d
+++ b/plugins/arm/v7/opdefs/qadd16_A88135.d
diff --git a/src/arch/arm/v7/opdefs/qadd8_A88136.d b/plugins/arm/v7/opdefs/qadd8_A88136.d
index a71b251..a71b251 100644
--- a/src/arch/arm/v7/opdefs/qadd8_A88136.d
+++ b/plugins/arm/v7/opdefs/qadd8_A88136.d
diff --git a/src/arch/arm/v7/opdefs/qadd_A88134.d b/plugins/arm/v7/opdefs/qadd_A88134.d
index f932983..f932983 100644
--- a/src/arch/arm/v7/opdefs/qadd_A88134.d
+++ b/plugins/arm/v7/opdefs/qadd_A88134.d
diff --git a/src/arch/arm/v7/opdefs/qasx_A88137.d b/plugins/arm/v7/opdefs/qasx_A88137.d
index 68251ca..68251ca 100644
--- a/src/arch/arm/v7/opdefs/qasx_A88137.d
+++ b/plugins/arm/v7/opdefs/qasx_A88137.d
diff --git a/src/arch/arm/v7/opdefs/qdadd_A88138.d b/plugins/arm/v7/opdefs/qdadd_A88138.d
index c40cdcd..c40cdcd 100644
--- a/src/arch/arm/v7/opdefs/qdadd_A88138.d
+++ b/plugins/arm/v7/opdefs/qdadd_A88138.d
diff --git a/src/arch/arm/v7/opdefs/qdsub_A88139.d b/plugins/arm/v7/opdefs/qdsub_A88139.d
index 87bd083..87bd083 100644
--- a/src/arch/arm/v7/opdefs/qdsub_A88139.d
+++ b/plugins/arm/v7/opdefs/qdsub_A88139.d
diff --git a/src/arch/arm/v7/opdefs/qsax_A88140.d b/plugins/arm/v7/opdefs/qsax_A88140.d
index df24cf8..df24cf8 100644
--- a/src/arch/arm/v7/opdefs/qsax_A88140.d
+++ b/plugins/arm/v7/opdefs/qsax_A88140.d
diff --git a/src/arch/arm/v7/opdefs/qsub16_A88142.d b/plugins/arm/v7/opdefs/qsub16_A88142.d
index 5b2c96b..5b2c96b 100644
--- a/src/arch/arm/v7/opdefs/qsub16_A88142.d
+++ b/plugins/arm/v7/opdefs/qsub16_A88142.d
diff --git a/src/arch/arm/v7/opdefs/qsub8_A88143.d b/plugins/arm/v7/opdefs/qsub8_A88143.d
index 270a99d..270a99d 100644
--- a/src/arch/arm/v7/opdefs/qsub8_A88143.d
+++ b/plugins/arm/v7/opdefs/qsub8_A88143.d
diff --git a/src/arch/arm/v7/opdefs/qsub_A88141.d b/plugins/arm/v7/opdefs/qsub_A88141.d
index c60ec57..c60ec57 100644
--- a/src/arch/arm/v7/opdefs/qsub_A88141.d
+++ b/plugins/arm/v7/opdefs/qsub_A88141.d
diff --git a/src/arch/arm/v7/opdefs/rbit_A88144.d b/plugins/arm/v7/opdefs/rbit_A88144.d
index 7f2bdb6..7f2bdb6 100644
--- a/src/arch/arm/v7/opdefs/rbit_A88144.d
+++ b/plugins/arm/v7/opdefs/rbit_A88144.d
diff --git a/src/arch/arm/v7/opdefs/rev16_A88146.d b/plugins/arm/v7/opdefs/rev16_A88146.d
index 53b9a82..53b9a82 100644
--- a/src/arch/arm/v7/opdefs/rev16_A88146.d
+++ b/plugins/arm/v7/opdefs/rev16_A88146.d
diff --git a/src/arch/arm/v7/opdefs/rev_A88145.d b/plugins/arm/v7/opdefs/rev_A88145.d
index 2fe305d..2fe305d 100644
--- a/src/arch/arm/v7/opdefs/rev_A88145.d
+++ b/plugins/arm/v7/opdefs/rev_A88145.d
diff --git a/src/arch/arm/v7/opdefs/revsh_A88147.d b/plugins/arm/v7/opdefs/revsh_A88147.d
index 551582c..551582c 100644
--- a/src/arch/arm/v7/opdefs/revsh_A88147.d
+++ b/plugins/arm/v7/opdefs/revsh_A88147.d
diff --git a/src/arch/arm/v7/opdefs/ror_A88149.d b/plugins/arm/v7/opdefs/ror_A88149.d
index 7e061c6..7e061c6 100644
--- a/src/arch/arm/v7/opdefs/ror_A88149.d
+++ b/plugins/arm/v7/opdefs/ror_A88149.d
diff --git a/src/arch/arm/v7/opdefs/ror_A88150.d b/plugins/arm/v7/opdefs/ror_A88150.d
index c046bf7..c046bf7 100644
--- a/src/arch/arm/v7/opdefs/ror_A88150.d
+++ b/plugins/arm/v7/opdefs/ror_A88150.d
diff --git a/src/arch/arm/v7/opdefs/rrx_A88151.d b/plugins/arm/v7/opdefs/rrx_A88151.d
index 4debd42..4debd42 100644
--- a/src/arch/arm/v7/opdefs/rrx_A88151.d
+++ b/plugins/arm/v7/opdefs/rrx_A88151.d
diff --git a/src/arch/arm/v7/opdefs/rsb_A88152.d b/plugins/arm/v7/opdefs/rsb_A88152.d
index ea53373..ea53373 100644
--- a/src/arch/arm/v7/opdefs/rsb_A88152.d
+++ b/plugins/arm/v7/opdefs/rsb_A88152.d
diff --git a/src/arch/arm/v7/opdefs/rsb_A88153.d b/plugins/arm/v7/opdefs/rsb_A88153.d
index f4a6d61..f4a6d61 100644
--- a/src/arch/arm/v7/opdefs/rsb_A88153.d
+++ b/plugins/arm/v7/opdefs/rsb_A88153.d
diff --git a/src/arch/arm/v7/opdefs/rsb_A88154.d b/plugins/arm/v7/opdefs/rsb_A88154.d
index 9ccf559..9ccf559 100644
--- a/src/arch/arm/v7/opdefs/rsb_A88154.d
+++ b/plugins/arm/v7/opdefs/rsb_A88154.d
diff --git a/src/arch/arm/v7/opdefs/rsc_A88155.d b/plugins/arm/v7/opdefs/rsc_A88155.d
index fc5f8b6..fc5f8b6 100644
--- a/src/arch/arm/v7/opdefs/rsc_A88155.d
+++ b/plugins/arm/v7/opdefs/rsc_A88155.d
diff --git a/src/arch/arm/v7/opdefs/rsc_A88156.d b/plugins/arm/v7/opdefs/rsc_A88156.d
index 70829cd..70829cd 100644
--- a/src/arch/arm/v7/opdefs/rsc_A88156.d
+++ b/plugins/arm/v7/opdefs/rsc_A88156.d
diff --git a/src/arch/arm/v7/opdefs/rsc_A88157.d b/plugins/arm/v7/opdefs/rsc_A88157.d
index 4fa276d..4fa276d 100644
--- a/src/arch/arm/v7/opdefs/rsc_A88157.d
+++ b/plugins/arm/v7/opdefs/rsc_A88157.d
diff --git a/src/arch/arm/v7/opdefs/sadd16_A88158.d b/plugins/arm/v7/opdefs/sadd16_A88158.d
index 51ad948..51ad948 100644
--- a/src/arch/arm/v7/opdefs/sadd16_A88158.d
+++ b/plugins/arm/v7/opdefs/sadd16_A88158.d
diff --git a/src/arch/arm/v7/opdefs/sadd8_A88159.d b/plugins/arm/v7/opdefs/sadd8_A88159.d
index 463c968..463c968 100644
--- a/src/arch/arm/v7/opdefs/sadd8_A88159.d
+++ b/plugins/arm/v7/opdefs/sadd8_A88159.d
diff --git a/src/arch/arm/v7/opdefs/sasx_A88160.d b/plugins/arm/v7/opdefs/sasx_A88160.d
index a0529cb..a0529cb 100644
--- a/src/arch/arm/v7/opdefs/sasx_A88160.d
+++ b/plugins/arm/v7/opdefs/sasx_A88160.d
diff --git a/src/arch/arm/v7/opdefs/sbc_A88161.d b/plugins/arm/v7/opdefs/sbc_A88161.d
index 4ea776a..4ea776a 100644
--- a/src/arch/arm/v7/opdefs/sbc_A88161.d
+++ b/plugins/arm/v7/opdefs/sbc_A88161.d
diff --git a/src/arch/arm/v7/opdefs/sbc_A88162.d b/plugins/arm/v7/opdefs/sbc_A88162.d
index b6e660a..b6e660a 100644
--- a/src/arch/arm/v7/opdefs/sbc_A88162.d
+++ b/plugins/arm/v7/opdefs/sbc_A88162.d
diff --git a/src/arch/arm/v7/opdefs/sbc_A88163.d b/plugins/arm/v7/opdefs/sbc_A88163.d
index 0500edc..0500edc 100644
--- a/src/arch/arm/v7/opdefs/sbc_A88163.d
+++ b/plugins/arm/v7/opdefs/sbc_A88163.d
diff --git a/src/arch/arm/v7/opdefs/sbfx_A88164.d b/plugins/arm/v7/opdefs/sbfx_A88164.d
index 486db3c..486db3c 100644
--- a/src/arch/arm/v7/opdefs/sbfx_A88164.d
+++ b/plugins/arm/v7/opdefs/sbfx_A88164.d
diff --git a/src/arch/arm/v7/opdefs/sdiv_A88165.d b/plugins/arm/v7/opdefs/sdiv_A88165.d
index 19ebfa9..19ebfa9 100644
--- a/src/arch/arm/v7/opdefs/sdiv_A88165.d
+++ b/plugins/arm/v7/opdefs/sdiv_A88165.d
diff --git a/src/arch/arm/v7/opdefs/sel_A88166.d b/plugins/arm/v7/opdefs/sel_A88166.d
index cb32ed6..cb32ed6 100644
--- a/src/arch/arm/v7/opdefs/sel_A88166.d
+++ b/plugins/arm/v7/opdefs/sel_A88166.d
diff --git a/src/arch/arm/v7/opdefs/setend_A88167.d b/plugins/arm/v7/opdefs/setend_A88167.d
index e549c50..e549c50 100644
--- a/src/arch/arm/v7/opdefs/setend_A88167.d
+++ b/plugins/arm/v7/opdefs/setend_A88167.d
diff --git a/src/arch/arm/v7/opdefs/sev_A88168.d b/plugins/arm/v7/opdefs/sev_A88168.d
index 2bd9af4..2bd9af4 100644
--- a/src/arch/arm/v7/opdefs/sev_A88168.d
+++ b/plugins/arm/v7/opdefs/sev_A88168.d
diff --git a/src/arch/arm/v7/opdefs/shadd16_A88169.d b/plugins/arm/v7/opdefs/shadd16_A88169.d
index 22baa05..22baa05 100644
--- a/src/arch/arm/v7/opdefs/shadd16_A88169.d
+++ b/plugins/arm/v7/opdefs/shadd16_A88169.d
diff --git a/src/arch/arm/v7/opdefs/shadd8_A88170.d b/plugins/arm/v7/opdefs/shadd8_A88170.d
index bfc3031..bfc3031 100644
--- a/src/arch/arm/v7/opdefs/shadd8_A88170.d
+++ b/plugins/arm/v7/opdefs/shadd8_A88170.d
diff --git a/src/arch/arm/v7/opdefs/shasx_A88171.d b/plugins/arm/v7/opdefs/shasx_A88171.d
index 71d241b..71d241b 100644
--- a/src/arch/arm/v7/opdefs/shasx_A88171.d
+++ b/plugins/arm/v7/opdefs/shasx_A88171.d
diff --git a/src/arch/arm/v7/opdefs/shsax_A88172.d b/plugins/arm/v7/opdefs/shsax_A88172.d
index 8794738..8794738 100644
--- a/src/arch/arm/v7/opdefs/shsax_A88172.d
+++ b/plugins/arm/v7/opdefs/shsax_A88172.d
diff --git a/src/arch/arm/v7/opdefs/shsub16_A88173.d b/plugins/arm/v7/opdefs/shsub16_A88173.d
index f7099f2..f7099f2 100644
--- a/src/arch/arm/v7/opdefs/shsub16_A88173.d
+++ b/plugins/arm/v7/opdefs/shsub16_A88173.d
diff --git a/src/arch/arm/v7/opdefs/shsub8_A88174.d b/plugins/arm/v7/opdefs/shsub8_A88174.d
index 99af65d..99af65d 100644
--- a/src/arch/arm/v7/opdefs/shsub8_A88174.d
+++ b/plugins/arm/v7/opdefs/shsub8_A88174.d
diff --git a/src/arch/arm/v7/opdefs/smlad_A88177.d b/plugins/arm/v7/opdefs/smlad_A88177.d
index 3eabaa9..3eabaa9 100644
--- a/src/arch/arm/v7/opdefs/smlad_A88177.d
+++ b/plugins/arm/v7/opdefs/smlad_A88177.d
diff --git a/src/arch/arm/v7/opdefs/smlal_A88178.d b/plugins/arm/v7/opdefs/smlal_A88178.d
index 03da53c..03da53c 100644
--- a/src/arch/arm/v7/opdefs/smlal_A88178.d
+++ b/plugins/arm/v7/opdefs/smlal_A88178.d
diff --git a/src/arch/arm/v7/opdefs/smlald_A88180.d b/plugins/arm/v7/opdefs/smlald_A88180.d
index fa6a473..fa6a473 100644
--- a/src/arch/arm/v7/opdefs/smlald_A88180.d
+++ b/plugins/arm/v7/opdefs/smlald_A88180.d
diff --git a/src/arch/arm/v7/opdefs/smlsd_A88182.d b/plugins/arm/v7/opdefs/smlsd_A88182.d
index d458fa8..d458fa8 100644
--- a/src/arch/arm/v7/opdefs/smlsd_A88182.d
+++ b/plugins/arm/v7/opdefs/smlsd_A88182.d
diff --git a/src/arch/arm/v7/opdefs/smlsld_A88183.d b/plugins/arm/v7/opdefs/smlsld_A88183.d
index 9f64eed..9f64eed 100644
--- a/src/arch/arm/v7/opdefs/smlsld_A88183.d
+++ b/plugins/arm/v7/opdefs/smlsld_A88183.d
diff --git a/src/arch/arm/v7/opdefs/smmla_A88184.d b/plugins/arm/v7/opdefs/smmla_A88184.d
index a4d29b8..a4d29b8 100644
--- a/src/arch/arm/v7/opdefs/smmla_A88184.d
+++ b/plugins/arm/v7/opdefs/smmla_A88184.d
diff --git a/src/arch/arm/v7/opdefs/smmls_A88185.d b/plugins/arm/v7/opdefs/smmls_A88185.d
index d59617b..d59617b 100644
--- a/src/arch/arm/v7/opdefs/smmls_A88185.d
+++ b/plugins/arm/v7/opdefs/smmls_A88185.d
diff --git a/src/arch/arm/v7/opdefs/smmul_A88186.d b/plugins/arm/v7/opdefs/smmul_A88186.d
index e02ca52..e02ca52 100644
--- a/src/arch/arm/v7/opdefs/smmul_A88186.d
+++ b/plugins/arm/v7/opdefs/smmul_A88186.d
diff --git a/src/arch/arm/v7/opdefs/smuad_A88187.d b/plugins/arm/v7/opdefs/smuad_A88187.d
index 324e257..324e257 100644
--- a/src/arch/arm/v7/opdefs/smuad_A88187.d
+++ b/plugins/arm/v7/opdefs/smuad_A88187.d
diff --git a/src/arch/arm/v7/opdefs/smull_A88189.d b/plugins/arm/v7/opdefs/smull_A88189.d
index 5ab1c54..5ab1c54 100644
--- a/src/arch/arm/v7/opdefs/smull_A88189.d
+++ b/plugins/arm/v7/opdefs/smull_A88189.d
diff --git a/src/arch/arm/v7/opdefs/str_A88203.d b/plugins/arm/v7/opdefs/str_A88203.d
index e3feaf7..e3feaf7 100644
--- a/src/arch/arm/v7/opdefs/str_A88203.d
+++ b/plugins/arm/v7/opdefs/str_A88203.d
diff --git a/src/arch/arm/v7/opdefs/str_A88204.d b/plugins/arm/v7/opdefs/str_A88204.d
index d780ae3..d780ae3 100644
--- a/src/arch/arm/v7/opdefs/str_A88204.d
+++ b/plugins/arm/v7/opdefs/str_A88204.d
diff --git a/src/arch/arm/v7/opdefs/str_A88205.d b/plugins/arm/v7/opdefs/str_A88205.d
index 55f154c..55f154c 100644
--- a/src/arch/arm/v7/opdefs/str_A88205.d
+++ b/plugins/arm/v7/opdefs/str_A88205.d
diff --git a/src/arch/arm/v7/opdefs/strb_A88206.d b/plugins/arm/v7/opdefs/strb_A88206.d
index 2caf94c..2caf94c 100644
--- a/src/arch/arm/v7/opdefs/strb_A88206.d
+++ b/plugins/arm/v7/opdefs/strb_A88206.d
diff --git a/src/arch/arm/v7/opdefs/strb_A88207.d b/plugins/arm/v7/opdefs/strb_A88207.d
index 4e893fb..4e893fb 100644
--- a/src/arch/arm/v7/opdefs/strb_A88207.d
+++ b/plugins/arm/v7/opdefs/strb_A88207.d
diff --git a/src/arch/arm/v7/opdefs/strb_A88208.d b/plugins/arm/v7/opdefs/strb_A88208.d
index 36f6134..36f6134 100644
--- a/src/arch/arm/v7/opdefs/strb_A88208.d
+++ b/plugins/arm/v7/opdefs/strb_A88208.d
diff --git a/src/arch/arm/v7/opdefs/strbt_A88209.d b/plugins/arm/v7/opdefs/strbt_A88209.d
index 2bcb260..2bcb260 100644
--- a/src/arch/arm/v7/opdefs/strbt_A88209.d
+++ b/plugins/arm/v7/opdefs/strbt_A88209.d
diff --git a/src/arch/arm/v7/opdefs/strd_A88210.d b/plugins/arm/v7/opdefs/strd_A88210.d
index 437bcb3..437bcb3 100644
--- a/src/arch/arm/v7/opdefs/strd_A88210.d
+++ b/plugins/arm/v7/opdefs/strd_A88210.d
diff --git a/src/arch/arm/v7/opdefs/strd_A88211.d b/plugins/arm/v7/opdefs/strd_A88211.d
index b30d4a5..b30d4a5 100644
--- a/src/arch/arm/v7/opdefs/strd_A88211.d
+++ b/plugins/arm/v7/opdefs/strd_A88211.d
diff --git a/src/arch/arm/v7/opdefs/strex_A88212.d b/plugins/arm/v7/opdefs/strex_A88212.d
index 65a7dfe..65a7dfe 100644
--- a/src/arch/arm/v7/opdefs/strex_A88212.d
+++ b/plugins/arm/v7/opdefs/strex_A88212.d
diff --git a/src/arch/arm/v7/opdefs/strexb_A88213.d b/plugins/arm/v7/opdefs/strexb_A88213.d
index 0197d6c..0197d6c 100644
--- a/src/arch/arm/v7/opdefs/strexb_A88213.d
+++ b/plugins/arm/v7/opdefs/strexb_A88213.d
diff --git a/src/arch/arm/v7/opdefs/strexd_A88214.d b/plugins/arm/v7/opdefs/strexd_A88214.d
index 2867cea..2867cea 100644
--- a/src/arch/arm/v7/opdefs/strexd_A88214.d
+++ b/plugins/arm/v7/opdefs/strexd_A88214.d
diff --git a/src/arch/arm/v7/opdefs/strexh_A88215.d b/plugins/arm/v7/opdefs/strexh_A88215.d
index 4ca0b6f..4ca0b6f 100644
--- a/src/arch/arm/v7/opdefs/strexh_A88215.d
+++ b/plugins/arm/v7/opdefs/strexh_A88215.d
diff --git a/src/arch/arm/v7/opdefs/strh_A88216.d b/plugins/arm/v7/opdefs/strh_A88216.d
index 624b483..624b483 100644
--- a/src/arch/arm/v7/opdefs/strh_A88216.d
+++ b/plugins/arm/v7/opdefs/strh_A88216.d
diff --git a/src/arch/arm/v7/opdefs/strh_A88217.d b/plugins/arm/v7/opdefs/strh_A88217.d
index 3b5f97c..3b5f97c 100644
--- a/src/arch/arm/v7/opdefs/strh_A88217.d
+++ b/plugins/arm/v7/opdefs/strh_A88217.d
diff --git a/src/arch/arm/v7/opdefs/strh_A88218.d b/plugins/arm/v7/opdefs/strh_A88218.d
index 1e9dc1f..1e9dc1f 100644
--- a/src/arch/arm/v7/opdefs/strh_A88218.d
+++ b/plugins/arm/v7/opdefs/strh_A88218.d
diff --git a/src/arch/arm/v7/opdefs/strht_A88219.d b/plugins/arm/v7/opdefs/strht_A88219.d
index 3811572..3811572 100644
--- a/src/arch/arm/v7/opdefs/strht_A88219.d
+++ b/plugins/arm/v7/opdefs/strht_A88219.d
diff --git a/src/arch/arm/v7/opdefs/strt_A88220.d b/plugins/arm/v7/opdefs/strt_A88220.d
index 794a0fa..794a0fa 100644
--- a/src/arch/arm/v7/opdefs/strt_A88220.d
+++ b/plugins/arm/v7/opdefs/strt_A88220.d
diff --git a/src/arch/arm/v7/opdefs/sub_A88221.d b/plugins/arm/v7/opdefs/sub_A88221.d
index 41ce6b3..41ce6b3 100644
--- a/src/arch/arm/v7/opdefs/sub_A88221.d
+++ b/plugins/arm/v7/opdefs/sub_A88221.d
diff --git a/src/arch/arm/v7/opdefs/sub_A88222.d b/plugins/arm/v7/opdefs/sub_A88222.d
index ef326b8..ef326b8 100644
--- a/src/arch/arm/v7/opdefs/sub_A88222.d
+++ b/plugins/arm/v7/opdefs/sub_A88222.d
diff --git a/src/arch/arm/v7/opdefs/sub_A88223.d b/plugins/arm/v7/opdefs/sub_A88223.d
index a629250..a629250 100644
--- a/src/arch/arm/v7/opdefs/sub_A88223.d
+++ b/plugins/arm/v7/opdefs/sub_A88223.d
diff --git a/src/arch/arm/v7/opdefs/sub_A88224.d b/plugins/arm/v7/opdefs/sub_A88224.d
index 5ef4e4d..5ef4e4d 100644
--- a/src/arch/arm/v7/opdefs/sub_A88224.d
+++ b/plugins/arm/v7/opdefs/sub_A88224.d
diff --git a/src/arch/arm/v7/opdefs/sub_A88225.d b/plugins/arm/v7/opdefs/sub_A88225.d
index dc54c6b..dc54c6b 100644
--- a/src/arch/arm/v7/opdefs/sub_A88225.d
+++ b/plugins/arm/v7/opdefs/sub_A88225.d
diff --git a/src/arch/arm/v7/opdefs/sub_A88226.d b/plugins/arm/v7/opdefs/sub_A88226.d
index 02ecada..02ecada 100644
--- a/src/arch/arm/v7/opdefs/sub_A88226.d
+++ b/plugins/arm/v7/opdefs/sub_A88226.d
diff --git a/src/arch/arm/v7/opdefs/subs_B9320.d b/plugins/arm/v7/opdefs/subs_B9320.d
index 335e614..335e614 100644
--- a/src/arch/arm/v7/opdefs/subs_B9320.d
+++ b/plugins/arm/v7/opdefs/subs_B9320.d
diff --git a/src/arch/arm/v7/opdefs/svc_A88228.d b/plugins/arm/v7/opdefs/svc_A88228.d
index be48545..be48545 100644
--- a/src/arch/arm/v7/opdefs/svc_A88228.d
+++ b/plugins/arm/v7/opdefs/svc_A88228.d
diff --git a/src/arch/arm/v7/opdefs/swp_A88229.d b/plugins/arm/v7/opdefs/swp_A88229.d
index 2e39015..2e39015 100644
--- a/src/arch/arm/v7/opdefs/swp_A88229.d
+++ b/plugins/arm/v7/opdefs/swp_A88229.d
diff --git a/src/arch/arm/v7/opdefs/teq_A88237.d b/plugins/arm/v7/opdefs/teq_A88237.d
index 89073f6..89073f6 100644
--- a/src/arch/arm/v7/opdefs/teq_A88237.d
+++ b/plugins/arm/v7/opdefs/teq_A88237.d
diff --git a/src/arch/arm/v7/opdefs/teq_A88238.d b/plugins/arm/v7/opdefs/teq_A88238.d
index 8187d81..8187d81 100644
--- a/src/arch/arm/v7/opdefs/teq_A88238.d
+++ b/plugins/arm/v7/opdefs/teq_A88238.d
diff --git a/src/arch/arm/v7/opdefs/teq_A88239.d b/plugins/arm/v7/opdefs/teq_A88239.d
index 986a7f0..986a7f0 100644
--- a/src/arch/arm/v7/opdefs/teq_A88239.d
+++ b/plugins/arm/v7/opdefs/teq_A88239.d
diff --git a/src/arch/arm/v7/opdefs/tst_A88240.d b/plugins/arm/v7/opdefs/tst_A88240.d
index 0ff5121..0ff5121 100644
--- a/src/arch/arm/v7/opdefs/tst_A88240.d
+++ b/plugins/arm/v7/opdefs/tst_A88240.d
diff --git a/src/arch/arm/v7/opdefs/tst_A88241.d b/plugins/arm/v7/opdefs/tst_A88241.d
index 8777d06..8777d06 100644
--- a/src/arch/arm/v7/opdefs/tst_A88241.d
+++ b/plugins/arm/v7/opdefs/tst_A88241.d
diff --git a/src/arch/arm/v7/opdefs/tst_A88242.d b/plugins/arm/v7/opdefs/tst_A88242.d
index d3fdd9c..d3fdd9c 100644
--- a/src/arch/arm/v7/opdefs/tst_A88242.d
+++ b/plugins/arm/v7/opdefs/tst_A88242.d
diff --git a/src/arch/arm/v7/opdefs/uadd16_A88243.d b/plugins/arm/v7/opdefs/uadd16_A88243.d
index fcaadee..fcaadee 100644
--- a/src/arch/arm/v7/opdefs/uadd16_A88243.d
+++ b/plugins/arm/v7/opdefs/uadd16_A88243.d
diff --git a/src/arch/arm/v7/opdefs/uadd8_A88244.d b/plugins/arm/v7/opdefs/uadd8_A88244.d
index 451ca79..451ca79 100644
--- a/src/arch/arm/v7/opdefs/uadd8_A88244.d
+++ b/plugins/arm/v7/opdefs/uadd8_A88244.d
diff --git a/src/arch/arm/v7/opdefs/uasx_A88245.d b/plugins/arm/v7/opdefs/uasx_A88245.d
index f968527..f968527 100644
--- a/src/arch/arm/v7/opdefs/uasx_A88245.d
+++ b/plugins/arm/v7/opdefs/uasx_A88245.d
diff --git a/src/arch/arm/v7/opdefs/ubfx_A88246.d b/plugins/arm/v7/opdefs/ubfx_A88246.d
index 1f9488e..1f9488e 100644
--- a/src/arch/arm/v7/opdefs/ubfx_A88246.d
+++ b/plugins/arm/v7/opdefs/ubfx_A88246.d
diff --git a/src/arch/arm/v7/opdefs/udf_A88247.d b/plugins/arm/v7/opdefs/udf_A88247.d
index 38f818c..38f818c 100644
--- a/src/arch/arm/v7/opdefs/udf_A88247.d
+++ b/plugins/arm/v7/opdefs/udf_A88247.d
diff --git a/src/arch/arm/v7/opdefs/udiv_A88248.d b/plugins/arm/v7/opdefs/udiv_A88248.d
index eea7947..eea7947 100644
--- a/src/arch/arm/v7/opdefs/udiv_A88248.d
+++ b/plugins/arm/v7/opdefs/udiv_A88248.d
diff --git a/src/arch/arm/v7/opdefs/uhadd16_A88249.d b/plugins/arm/v7/opdefs/uhadd16_A88249.d
index 54da5b0..54da5b0 100644
--- a/src/arch/arm/v7/opdefs/uhadd16_A88249.d
+++ b/plugins/arm/v7/opdefs/uhadd16_A88249.d
diff --git a/src/arch/arm/v7/opdefs/uhadd8_A88250.d b/plugins/arm/v7/opdefs/uhadd8_A88250.d
index 759a0a7..759a0a7 100644
--- a/src/arch/arm/v7/opdefs/uhadd8_A88250.d
+++ b/plugins/arm/v7/opdefs/uhadd8_A88250.d
diff --git a/src/arch/arm/v7/opdefs/uhasx_A88251.d b/plugins/arm/v7/opdefs/uhasx_A88251.d
index 3751394..3751394 100644
--- a/src/arch/arm/v7/opdefs/uhasx_A88251.d
+++ b/plugins/arm/v7/opdefs/uhasx_A88251.d
diff --git a/src/arch/arm/v7/opdefs/uhsax_A88252.d b/plugins/arm/v7/opdefs/uhsax_A88252.d
index f06b2ba..f06b2ba 100644
--- a/src/arch/arm/v7/opdefs/uhsax_A88252.d
+++ b/plugins/arm/v7/opdefs/uhsax_A88252.d
diff --git a/src/arch/arm/v7/opdefs/uhsub16_A88253.d b/plugins/arm/v7/opdefs/uhsub16_A88253.d
index 93f92f7..93f92f7 100644
--- a/src/arch/arm/v7/opdefs/uhsub16_A88253.d
+++ b/plugins/arm/v7/opdefs/uhsub16_A88253.d
diff --git a/src/arch/arm/v7/opdefs/uhsub8_A88254.d b/plugins/arm/v7/opdefs/uhsub8_A88254.d
index 198a095..198a095 100644
--- a/src/arch/arm/v7/opdefs/uhsub8_A88254.d
+++ b/plugins/arm/v7/opdefs/uhsub8_A88254.d
diff --git a/src/arch/arm/v7/opdefs/umaal_A88255.d b/plugins/arm/v7/opdefs/umaal_A88255.d
index 34cb707..34cb707 100644
--- a/src/arch/arm/v7/opdefs/umaal_A88255.d
+++ b/plugins/arm/v7/opdefs/umaal_A88255.d
diff --git a/src/arch/arm/v7/opdefs/umlal_A88256.d b/plugins/arm/v7/opdefs/umlal_A88256.d
index 00d1903..00d1903 100644
--- a/src/arch/arm/v7/opdefs/umlal_A88256.d
+++ b/plugins/arm/v7/opdefs/umlal_A88256.d
diff --git a/src/arch/arm/v7/opdefs/umull_A88257.d b/plugins/arm/v7/opdefs/umull_A88257.d
index d2cc321..d2cc321 100644
--- a/src/arch/arm/v7/opdefs/umull_A88257.d
+++ b/plugins/arm/v7/opdefs/umull_A88257.d
diff --git a/src/arch/arm/v7/opdefs/uqadd16_A88258.d b/plugins/arm/v7/opdefs/uqadd16_A88258.d
index 14528c8..14528c8 100644
--- a/src/arch/arm/v7/opdefs/uqadd16_A88258.d
+++ b/plugins/arm/v7/opdefs/uqadd16_A88258.d
diff --git a/src/arch/arm/v7/opdefs/uqadd8_A88259.d b/plugins/arm/v7/opdefs/uqadd8_A88259.d
index 94b8e39..94b8e39 100644
--- a/src/arch/arm/v7/opdefs/uqadd8_A88259.d
+++ b/plugins/arm/v7/opdefs/uqadd8_A88259.d
diff --git a/src/arch/arm/v7/opdefs/uqasx_A88260.d b/plugins/arm/v7/opdefs/uqasx_A88260.d
index 174b08c..174b08c 100644
--- a/src/arch/arm/v7/opdefs/uqasx_A88260.d
+++ b/plugins/arm/v7/opdefs/uqasx_A88260.d
diff --git a/src/arch/arm/v7/opdefs/uqsax_A88261.d b/plugins/arm/v7/opdefs/uqsax_A88261.d
index 6092e51..6092e51 100644
--- a/src/arch/arm/v7/opdefs/uqsax_A88261.d
+++ b/plugins/arm/v7/opdefs/uqsax_A88261.d
diff --git a/src/arch/arm/v7/opdefs/uqsub16_A88262.d b/plugins/arm/v7/opdefs/uqsub16_A88262.d
index 1f458ff..1f458ff 100644
--- a/src/arch/arm/v7/opdefs/uqsub16_A88262.d
+++ b/plugins/arm/v7/opdefs/uqsub16_A88262.d
diff --git a/src/arch/arm/v7/opdefs/uqsub8_A88263.d b/plugins/arm/v7/opdefs/uqsub8_A88263.d
index 37d96e7..37d96e7 100644
--- a/src/arch/arm/v7/opdefs/uqsub8_A88263.d
+++ b/plugins/arm/v7/opdefs/uqsub8_A88263.d
diff --git a/src/arch/arm/v7/opdefs/usad8_A88264.d b/plugins/arm/v7/opdefs/usad8_A88264.d
index 09d7ece..09d7ece 100644
--- a/src/arch/arm/v7/opdefs/usad8_A88264.d
+++ b/plugins/arm/v7/opdefs/usad8_A88264.d
diff --git a/src/arch/arm/v7/opdefs/usada8_A88265.d b/plugins/arm/v7/opdefs/usada8_A88265.d
index dd1efdb..dd1efdb 100644
--- a/src/arch/arm/v7/opdefs/usada8_A88265.d
+++ b/plugins/arm/v7/opdefs/usada8_A88265.d
diff --git a/src/arch/arm/v7/opdefs/usat16_A88267.d b/plugins/arm/v7/opdefs/usat16_A88267.d
index c091dc6..c091dc6 100644
--- a/src/arch/arm/v7/opdefs/usat16_A88267.d
+++ b/plugins/arm/v7/opdefs/usat16_A88267.d
diff --git a/src/arch/arm/v7/opdefs/usat_A88266.d b/plugins/arm/v7/opdefs/usat_A88266.d
index 55de21a..55de21a 100644
--- a/src/arch/arm/v7/opdefs/usat_A88266.d
+++ b/plugins/arm/v7/opdefs/usat_A88266.d
diff --git a/src/arch/arm/v7/opdefs/usax_A88268.d b/plugins/arm/v7/opdefs/usax_A88268.d
index 040eedc..040eedc 100644
--- a/src/arch/arm/v7/opdefs/usax_A88268.d
+++ b/plugins/arm/v7/opdefs/usax_A88268.d
diff --git a/src/arch/arm/v7/opdefs/usub16_A88269.d b/plugins/arm/v7/opdefs/usub16_A88269.d
index 31796d9..31796d9 100644
--- a/src/arch/arm/v7/opdefs/usub16_A88269.d
+++ b/plugins/arm/v7/opdefs/usub16_A88269.d
diff --git a/src/arch/arm/v7/opdefs/usub8_A88270.d b/plugins/arm/v7/opdefs/usub8_A88270.d
index 576894c..576894c 100644
--- a/src/arch/arm/v7/opdefs/usub8_A88270.d
+++ b/plugins/arm/v7/opdefs/usub8_A88270.d
diff --git a/src/arch/arm/v7/opdefs/uxtab16_A88272.d b/plugins/arm/v7/opdefs/uxtab16_A88272.d
index 4fc61d2..4fc61d2 100644
--- a/src/arch/arm/v7/opdefs/uxtab16_A88272.d
+++ b/plugins/arm/v7/opdefs/uxtab16_A88272.d
diff --git a/src/arch/arm/v7/opdefs/uxtab_A88271.d b/plugins/arm/v7/opdefs/uxtab_A88271.d
index fe27d4b..fe27d4b 100644
--- a/src/arch/arm/v7/opdefs/uxtab_A88271.d
+++ b/plugins/arm/v7/opdefs/uxtab_A88271.d
diff --git a/src/arch/arm/v7/opdefs/uxtah_A88273.d b/plugins/arm/v7/opdefs/uxtah_A88273.d
index 3c587d9..3c587d9 100644
--- a/src/arch/arm/v7/opdefs/uxtah_A88273.d
+++ b/plugins/arm/v7/opdefs/uxtah_A88273.d
diff --git a/src/arch/arm/v7/opdefs/uxtb16_A88275.d b/plugins/arm/v7/opdefs/uxtb16_A88275.d
index a30d133..a30d133 100644
--- a/src/arch/arm/v7/opdefs/uxtb16_A88275.d
+++ b/plugins/arm/v7/opdefs/uxtb16_A88275.d
diff --git a/src/arch/arm/v7/opdefs/uxtb_A88274.d b/plugins/arm/v7/opdefs/uxtb_A88274.d
index f49ba83..f49ba83 100644
--- a/src/arch/arm/v7/opdefs/uxtb_A88274.d
+++ b/plugins/arm/v7/opdefs/uxtb_A88274.d
diff --git a/src/arch/arm/v7/opdefs/uxth_A88276.d b/plugins/arm/v7/opdefs/uxth_A88276.d
index 5ae4f4f..5ae4f4f 100644
--- a/src/arch/arm/v7/opdefs/uxth_A88276.d
+++ b/plugins/arm/v7/opdefs/uxth_A88276.d
diff --git a/src/arch/arm/v7/opdefs/wfi_A88425.d b/plugins/arm/v7/opdefs/wfi_A88425.d
index f11d033..f11d033 100644
--- a/src/arch/arm/v7/opdefs/wfi_A88425.d
+++ b/plugins/arm/v7/opdefs/wfi_A88425.d
diff --git a/src/arch/arm/v7/opdefs/yield_A88426.d b/plugins/arm/v7/opdefs/yield_A88426.d
index 252c018..252c018 100644
--- a/src/arch/arm/v7/opdefs/yield_A88426.d
+++ b/plugins/arm/v7/opdefs/yield_A88426.d
diff --git a/src/arch/arm/v7/operands/Makefile.am b/plugins/arm/v7/operands/Makefile.am
index 8cf73b8..5b2d245 100644
--- a/src/arch/arm/v7/operands/Makefile.am
+++ b/plugins/arm/v7/operands/Makefile.am
@@ -1,7 +1,7 @@
 
-noinst_LTLIBRARIES = libarcharmv7operands.la
+noinst_LTLIBRARIES = libarmv7operands.la
 
-libarcharmv7operands_la_SOURCES = 		\
+libarmv7operands_la_SOURCES = 			\
 	coproc.h coproc.c					\
 	estate.h estate.c					\
 	limitation.h limitation.c			\
@@ -11,11 +11,11 @@ libarcharmv7operands_la_SOURCES = 		\
 	rotation.h rotation.c				\
 	shift.h shift.c
 
-libarcharmv7operands_la_LIBADD =
+libarmv7operands_la_LIBADD =
 
-libarcharmv7operands_la_CFLAGS = $(AM_CFLAGS)
+libarmv7operands_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/arm/v7/operands/coproc.c b/plugins/arm/v7/operands/coproc.c
index a0c0254..abe27c4 100644
--- a/src/arch/arm/v7/operands/coproc.c
+++ b/plugins/arm/v7/operands/coproc.c
@@ -24,8 +24,8 @@
 #include "coproc.h"
 
 
-#include "../../../operand-int.h"
-#include "../../../../common/sort.h"
+#include <arch/operand-int.h>
+#include <common/sort.h>
 
 
 
diff --git a/src/arch/arm/v7/operands/coproc.h b/plugins/arm/v7/operands/coproc.h
index 07224d3..bb85024 100644
--- a/src/arch/arm/v7/operands/coproc.h
+++ b/plugins/arm/v7/operands/coproc.h
@@ -21,14 +21,14 @@
  */
 
 
-#ifndef _ARCH_ARM_V7_OPERANDS_COPROC_H
-#define _ARCH_ARM_V7_OPERANDS_COPROC_H
+#ifndef _PLUGINS_ARM_V7_OPERANDS_COPROC_H
+#define _PLUGINS_ARM_V7_OPERANDS_COPROC_H
 
 
 #include <glib-object.h>
 
 
-#include "../../../operand.h"
+#include <arch/operand.h>
 
 
 
@@ -58,4 +58,4 @@ uint8_t g_armv7_coproc_operand_get_index(const GArmV7CoprocOperand *);
 
 
 
-#endif  /* _ARCH_ARM_V7_OPERANDS_COPROC_H */
+#endif  /* _PLUGINS_ARM_V7_OPERANDS_COPROC_H */
diff --git a/src/arch/arm/v7/operands/estate.c b/plugins/arm/v7/operands/estate.c
index 0756110..cdadb76 100644
--- a/src/arch/arm/v7/operands/estate.c
+++ b/plugins/arm/v7/operands/estate.c
@@ -24,8 +24,8 @@
 #include "estate.h"
 
 
-#include "../../../operand-int.h"
-#include "../../../../common/sort.h"
+#include <arch/operand-int.h>
+#include <common/sort.h>
 
 
 
diff --git a/src/arch/arm/v7/operands/estate.h b/plugins/arm/v7/operands/estate.h
index a1726cf..6407ed1 100644
--- a/src/arch/arm/v7/operands/estate.h
+++ b/plugins/arm/v7/operands/estate.h
@@ -21,14 +21,14 @@
  */
 
 
-#ifndef _ARCH_ARM_V7_OPERANDS_ESTATE_H
-#define _ARCH_ARM_V7_OPERANDS_ESTATE_H
+#ifndef _PLUGINS_ARM_V7_OPERANDS_ESTATE_H
+#define _PLUGINS_ARM_V7_OPERANDS_ESTATE_H
 
 
 #include <glib-object.h>
 
 
-#include "../../../operand.h"
+#include <arch/operand.h>
 
 
 
@@ -58,4 +58,4 @@ bool g_armv7_endian_operand_is_big_endian(const GArmV7EndianOperand *);
 
 
 
-#endif  /* _ARCH_ARM_V7_OPERANDS_ESTATE_H */
+#endif  /* _PLUGINS_ARM_V7_OPERANDS_ESTATE_H */
diff --git a/src/arch/arm/v7/operands/limitation.c b/plugins/arm/v7/operands/limitation.c
index 75e958f..1515101 100644
--- a/src/arch/arm/v7/operands/limitation.c
+++ b/plugins/arm/v7/operands/limitation.c
@@ -24,8 +24,8 @@
 #include "limitation.h"
 
 
-#include "../../../operand-int.h"
-#include "../../../../common/sort.h"
+#include <arch/operand-int.h>
+#include <common/sort.h>
 
 
 
diff --git a/src/arch/arm/v7/operands/limitation.h b/plugins/arm/v7/operands/limitation.h
index 4f7db88..2a2b52d 100644
--- a/src/arch/arm/v7/operands/limitation.h
+++ b/plugins/arm/v7/operands/limitation.h
@@ -21,14 +21,14 @@
  */
 
 
-#ifndef _ARCH_ARM_V7_OPERANDS_LIMITATION_H
-#define _ARCH_ARM_V7_OPERANDS_LIMITATION_H
+#ifndef _PLUGINS_ARM_V7_OPERANDS_LIMITATION_H
+#define _PLUGINS_ARM_V7_OPERANDS_LIMITATION_H
 
 
 #include <glib-object.h>
 
 
-#include "../../../operand.h"
+#include <arch/operand.h>
 
 
 
@@ -74,4 +74,4 @@ BarrierLimitationType g_armv7_limitation_operand_get_value(const GArmV7Limitatio
 
 
 
-#endif  /* _ARCH_ARM_V7_OPERANDS_LIMITATION_H */
+#endif  /* _PLUGINS_ARM_V7_OPERANDS_LIMITATION_H */
diff --git a/src/arch/arm/v7/operands/maccess.c b/plugins/arm/v7/operands/maccess.c
index 6daf821..07192b2 100644
--- a/src/arch/arm/v7/operands/maccess.c
+++ b/plugins/arm/v7/operands/maccess.c
@@ -24,8 +24,8 @@
 #include "maccess.h"
 
 
-#include "../../../operand-int.h"
-#include "../../../../common/sort.h"
+#include <arch/operand-int.h>
+#include <common/sort.h>
 
 
 
diff --git a/src/arch/arm/v7/operands/maccess.h b/plugins/arm/v7/operands/maccess.h
index 6e99e0b..25cbe9e 100644
--- a/src/arch/arm/v7/operands/maccess.h
+++ b/plugins/arm/v7/operands/maccess.h
@@ -21,16 +21,18 @@
  */
 
 
-#ifndef _ARCH_ARM_V7_OPERANDS_MACCESS_H
-#define _ARCH_ARM_V7_OPERANDS_MACCESS_H
+#ifndef _PLUGINS_ARM_V7_OPERANDS_MACCESS_H
+#define _PLUGINS_ARM_V7_OPERANDS_MACCESS_H
 
 
 #include <glib-object.h>
 #include <stdbool.h>
 
 
+#include <arch/operand.h>
+
+
 #include "../pseudo.h"
-#include "../../../operand.h"
 
 
 
@@ -72,4 +74,4 @@ bool g_armv7_maccess_operand_has_to_write_back(const GArmV7MAccessOperand *);
 
 
 
-#endif  /* _ARCH_ARM_V7_OPERANDS_MACCESS_H */
+#endif  /* _PLUGINS_ARM_V7_OPERANDS_MACCESS_H */
diff --git a/src/arch/arm/v7/operands/offset.c b/plugins/arm/v7/operands/offset.c
index b8df640..5b0b1f0 100644
--- a/src/arch/arm/v7/operands/offset.c
+++ b/plugins/arm/v7/operands/offset.c
@@ -24,8 +24,8 @@
 #include "offset.h"
 
 
-#include "../../../operand-int.h"
-#include "../../../../common/sort.h"
+#include <arch/operand-int.h>
+#include <common/sort.h>
 
 
 
diff --git a/src/arch/arm/v7/operands/offset.h b/plugins/arm/v7/operands/offset.h
index 64744df..e5f967e 100644
--- a/src/arch/arm/v7/operands/offset.h
+++ b/plugins/arm/v7/operands/offset.h
@@ -21,16 +21,18 @@
  */
 
 
-#ifndef _ARCH_ARM_V7_OPERANDS_OFFSET_H
-#define _ARCH_ARM_V7_OPERANDS_OFFSET_H
+#ifndef _PLUGINS_ARM_V7_OPERANDS_OFFSET_H
+#define _PLUGINS_ARM_V7_OPERANDS_OFFSET_H
 
 
 #include <glib-object.h>
 #include <stdbool.h>
 
 
+#include <arch/operand.h>
+
+
 #include "../pseudo.h"
-#include "../../../operand.h"
 
 
 
@@ -63,4 +65,4 @@ GArchOperand *g_armv7_offset_operand_get_value(const GArmV7OffsetOperand *);
 
 
 
-#endif  /* _ARCH_ARM_V7_OPERANDS_OFFSET_H */
+#endif  /* _PLUGINS_ARM_V7_OPERANDS_OFFSET_H */
diff --git a/src/arch/arm/v7/operands/reglist.c b/plugins/arm/v7/operands/reglist.c
index 9f641b8..25981eb 100644
--- a/src/arch/arm/v7/operands/reglist.c
+++ b/plugins/arm/v7/operands/reglist.c
@@ -28,9 +28,9 @@
 #include <malloc.h>
 
 
-#include "../../../operand-int.h"
-#include "../../../register.h"
-#include "../../../../common/sort.h"
+#include <arch/operand-int.h>
+#include <arch/register.h>
+#include <common/sort.h>
 
 
 
diff --git a/src/arch/arm/v7/operands/reglist.h b/plugins/arm/v7/operands/reglist.h
index 7c60805..5cba197 100644
--- a/src/arch/arm/v7/operands/reglist.h
+++ b/plugins/arm/v7/operands/reglist.h
@@ -21,16 +21,18 @@
  */
 
 
-#ifndef _ARCH_ARM_V7_OPERANDS_REGLIST_H
-#define _ARCH_ARM_V7_OPERANDS_REGLIST_H
+#ifndef _PLUGINS_ARM_V7_OPERANDS_REGLIST_H
+#define _PLUGINS_ARM_V7_OPERANDS_REGLIST_H
 
 
 #include <glib-object.h>
 #include <stdbool.h>
 
 
+#include <arch/operand.h>
+
+
 #include "../register.h"
-#include "../../../operand.h"
 
 
 
@@ -69,4 +71,4 @@ GArmV7Register *g_armv7_reglist_operand_get_register(const GArmV7RegListOperand
 
 
 
-#endif  /* _ARCH_ARM_V7_OPERANDS_REGLIST_H */
+#endif  /* _PLUGINS_ARM_V7_OPERANDS_REGLIST_H */
diff --git a/src/arch/arm/v7/operands/rotation.c b/plugins/arm/v7/operands/rotation.c
index ba31441..3858426 100644
--- a/src/arch/arm/v7/operands/rotation.c
+++ b/plugins/arm/v7/operands/rotation.c
@@ -24,7 +24,7 @@
 #include "rotation.h"
 
 
-#include "../../../operand-int.h"
+#include <arch/operand-int.h>
 
 
 
diff --git a/src/arch/arm/v7/operands/rotation.h b/plugins/arm/v7/operands/rotation.h
index 7fb6c09..952f0e4 100644
--- a/src/arch/arm/v7/operands/rotation.h
+++ b/plugins/arm/v7/operands/rotation.h
@@ -21,14 +21,14 @@
  */
 
 
-#ifndef _ARCH_ARM_V7_OPERANDS_ROTATION_H
-#define _ARCH_ARM_V7_OPERANDS_ROTATION_H
+#ifndef _PLUGINS_ARM_V7_OPERANDS_ROTATION_H
+#define _PLUGINS_ARM_V7_OPERANDS_ROTATION_H
 
 
 #include <glib-object.h>
 
 
-#include "../../../operand.h"
+#include <arch/operand.h>
 
 
 
@@ -58,4 +58,4 @@ GArchOperand *g_armv7_rotation_operand_get_value(const GArmV7RotationOperand *);
 
 
 
-#endif  /* _ARCH_ARM_V7_OPERANDS_ROTATION_H */
+#endif  /* _PLUGINS_ARM_V7_OPERANDS_ROTATION_H */
diff --git a/src/arch/arm/v7/operands/shift.c b/plugins/arm/v7/operands/shift.c
index 6fbdbcb..3dfdf12 100644
--- a/src/arch/arm/v7/operands/shift.c
+++ b/plugins/arm/v7/operands/shift.c
@@ -24,8 +24,8 @@
 #include "shift.h"
 
 
-#include "../../../operand-int.h"
-#include "../../../../common/sort.h"
+#include <arch/operand-int.h>
+#include <common/sort.h>
 
 
 
diff --git a/src/arch/arm/v7/operands/shift.h b/plugins/arm/v7/operands/shift.h
index 2eac092..d3c8001 100644
--- a/src/arch/arm/v7/operands/shift.h
+++ b/plugins/arm/v7/operands/shift.h
@@ -21,15 +21,17 @@
  */
 
 
-#ifndef _ARCH_ARM_V7_OPERANDS_SHIFT_H
-#define _ARCH_ARM_V7_OPERANDS_SHIFT_H
+#ifndef _PLUGINS_ARM_V7_OPERANDS_SHIFT_H
+#define _PLUGINS_ARM_V7_OPERANDS_SHIFT_H
 
 
 #include <glib-object.h>
 
 
+#include <arch/operand.h>
+
+
 #include "../pseudo.h"
-#include "../../../operand.h"
 
 
 
@@ -62,4 +64,4 @@ GArchOperand *g_armv7_shift_operand_get_shift_value(const GArmV7ShiftOperand *);
 
 
 
-#endif  /* _ARCH_ARM_V7_OPERANDS_SHIFT_H */
+#endif  /* _PLUGINS_ARM_V7_OPERANDS_SHIFT_H */
diff --git a/src/arch/arm/v7/post.c b/plugins/arm/v7/post.c
index 46a1792..10941a3 100644
--- a/src/arch/arm/v7/post.c
+++ b/plugins/arm/v7/post.c
@@ -24,7 +24,7 @@
 #include "post.h"
 
 
-#include "../../target.h"
+#include <arch/target.h>
 
 
 
diff --git a/src/arch/arm/v7/post.h b/plugins/arm/v7/post.h
index 89a86a6..33a80fd 100644
--- a/src/arch/arm/v7/post.h
+++ b/plugins/arm/v7/post.h
@@ -21,12 +21,12 @@
  */
 
 
-#ifndef _ARCH_ARM_V7_POST_H
-#define _ARCH_ARM_V7_POST_H
+#ifndef _PLUGINS_ARM_V7_POST_H
+#define _PLUGINS_ARM_V7_POST_H
 
 
-#include "../../instruction.h"
-#include "../../post.h"
+#include <arch/instruction.h>
+#include <arch/post.h>
 
 
 
@@ -54,4 +54,4 @@ void post_process_ldr_instructions(GArchInstruction *, GArchProcessor *, GProcCo
 
 
 
-#endif  /* _ARCH_ARM_V7_POST_H */
+#endif  /* _PLUGINS_ARM_V7_POST_H */
diff --git a/src/arch/arm/v7/processor.c b/plugins/arm/v7/processor.c
index b310652..4295b51 100644
--- a/src/arch/arm/v7/processor.c
+++ b/plugins/arm/v7/processor.c
@@ -27,12 +27,14 @@
 #include <assert.h>
 
 
+#include <arch/raw.h>
+
+
 #include "arm.h"
 #include "context.h"
 #include "thumb_16.h"
 #include "thumb_32.h"
 #include "../processor-int.h"
-#include "../../raw.h"
 
 
 
diff --git a/src/arch/arm/v7/processor.h b/plugins/arm/v7/processor.h
index 2e0805c..84e64f4 100644
--- a/src/arch/arm/v7/processor.h
+++ b/plugins/arm/v7/processor.h
@@ -21,8 +21,8 @@
  */
 
 
-#ifndef _ARCH_ARM_V7_PROCESSOR_H
-#define _ARCH_ARM_V7_PROCESSOR_H
+#ifndef _PLUGINS_ARM_V7_PROCESSOR_H
+#define _PLUGINS_ARM_V7_PROCESSOR_H
 
 
 #include <glib-object.h>
@@ -53,4 +53,4 @@ GArmV7Processor *g_armv7_processor_new(void);
 
 
 
-#endif  /* _ARCH_ARM_V7_PROCESSOR_H */
+#endif  /* _PLUGINS_ARM_V7_PROCESSOR_H */
diff --git a/src/arch/arm/v7/pseudo.c b/plugins/arm/v7/pseudo.c
index 8dc4c6e..f06e6a9 100644
--- a/src/arch/arm/v7/pseudo.c
+++ b/plugins/arm/v7/pseudo.c
@@ -27,7 +27,7 @@
 #include <stddef.h>
 
 
-#include "../../../common/bconst.h"
+#include <common/bconst.h>
 
 
 
diff --git a/src/arch/arm/v7/pseudo.h b/plugins/arm/v7/pseudo.h
index 48d73b8..c918d57 100644
--- a/src/arch/arm/v7/pseudo.h
+++ b/plugins/arm/v7/pseudo.h
@@ -21,8 +21,8 @@
  */
 
 
-#ifndef _ARCH_ARM_V7_PSEUDO_H
-#define _ARCH_ARM_V7_PSEUDO_H
+#ifndef _PLUGINS_ARM_V7_PSEUDO_H
+#define _PLUGINS_ARM_V7_PSEUDO_H
 
 
 #include <stdbool.h>
@@ -133,4 +133,4 @@ uint32_t armv7_zero_extend(uint32_t, unsigned int, unsigned int);
 
 
 
-#endif  /* _ARCH_ARM_V7_PSEUDO_H */
+#endif  /* _PLUGINS_ARM_V7_PSEUDO_H */
diff --git a/src/arch/arm/v7/register.c b/plugins/arm/v7/register.c
index 3cd9e0f..3cd9e0f 100644
--- a/src/arch/arm/v7/register.c
+++ b/plugins/arm/v7/register.c
diff --git a/src/arch/arm/v7/register.h b/plugins/arm/v7/register.h
index d0a89f2..6f09f5d 100644
--- a/src/arch/arm/v7/register.h
+++ b/plugins/arm/v7/register.h
@@ -21,8 +21,8 @@
  */
 
 
-#ifndef _ARCH_ARM_V7_REGISTER_H
-#define _ARCH_ARM_V7_REGISTER_H
+#ifndef _PLUGINS_ARM_V7_REGISTER_H
+#define _PLUGINS_ARM_V7_REGISTER_H
 
 
 #include <glib-object.h>
@@ -54,4 +54,4 @@ GArmV7Register *g_armv7_register_new(uint8_t);
 
 
 
-#endif  /* _ARCH_ARM_V7_REGISTER_H */
+#endif  /* _PLUGINS_ARM_V7_REGISTER_H */
diff --git a/src/arch/arm/v7/simd.c b/plugins/arm/v7/simd.c
index c722757..0fdca7d 100644
--- a/src/arch/arm/v7/simd.c
+++ b/plugins/arm/v7/simd.c
@@ -27,10 +27,12 @@
 #include <stdint.h>
 
 
+#include <arch/undefined.h>
+#include <common/bconst.h>
+
+
 //#include "opcodes/simd_opcodes.h"
 #include "opcodes/opcodes_tmp_simd.h"
-#include "../../undefined.h"
-#include "../../../common/bconst.h"
 
 
 
diff --git a/src/arch/arm/v7/simd.h b/plugins/arm/v7/simd.h
index f4fe556..4a32dba 100644
--- a/src/arch/arm/v7/simd.h
+++ b/plugins/arm/v7/simd.h
@@ -21,14 +21,14 @@
  */
 
 
-#ifndef _ARCH_ARM_V7_SIMD_H
-#define _ARCH_ARM_V7_SIMD_H
+#ifndef _PLUGINS_ARM_V7_SIMD_H
+#define _PLUGINS_ARM_V7_SIMD_H
 
 
 #include <stdbool.h>
 
 
-#include "../../instruction.h"
+#include <arch/instruction.h>
 
 
 
@@ -52,4 +52,4 @@ GArchInstruction *process_armv7_simd_64_bit_transfers_between_arm_core_and_exten
 
 
 
-#endif  /* _ARCH_ARM_V7_SIMD_H */
+#endif  /* _PLUGINS_ARM_V7_SIMD_H */
diff --git a/src/arch/arm/v7/thumb_16.c b/plugins/arm/v7/thumb_16.c
index 7f59481..666c15e 100644
--- a/src/arch/arm/v7/thumb_16.c
+++ b/plugins/arm/v7/thumb_16.c
@@ -27,9 +27,11 @@
 #include <stdint.h>
 
 
+#include <common/bconst.h>
+
+
 #include "opcodes/thumb_16_opcodes.h"
 #include "opcodes/opcodes_tmp_thumb_16.h"
-#include "../../../common/bconst.h"
 
 
 
diff --git a/src/arch/arm/v7/thumb_16.h b/plugins/arm/v7/thumb_16.h
index d75f490..4dc8866 100644
--- a/src/arch/arm/v7/thumb_16.h
+++ b/plugins/arm/v7/thumb_16.h
@@ -21,11 +21,11 @@
  */
 
 
-#ifndef _ARCH_ARM_V7_THUMB_16_H
-#define _ARCH_ARM_V7_THUMB_16_H
+#ifndef _PLUGINS_ARM_V7_THUMB_16_H
+#define _PLUGINS_ARM_V7_THUMB_16_H
 
 
-#include "../../instruction.h"
+#include <arch/instruction.h>
 
 
 
@@ -34,4 +34,4 @@ GArchInstruction *process_armv7_thumb_16_instruction_set_encoding(uint16_t);
 
 
 
-#endif  /* _ARCH_ARM_V7_THUMB_16_H */
+#endif  /* _PLUGINS_ARM_V7_THUMB_16_H */
diff --git a/src/arch/arm/v7/thumb_32.c b/plugins/arm/v7/thumb_32.c
index f9de2e6..2ea33fc 100644
--- a/src/arch/arm/v7/thumb_32.c
+++ b/plugins/arm/v7/thumb_32.c
@@ -27,11 +27,13 @@
 #include <stdint.h>
 
 
+#include <arch/undefined.h>
+#include <common/bconst.h>
+
+
 #include "simd.h"
 #include "opcodes/thumb_32_opcodes.h"
 #include "opcodes/opcodes_tmp_thumb_32.h"
-#include "../../undefined.h"
-#include "../../../common/bconst.h"
 
 
 
diff --git a/src/arch/arm/v7/thumb_32.h b/plugins/arm/v7/thumb_32.h
index 9d09650..15ae7df 100644
--- a/src/arch/arm/v7/thumb_32.h
+++ b/plugins/arm/v7/thumb_32.h
@@ -21,11 +21,11 @@
  */
 
 
-#ifndef _ARCH_ARM_V7_THUMB_32_H
-#define _ARCH_ARM_V7_THUMB_32_H
+#ifndef _PLUGINS_ARM_V7_THUMB_32_H
+#define _PLUGINS_ARM_V7_THUMB_32_H
 
 
-#include "../../instruction.h"
+#include <arch/instruction.h>
 
 
 
@@ -34,4 +34,4 @@ GArchInstruction *process_armv7_thumb_32_instruction_set_encoding(uint32_t);
 
 
 
-#endif  /* _ARCH_ARM_V7_THUMB_32_H */
+#endif  /* _PLUGINS_ARM_V7_THUMB_32_H */
diff --git a/plugins/pychrysa/arch/Makefile.am b/plugins/pychrysa/arch/Makefile.am
index 9421e04..694c9e0 100644
--- a/plugins/pychrysa/arch/Makefile.am
+++ b/plugins/pychrysa/arch/Makefile.am
@@ -11,8 +11,7 @@ libpychrysaarch_la_SOURCES =			\
 	raw.h raw.c							\
 	vmpa.h vmpa.c
 
-libpychrysaarch_la_LIBADD =				\
-	arm/libpychrysaarcharm.la
+libpychrysaarch_la_LIBADD =	
 
 
 libpychrysaarch_la_LDFLAGS = 
@@ -23,4 +22,4 @@ AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJE
 
 AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
 
-SUBDIRS = arm
+SUBDIRS = 
diff --git a/plugins/pychrysa/arch/module.c b/plugins/pychrysa/arch/module.c
index ae90b5d..54b470c 100644
--- a/plugins/pychrysa/arch/module.c
+++ b/plugins/pychrysa/arch/module.c
@@ -38,7 +38,6 @@
 #include "processor.h"
 #include "raw.h"
 #include "vmpa.h"
-#include "arm/module.h"
 #include "../access.h"
 #include "../helpers.h"
 
@@ -154,8 +153,6 @@ bool add_arch_module_to_python_module(PyObject *super)
 
     result &= register_python_imm_operand(module);
 
-    result &= add_arch_arm_module_to_python_module(module);
-
     if (result)
         register_access_to_python_module("pychrysalide.arch", module);
 
diff --git a/plugins/ropgadgets/helper_arm.c b/plugins/ropgadgets/helper_arm.c
index d68a4e6..bb2e2b2 100644
--- a/plugins/ropgadgets/helper_arm.c
+++ b/plugins/ropgadgets/helper_arm.c
@@ -27,7 +27,7 @@
 #include <malloc.h>
 
 
-#include <arch/arm/v7/context.h>
+#include <plugins/arm/v7/context.h>
 
 
 
diff --git a/plugins/ropgadgets/plugin.c b/plugins/ropgadgets/plugin.c
index 85ae6dd..299c090 100644
--- a/plugins/ropgadgets/plugin.c
+++ b/plugins/ropgadgets/plugin.c
@@ -36,8 +36,8 @@
 
 
 
-DEFINE_CHRYSALIDE_ACTIVE_PLUGIN("ROP gadgets", "Find available gadgets for a ROP chain", "0.1.0",
-                                PGA_PLUGIN_INIT);
+DEFINE_CHRYSALIDE_PLUGIN("ROP gadgets", "Find available gadgets for a ROP chain", "0.1.0",
+                         RL("PyChrysalide"), AL(PGA_PLUGIN_INIT));
 
 
 
diff --git a/src/arch/Makefile.am b/src/arch/Makefile.am
index 005f640..bffd15e 100644
--- a/src/arch/Makefile.am
+++ b/src/arch/Makefile.am
@@ -29,8 +29,7 @@ libarch_la_SOURCES =					\
 # 	mips/libarchmips.la					\
 # 	x86/libarchx86.la
 
-libarch_la_LIBADD =						\
-	arm/libarcharm.la
+libarch_la_LIBADD =	
 
 libarch_la_LDFLAGS = 
 
@@ -41,4 +40,4 @@ AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
 
 
 #SUBDIRS = arm dalvik jvm mips x86
-SUBDIRS = arm
+SUBDIRS = 
diff --git a/src/arch/arm/Makefile.am b/src/arch/arm/Makefile.am
deleted file mode 100644
index 496872a..0000000
--- a/src/arch/arm/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-
-noinst_LTLIBRARIES = libarcharm.la
-
-libarcharm_la_SOURCES =					\
-	cond.h								\
-	context-int.h						\
-	context.h context.c					\
-	instruction-int.h					\
-	instruction.h instruction.c			\
-	link.h link.c						\
-	processor-int.h						\
-	processor.h processor.c				\
-	register-int.h						\
-	register.h register.c
-
-libarcharm_la_LIBADD =					\
-	v7/libarcharmv7.la
-
-libarcharm_la_CFLAGS = $(AM_CFLAGS)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-
-SUBDIRS = v7
diff --git a/src/core/processors.c b/src/core/processors.c
index 661374e..f798641 100644
--- a/src/core/processors.c
+++ b/src/core/processors.c
@@ -29,8 +29,6 @@
 #include <string.h>
 
 
-#include "../arch/arm/v7/core.h"
-#include "../arch/arm/v7/processor.h"
 //#include "../arch/jvm/processor.h"
 
 
@@ -132,10 +130,6 @@ bool load_hard_coded_processors_definitions(void)
 
     result = true;
 
-    if (result)
-        result = register_processor_type("armv7", "ARM v7", G_TYPE_ARMV7_PROCESSOR,
-                                         init_armv7_core, exit_armv7_core);
-
     //result &= register_processor_type("jvm", "Java Virtual Machine", G_TYPE_JVM_PROCESSOR);
 
     return result;
diff --git a/src/plugins/plugin.c b/src/plugins/plugin.c
index 2cfb3de..d9072d7 100644
--- a/src/plugins/plugin.c
+++ b/src/plugins/plugin.c
@@ -459,6 +459,9 @@ bool g_plugin_module_resolve_dependencies(GPluginModule *plugin, GPluginModule *
 
             else
             {
+                if (dependency->dependencies == NULL)
+                    dependency->dependencies = create_bit_field(count, false);
+
                 set_in_bit_field(new, index, 1);
                 or_bit_field(new, dependency->dependencies);