5 files changed, 12 insertions, 13 deletions
diff --git a/src/arch/dalvik/fetch.c b/src/arch/dalvik/fetch.c
index 89d5bea..e05b7de 100644
--- a/src/arch/dalvik/fetch.c
+++ b/src/arch/dalvik/fetch.c
@@ -44,7 +44,7 @@
 *                                                                             *
 ******************************************************************************/
 
-void help_fetching_with_dalvik_instruction(GArchInstruction *instr, GArchProcessor *proc, GDalvikContext *context, GBinFormat *format, size_t index)
+void help_fetching_with_dalvik_instruction(GArchInstruction *instr, GArchProcessor *proc, GDalvikContext *context, GExeFormat *format, size_t index)
 {
     GArchOperand *op;                       /* Opérande numérique en place */
     virt_t target;                          /* Adresse virtuelle visée     */
diff --git a/src/arch/dalvik/fetch.h b/src/arch/dalvik/fetch.h
index 3a8dda3..1c10bbf 100644
--- a/src/arch/dalvik/fetch.h
+++ b/src/arch/dalvik/fetch.h
@@ -27,25 +27,24 @@
 
 #include "context.h"
 #include "../instruction.h"
-#include "../../format/format.h"
 
 
 
 /* Pousse une adresse précisée par un saut pour désassemblage. */
-void help_fetching_with_dalvik_instruction(GArchInstruction *, GArchProcessor *, GDalvikContext *, GBinFormat *, size_t);
+void help_fetching_with_dalvik_instruction(GArchInstruction *, GArchProcessor *, GDalvikContext *, GExeFormat *, size_t);
 
 
-static inline void help_fetching_with_dalvik_goto_instruction(GArchInstruction *ins, GArchProcessor *proc, GDalvikContext *ctx, GBinFormat *fmt)
+static inline void help_fetching_with_dalvik_goto_instruction(GArchInstruction *ins, GArchProcessor *proc, GDalvikContext *ctx, GExeFormat *fmt)
 {
     help_fetching_with_dalvik_instruction(ins, proc, ctx, fmt, 0);
 }
 
-static inline void help_fetching_with_dalvik_if_instruction(GArchInstruction *ins, GArchProcessor *proc, GDalvikContext *ctx, GBinFormat *fmt)
+static inline void help_fetching_with_dalvik_if_instruction(GArchInstruction *ins, GArchProcessor *proc, GDalvikContext *ctx, GExeFormat *fmt)
 {
     help_fetching_with_dalvik_instruction(ins, proc, ctx, fmt, 2);
 }
 
-static inline void help_fetching_with_dalvik_ifz_instruction(GArchInstruction *ins, GArchProcessor *proc, GDalvikContext *ctx, GBinFormat *fmt)
+static inline void help_fetching_with_dalvik_ifz_instruction(GArchInstruction *ins, GArchProcessor *proc, GDalvikContext *ctx, GExeFormat *fmt)
 {
     help_fetching_with_dalvik_instruction(ins, proc, ctx, fmt, 1);
 }
diff --git a/src/arch/dalvik/link.c b/src/arch/dalvik/link.c
index 2d1b18c..311f672 100644
--- a/src/arch/dalvik/link.c
+++ b/src/arch/dalvik/link.c
@@ -74,7 +74,7 @@ typedef struct _case_comment
 *                                                                             *
 ******************************************************************************/
 
-void handle_dalvik_packed_switch_links(GArchInstruction *instr, GArchProcessor *proc, GProcContext *context, GBinFormat *format)
+void handle_dalvik_packed_switch_links(GArchInstruction *instr, GArchProcessor *proc, GProcContext *context, GExeFormat *format)
 {
     GArchOperand *op;                       /* Opérande numérique en place */
     virt_t virt;                            /* Adresse virtuelle           */
diff --git a/src/arch/dalvik/link.h b/src/arch/dalvik/link.h
index a965b3b..ee5d5db 100644
--- a/src/arch/dalvik/link.h
+++ b/src/arch/dalvik/link.h
@@ -29,19 +29,19 @@
 
 
 
-static inline void handle_dalvik_if_branch_as_link(GArchInstruction *ins, GArchProcessor *proc, GProcContext *ctx, GBinFormat *fmt)
+static inline void handle_dalvik_if_branch_as_link(GArchInstruction *ins, GArchProcessor *proc, GProcContext *ctx, GExeFormat *fmt)
 {
     handle_branch_as_link(ins, proc, ctx, fmt, 2);
 }
 
-static inline void handle_dalvik_ifz_branch_as_link(GArchInstruction *ins, GArchProcessor *proc, GProcContext *ctx, GBinFormat *fmt)
+static inline void handle_dalvik_ifz_branch_as_link(GArchInstruction *ins, GArchProcessor *proc, GProcContext *ctx, GExeFormat *fmt)
 {
     handle_branch_as_link(ins, proc, ctx, fmt, 1);
 }
 
 
 /* Etablit tous les liens liés à un embranchement compressé. */
-void handle_dalvik_packed_switch_links(GArchInstruction *, GArchProcessor *, GProcContext *, GBinFormat *);
+void handle_dalvik_packed_switch_links(GArchInstruction *, GArchProcessor *, GProcContext *, GExeFormat *);
 
 
 
diff --git a/src/arch/dalvik/post.h b/src/arch/dalvik/post.h
index a86ed4c..a5375b7 100644
--- a/src/arch/dalvik/post.h
+++ b/src/arch/dalvik/post.h
@@ -29,19 +29,19 @@
 
 
 
-static inline void post_process_dalvik_goto_target_resolution(GArchInstruction *ins, GArchProcessor *proc, GProcContext *ctx, GBinFormat *fmt)
+static inline void post_process_dalvik_goto_target_resolution(GArchInstruction *ins, GArchProcessor *proc, GProcContext *ctx, GExeFormat *fmt)
 {
     post_process_target_resolution(ins, proc, ctx, fmt, 0, STP_CODE_LABEL);
 
 }
 
-static inline void post_process_dalvik_if_target_resolution(GArchInstruction *ins, GArchProcessor *proc, GProcContext *ctx, GBinFormat *fmt)
+static inline void post_process_dalvik_if_target_resolution(GArchInstruction *ins, GArchProcessor *proc, GProcContext *ctx, GExeFormat *fmt)
 {
     post_process_target_resolution(ins, proc, ctx, fmt, 2, STP_CODE_LABEL);
 
 }
 
-static inline void post_process_dalvik_ifz_target_resolution(GArchInstruction *ins, GArchProcessor *proc, GProcContext *ctx, GBinFormat *fmt)
+static inline void post_process_dalvik_ifz_target_resolution(GArchInstruction *ins, GArchProcessor *proc, GProcContext *ctx, GExeFormat *fmt)
 {
     post_process_target_resolution(ins, proc, ctx, fmt, 1, STP_CODE_LABEL);