diff options
Diffstat (limited to 'src/arch/dalvik')
| -rw-r--r-- | src/arch/dalvik/Makefile.am | 41 | ||||
| -rw-r--r-- | src/arch/dalvik/decomp/Makefile.am | 24 | ||||
| -rw-r--r-- | src/arch/dalvik/decomp/aget.c (renamed from src/arch/dalvik/dop_aget.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/decomp/aput.c (renamed from src/arch/dalvik/dop_aput.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/decomp/arithm.c (renamed from src/arch/dalvik/dop_arithm.c) | 10 | ||||
| -rw-r--r-- | src/arch/dalvik/decomp/array.c (renamed from src/arch/dalvik/dop_array.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/decomp/const.c (renamed from src/arch/dalvik/dop_const.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/decomp/if.c (renamed from src/arch/dalvik/dop_if.c) | 8 | ||||
| -rw-r--r-- | src/arch/dalvik/decomp/invoke.c (renamed from src/arch/dalvik/dop_invoke.c) | 12 | ||||
| -rw-r--r-- | src/arch/dalvik/decomp/ret.c (renamed from src/arch/dalvik/dop_ret.c) | 4 | ||||
| -rw-r--r-- | src/arch/dalvik/decomp/translate.h (renamed from src/arch/dalvik/translate.h) | 2 | ||||
| -rw-r--r-- | src/arch/dalvik/instruction.c | 2 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/Makefile.am | 44 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/add.c (renamed from src/arch/dalvik/op_add.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/aget.c (renamed from src/arch/dalvik/op_aget.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/and.c (renamed from src/arch/dalvik/op_and.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/aput.c (renamed from src/arch/dalvik/op_aput.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/array.c (renamed from src/arch/dalvik/op_array.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/check.c (renamed from src/arch/dalvik/op_check.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/cmp.c (renamed from src/arch/dalvik/op_cmp.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/const.c (renamed from src/arch/dalvik/op_const.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/div.c (renamed from src/arch/dalvik/op_div.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/goto.c (renamed from src/arch/dalvik/op_goto.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/if.c (renamed from src/arch/dalvik/op_if.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/iget.c (renamed from src/arch/dalvik/op_iget.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/invoke.c (renamed from src/arch/dalvik/op_invoke.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/iput.c (renamed from src/arch/dalvik/op_iput.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/move.c (renamed from src/arch/dalvik/op_move.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/mul.c (renamed from src/arch/dalvik/op_mul.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/new.c (renamed from src/arch/dalvik/op_new.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/nop.c (renamed from src/arch/dalvik/op_nop.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/opcodes.h (renamed from src/arch/dalvik/opcodes.h) | 4 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/or.c (renamed from src/arch/dalvik/op_or.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/rem.c (renamed from src/arch/dalvik/op_rem.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/ret.c (renamed from src/arch/dalvik/op_ret.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/rsub.c (renamed from src/arch/dalvik/op_rsub.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/sget.c (renamed from src/arch/dalvik/op_sget.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/shl.c (renamed from src/arch/dalvik/op_shl.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/sput.c (renamed from src/arch/dalvik/op_sput.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/sub.c (renamed from src/arch/dalvik/op_sub.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/to.c (renamed from src/arch/dalvik/op_to.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/opcodes/xor.c (renamed from src/arch/dalvik/op_xor.c) | 6 | ||||
| -rw-r--r-- | src/arch/dalvik/processor.c | 2 |
43 files changed, 189 insertions, 156 deletions
diff --git a/src/arch/dalvik/Makefile.am b/src/arch/dalvik/Makefile.am index 15a403f..8e7ec24 100644 --- a/src/arch/dalvik/Makefile.am +++ b/src/arch/dalvik/Makefile.am @@ -6,49 +6,14 @@ libarchdalvik_la_SOURCES = \ instruction-def.h \ instruction-int.h \ instruction.h instruction.c \ - dop_aget.c \ - dop_aput.c \ - dop_arithm.c \ - dop_array.c \ - dop_const.c \ - dop_if.c \ - dop_invoke.c \ - dop_ret.c \ - op_add.c \ - op_aget.c \ - op_and.c \ - op_aput.c \ - op_array.c \ - op_check.c \ - op_cmp.c \ - op_const.c \ - op_div.c \ - op_goto.c \ - op_if.c \ - op_iget.c \ - op_invoke.c \ - op_iput.c \ - op_move.c \ - op_mul.c \ - op_new.c \ - op_nop.c \ - op_or.c \ - op_rem.c \ - op_ret.c \ - op_rsub.c \ - op_sget.c \ - op_shl.c \ - op_sput.c \ - op_sub.c \ - op_to.c \ - op_xor.c \ - opcodes.h \ operand.h operand.c \ processor.h processor.c \ register.h register.c \ translate.h libarchdalvik_la_LIBADD = \ + decomp/libarchdalvikdecomp.la \ + opcodes/libarchdalvikopcodes.la \ operands/libarchdalvikoperands.la \ pseudo/libarchdalvikpseudo.la @@ -62,4 +27,4 @@ AM_CPPFLAGS = AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) -SUBDIRS = operands pseudo +SUBDIRS = decomp opcodes operands pseudo diff --git a/src/arch/dalvik/decomp/Makefile.am b/src/arch/dalvik/decomp/Makefile.am new file mode 100644 index 0000000..fef68f6 --- /dev/null +++ b/src/arch/dalvik/decomp/Makefile.am @@ -0,0 +1,24 @@ + +noinst_LTLIBRARIES = libarchdalvikdecomp.la + +libarchdalvikdecomp_la_SOURCES = \ + aget.c \ + aput.c \ + arithm.c \ + array.c \ + const.c \ + if.c \ + invoke.c \ + ret.c \ + translate.h + +libarchdalvikdecomp_la_LIBADD = + +libarchdalvikdecomp_la_CFLAGS = $(AM_CFLAGS) + + +INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) + +AM_CPPFLAGS = + +AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/arch/dalvik/dop_aget.c b/src/arch/dalvik/decomp/aget.c index 5ea57cc..337d0fc 100644 --- a/src/arch/dalvik/dop_aget.c +++ b/src/arch/dalvik/decomp/aget.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * dop_aget.c - décompilation des instructions manipulant des tableaux (chargement) + * aget.c - décompilation des instructions manipulant des tableaux (chargement) * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "translate.h" -#include "../../decomp/expr/array.h" -#include "../../decomp/expr/assign.h" +#include "../../../decomp/expr/array.h" +#include "../../../decomp/expr/assign.h" diff --git a/src/arch/dalvik/dop_aput.c b/src/arch/dalvik/decomp/aput.c index 3b75667..20e78bd 100644 --- a/src/arch/dalvik/dop_aput.c +++ b/src/arch/dalvik/decomp/aput.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * dop_aput.c - décompilation des instructions manipulant des tableaux (enregistrement) + * aput.c - décompilation des instructions manipulant des tableaux (enregistrement) * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "translate.h" -#include "../../decomp/expr/array.h" -#include "../../decomp/expr/assign.h" +#include "../../../decomp/expr/array.h" +#include "../../../decomp/expr/assign.h" diff --git a/src/arch/dalvik/dop_arithm.c b/src/arch/dalvik/decomp/arithm.c index ace8724..fc7134f 100644 --- a/src/arch/dalvik/dop_arithm.c +++ b/src/arch/dalvik/decomp/arithm.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * dop_arithm.c - décompilation des opérations arithmétiques + * arithm.c - décompilation des opérations arithmétiques * * Copyright (C) 2010 Cyrille Bagard * @@ -24,10 +24,10 @@ #include "translate.h" -#include "instruction.h" -#include "../../decomp/expr/arithm.h" -#include "../../decomp/expr/assign.h" -#include "../../decomp/expr/immediate.h" +#include "../instruction.h" +#include "../../../decomp/expr/arithm.h" +#include "../../../decomp/expr/assign.h" +#include "../../../decomp/expr/immediate.h" diff --git a/src/arch/dalvik/dop_array.c b/src/arch/dalvik/decomp/array.c index 94ca09a..95f16f7 100644 --- a/src/arch/dalvik/dop_array.c +++ b/src/arch/dalvik/decomp/array.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * dop_array.c - décompilation de l'opération récupérant la longueur d'un tableau + * array.c - décompilation de l'opération récupérant la longueur d'un tableau * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "translate.h" -#include "../../decomp/expr/assign.h" -#include "../../decomp/expr/dalvik/array.h" +#include "../../../decomp/expr/assign.h" +#include "../../../decomp/expr/dalvik/array.h" diff --git a/src/arch/dalvik/dop_const.c b/src/arch/dalvik/decomp/const.c index 9d42926..072c987 100644 --- a/src/arch/dalvik/dop_const.c +++ b/src/arch/dalvik/decomp/const.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * dop_const.c - décompilation des chargements de constantes + * const.c - décompilation des chargements de constantes * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "translate.h" -#include "../../decomp/expr/assign.h" -#include "../../decomp/expr/immediate.h" +#include "../../../decomp/expr/assign.h" +#include "../../../decomp/expr/immediate.h" diff --git a/src/arch/dalvik/dop_if.c b/src/arch/dalvik/decomp/if.c index 3a9d8dd..39d1cb5 100644 --- a/src/arch/dalvik/dop_if.c +++ b/src/arch/dalvik/decomp/if.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * dop_array.c - décompilation des branchements conditionnels + * array.c - décompilation des branchements conditionnels * * Copyright (C) 2010 Cyrille Bagard * @@ -24,9 +24,9 @@ #include "translate.h" -#include "instruction.h" -#include "../../decomp/expr/cond.h" -#include "../../decomp/instr/ite.h" +#include "../instruction.h" +#include "../../../decomp/expr/cond.h" +#include "../../../decomp/instr/ite.h" diff --git a/src/arch/dalvik/dop_invoke.c b/src/arch/dalvik/decomp/invoke.c index 6fdca06..6a542f3 100644 --- a/src/arch/dalvik/dop_invoke.c +++ b/src/arch/dalvik/decomp/invoke.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * dop_invoke.c - décompilation des appels de méthode + * invoke.c - décompilation des appels de méthode * * Copyright (C) 2010 Cyrille Bagard * @@ -24,11 +24,11 @@ #include "translate.h" -#include "instruction.h" -#include "operand.h" -#include "../../decomp/expr/assign.h" -#include "../../decomp/expr/call.h" -#include "../../format/dex/pool.h" +#include "../instruction.h" +#include "../operand.h" +#include "../../../decomp/expr/assign.h" +#include "../../../decomp/expr/call.h" +#include "../../../format/dex/pool.h" diff --git a/src/arch/dalvik/dop_ret.c b/src/arch/dalvik/decomp/ret.c index 3d3f29f..529a9b5 100644 --- a/src/arch/dalvik/dop_ret.c +++ b/src/arch/dalvik/decomp/ret.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * dop_ret.c - décompilation des ordres de retour + * ret.c - décompilation des ordres de retour * * Copyright (C) 2010 Cyrille Bagard * @@ -24,7 +24,7 @@ #include "translate.h" -#include "../../decomp/expr/return.h" +#include "../../../decomp/expr/return.h" diff --git a/src/arch/dalvik/translate.h b/src/arch/dalvik/decomp/translate.h index c708aaf..482ba55 100644 --- a/src/arch/dalvik/translate.h +++ b/src/arch/dalvik/decomp/translate.h @@ -25,7 +25,7 @@ #define _ANALYSIS_DECOMP_RTL_DALVIK_TRANSLATE_H -#include "../translate.h" +#include "../../translate.h" diff --git a/src/arch/dalvik/instruction.c b/src/arch/dalvik/instruction.c index 0fc33f0..54b8afd 100644 --- a/src/arch/dalvik/instruction.c +++ b/src/arch/dalvik/instruction.c @@ -25,7 +25,7 @@ #include "instruction-int.h" -#include "translate.h" +#include "decomp/translate.h" #include "../instruction-int.h" diff --git a/src/arch/dalvik/opcodes/Makefile.am b/src/arch/dalvik/opcodes/Makefile.am new file mode 100644 index 0000000..908bbe8 --- /dev/null +++ b/src/arch/dalvik/opcodes/Makefile.am @@ -0,0 +1,44 @@ + +noinst_LTLIBRARIES = libarchdalvikopcodes.la + +libarchdalvikopcodes_la_SOURCES = \ + add.c \ + aget.c \ + and.c \ + aput.c \ + array.c \ + check.c \ + cmp.c \ + const.c \ + div.c \ + goto.c \ + if.c \ + iget.c \ + invoke.c \ + iput.c \ + move.c \ + mul.c \ + new.c \ + nop.c \ + opcodes.h \ + or.c \ + rem.c \ + ret.c \ + rsub.c \ + sget.c \ + shl.c \ + sput.c \ + sub.c \ + to.c \ + xor.c + +libarchdalvikopcodes_la_LIBADD = + +libarchdalvikopcodes_la_CFLAGS = $(AM_CFLAGS) + + +INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) + +AM_CPPFLAGS = + +AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/src/arch/dalvik/op_add.c b/src/arch/dalvik/opcodes/add.c index 64dab5f..8f99f56 100644 --- a/src/arch/dalvik/op_add.c +++ b/src/arch/dalvik/opcodes/add.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_add.c - décodage des opérations d'addition + * add.c - décodage des opérations d'addition * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_aget.c b/src/arch/dalvik/opcodes/aget.c index 25a4ab5..3db5d93 100644 --- a/src/arch/dalvik/op_aget.c +++ b/src/arch/dalvik/opcodes/aget.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_aget.c - décodage des instructions manipulant des tableaux (chargement) + * aget.c - décodage des instructions manipulant des tableaux (chargement) * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_and.c b/src/arch/dalvik/opcodes/and.c index d86866d..5ceb714 100644 --- a/src/arch/dalvik/op_and.c +++ b/src/arch/dalvik/opcodes/and.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_and.c - décodage des opérations de ET logiques + * and.c - décodage des opérations de ET logiques * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_aput.c b/src/arch/dalvik/opcodes/aput.c index 46e9b1a..7e23501 100644 --- a/src/arch/dalvik/op_aput.c +++ b/src/arch/dalvik/opcodes/aput.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_aput.c - décodage des instructions manipulant des tableaux (enregistrement) + * aput.c - décodage des instructions manipulant des tableaux (enregistrement) * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_array.c b/src/arch/dalvik/opcodes/array.c index 3eecc85..d98fac1 100644 --- a/src/arch/dalvik/op_array.c +++ b/src/arch/dalvik/opcodes/array.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_array.c - décodage de l'opération récupérant la longueur d'un tableau + * array.c - décodage de l'opération récupérant la longueur d'un tableau * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_check.c b/src/arch/dalvik/opcodes/check.c index 64f2c12..7d5ac26 100644 --- a/src/arch/dalvik/op_check.c +++ b/src/arch/dalvik/opcodes/check.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_check.c - décodage des vérifications de types + * check.c - décodage des vérifications de types * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_cmp.c b/src/arch/dalvik/opcodes/cmp.c index 0e51a40..e5913a9 100644 --- a/src/arch/dalvik/op_cmp.c +++ b/src/arch/dalvik/opcodes/cmp.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_cmp.c - décodage des instructions de comparaison + * cmp.c - décodage des instructions de comparaison * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_const.c b/src/arch/dalvik/opcodes/const.c index 0dcc923..9d9fa28 100644 --- a/src/arch/dalvik/op_const.c +++ b/src/arch/dalvik/opcodes/const.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_const.c - décodage des chargements de constantes + * const.c - décodage des chargements de constantes * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_div.c b/src/arch/dalvik/opcodes/div.c index c4d9b87..49dc844 100644 --- a/src/arch/dalvik/op_div.c +++ b/src/arch/dalvik/opcodes/div.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_div.c - décodage des opérations de divisions + * div.c - décodage des opérations de divisions * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_goto.c b/src/arch/dalvik/opcodes/goto.c index 0571d03..b44ec7d 100644 --- a/src/arch/dalvik/op_goto.c +++ b/src/arch/dalvik/opcodes/goto.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_goto.c - décodage des branchements inconditionnels + * goto.c - décodage des branchements inconditionnels * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_if.c b/src/arch/dalvik/opcodes/if.c index 781fb7c..1cfc436 100644 --- a/src/arch/dalvik/op_if.c +++ b/src/arch/dalvik/opcodes/if.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_if.c - décodage des branchements conditionnels + * if.c - décodage des branchements conditionnels * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_iget.c b/src/arch/dalvik/opcodes/iget.c index e0e1e0f..b262a8b 100644 --- a/src/arch/dalvik/op_iget.c +++ b/src/arch/dalvik/opcodes/iget.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_iget.c - décodage des chargements de champs d'instance + * iget.c - décodage des chargements de champs d'instance * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_invoke.c b/src/arch/dalvik/opcodes/invoke.c index 913fb1a..ee8985a 100644 --- a/src/arch/dalvik/op_invoke.c +++ b/src/arch/dalvik/opcodes/invoke.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_invoke.c - décodage des appels de méthode + * invoke.c - décodage des appels de méthode * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_iput.c b/src/arch/dalvik/opcodes/iput.c index e221c3b..0c0d503 100644 --- a/src/arch/dalvik/op_iput.c +++ b/src/arch/dalvik/opcodes/iput.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_iput.c - décodage des enregistrements de champs d'instance + * iput.c - décodage des enregistrements de champs d'instance * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_move.c b/src/arch/dalvik/opcodes/move.c index 0462fdb..839d551 100644 --- a/src/arch/dalvik/op_move.c +++ b/src/arch/dalvik/opcodes/move.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_move.c - décodage des opérations de multiplications + * move.c - décodage des opérations de multiplications * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_mul.c b/src/arch/dalvik/opcodes/mul.c index ffe6009..fb26234 100644 --- a/src/arch/dalvik/op_mul.c +++ b/src/arch/dalvik/opcodes/mul.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_mul.c - décodage des opérations de multiplications + * mul.c - décodage des opérations de multiplications * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_new.c b/src/arch/dalvik/opcodes/new.c index 3bddd58..029c695 100644 --- a/src/arch/dalvik/op_new.c +++ b/src/arch/dalvik/opcodes/new.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_new.c - décodage des créations de nouvelles instances + * new.c - décodage des créations de nouvelles instances * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_nop.c b/src/arch/dalvik/opcodes/nop.c index 39f37d9..1a60cf3 100644 --- a/src/arch/dalvik/op_nop.c +++ b/src/arch/dalvik/opcodes/nop.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_ret.c - décodage de l'instruction nulle + * ret.c - décodage de l'instruction nulle * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/opcodes.h b/src/arch/dalvik/opcodes/opcodes.h index 0658306..947fea5 100644 --- a/src/arch/dalvik/opcodes.h +++ b/src/arch/dalvik/opcodes/opcodes.h @@ -25,8 +25,8 @@ #define _ARCH_DALVIK_OPCODES_H -#include "instruction.h" -#include "processor.h" +#include "../instruction.h" +#include "../processor.h" diff --git a/src/arch/dalvik/op_or.c b/src/arch/dalvik/opcodes/or.c index f78b7fb..6c4648c 100644 --- a/src/arch/dalvik/op_or.c +++ b/src/arch/dalvik/opcodes/or.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_or.c - décodage des opérations de OU logiques + * or.c - décodage des opérations de OU logiques * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_rem.c b/src/arch/dalvik/opcodes/rem.c index 17dbfb8..91e5083 100644 --- a/src/arch/dalvik/op_rem.c +++ b/src/arch/dalvik/opcodes/rem.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_rem.c - décodage des opérations de restes de division + * rem.c - décodage des opérations de restes de division * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_ret.c b/src/arch/dalvik/opcodes/ret.c index ea4b5e7..4cd5a07 100644 --- a/src/arch/dalvik/op_ret.c +++ b/src/arch/dalvik/opcodes/ret.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_ret.c - décodage des ordres de retour + * ret.c - décodage des ordres de retour * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_rsub.c b/src/arch/dalvik/opcodes/rsub.c index 45b885e..2d35737 100644 --- a/src/arch/dalvik/op_rsub.c +++ b/src/arch/dalvik/opcodes/rsub.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_rsub.c - décodage des opérations de soustractions inverses + * rsub.c - décodage des opérations de soustractions inverses * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_sget.c b/src/arch/dalvik/opcodes/sget.c index baee85e..e0b7b7a 100644 --- a/src/arch/dalvik/op_sget.c +++ b/src/arch/dalvik/opcodes/sget.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_sget.c - décodage des instructions manipulant des champs statiques (chargement) + * sget.c - décodage des instructions manipulant des champs statiques (chargement) * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_shl.c b/src/arch/dalvik/opcodes/shl.c index 879f405..f5ae00d 100644 --- a/src/arch/dalvik/op_shl.c +++ b/src/arch/dalvik/opcodes/shl.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_shl.c - décodage des opérations de OU exclusifs et logiques + * shl.c - décodage des opérations de OU exclusifs et logiques * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_sput.c b/src/arch/dalvik/opcodes/sput.c index 55cbcf8..f85b0d2 100644 --- a/src/arch/dalvik/op_sput.c +++ b/src/arch/dalvik/opcodes/sput.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_sput.c - décodage des instructions manipulant des champs statiques (enregistrement) + * sput.c - décodage des instructions manipulant des champs statiques (enregistrement) * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_sub.c b/src/arch/dalvik/opcodes/sub.c index 8308616..4f4ab7d 100644 --- a/src/arch/dalvik/op_sub.c +++ b/src/arch/dalvik/opcodes/sub.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_sub.c - décodage des opérations de soustraction + * sub.c - décodage des opérations de soustraction * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_to.c b/src/arch/dalvik/opcodes/to.c index a7481b0..5379d24 100644 --- a/src/arch/dalvik/op_to.c +++ b/src/arch/dalvik/opcodes/to.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_to.c - décodage des instructions de conversions forcées + * to.c - décodage des instructions de conversions forcées * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/op_xor.c b/src/arch/dalvik/opcodes/xor.c index 8f4570a..eedaedd 100644 --- a/src/arch/dalvik/op_xor.c +++ b/src/arch/dalvik/opcodes/xor.c @@ -1,6 +1,6 @@ /* OpenIDA - Outil d'analyse de fichiers binaires - * op_xor.c - décodage des opérations de OU exclusifs et logiques + * xor.c - décodage des opérations de OU exclusifs et logiques * * Copyright (C) 2010 Cyrille Bagard * @@ -24,8 +24,8 @@ #include "opcodes.h" -#include "instruction.h" -#include "operand.h" +#include "../instruction.h" +#include "../operand.h" diff --git a/src/arch/dalvik/processor.c b/src/arch/dalvik/processor.c index 3748e7e..fb3d875 100644 --- a/src/arch/dalvik/processor.c +++ b/src/arch/dalvik/processor.c @@ -26,7 +26,7 @@ #include "context.h" #include "instruction.h" -#include "opcodes.h" +#include "opcodes/opcodes.h" #include "pseudo/fill.h" #include "pseudo/switch.h" #include "../processor-int.h" |