diff options
Diffstat (limited to 'src/analysis')
| -rw-r--r-- | src/analysis/disass/area.c | 5 | ||||
| -rw-r--r-- | src/analysis/disass/area.h | 1 | ||||
| -rw-r--r-- | src/analysis/disass/disassembler.c | 2 | ||||
| -rw-r--r-- | src/analysis/disass/fetch.c | 1 | ||||
| -rw-r--r-- | src/analysis/disass/instructions.c | 6 | ||||
| -rw-r--r-- | src/analysis/disass/instructions.h | 2 |
6 files changed, 10 insertions, 7 deletions
diff --git a/src/analysis/disass/area.c b/src/analysis/disass/area.c index 52ba933..48ac6ec 100644 --- a/src/analysis/disass/area.c +++ b/src/analysis/disass/area.c @@ -33,6 +33,7 @@ #include "../../analysis/contents/restricted.h" #include "../../arch/raw.h" #include "../../common/bits.h" +#include "../../format/format.h" #include "../../gui/panels/log.h" @@ -336,7 +337,7 @@ static void update_address_as_routine(GBinFormat *format, const vmpa2t *addr) { symbol = g_binary_symbol_new(STP_ROUTINE); g_binary_symbol_attach_routine(symbol, routine); - g_binary_format_add_symbol(G_BIN_FORMAT(format), symbol); + g_binary_format_add_symbol(format, symbol); } else _g_binary_symbol_attach_routine(symbol, routine, STP_ROUTINE); @@ -479,7 +480,7 @@ void load_code_from_mem_area(mem_area *area, mem_area *list, size_t count, GProc /* Eventuel renvoi vers d'autres adresses */ - g_arch_instruction_call_hook(instr, IPH_FETCH, proc, ctx, format); + g_arch_instruction_call_hook(instr, IPH_FETCH, proc, ctx, G_EXE_FORMAT(format)); /* Insertion des symboles découverts en parallèle */ diff --git a/src/analysis/disass/area.h b/src/analysis/disass/area.h index f9cd9e6..39313fd 100644 --- a/src/analysis/disass/area.h +++ b/src/analysis/disass/area.h @@ -27,6 +27,7 @@ #include "../binary.h" #include "../../arch/instruction.h" +#include "../../format/symbol.h" #include "../../gtkext/gtkstatusstack.h" diff --git a/src/analysis/disass/disassembler.c b/src/analysis/disass/disassembler.c index 8a19f9d..62821ab 100644 --- a/src/analysis/disass/disassembler.c +++ b/src/analysis/disass/disassembler.c @@ -280,7 +280,7 @@ static void process_all_instructions(wgroup_id_t gid, GtkStatusStack *status, co else end = begin + run_size; - study = g_instructions_study_new(proc, ctx, G_BIN_FORMAT(format), begin, end, id, fallback); + study = g_instructions_study_new(proc, ctx, format, begin, end, id, fallback); g_work_queue_schedule_work(queue, G_DELAYED_WORK(study), gid); diff --git a/src/analysis/disass/fetch.c b/src/analysis/disass/fetch.c index 55a23b6..0005378 100644 --- a/src/analysis/disass/fetch.c +++ b/src/analysis/disass/fetch.c @@ -31,6 +31,7 @@ #include "area.h" +#include "../../format/format.h" #include "../../glibext/delayed-int.h" diff --git a/src/analysis/disass/instructions.c b/src/analysis/disass/instructions.c index a3ca662..799d196 100644 --- a/src/analysis/disass/instructions.c +++ b/src/analysis/disass/instructions.c @@ -40,7 +40,7 @@ struct _GInstructionsStudy GArchProcessor *proc; /* Processeurs avec ses instr. */ GProcContext *ctx; /* Suivi du désassemblage */ - GBinFormat *format; /* Format binaire à manipuler */ + GExeFormat *format; /* Format binaire à manipuler */ ins_fallback_cb fallback; /* Routine de traitement finale*/ size_t begin; /* Point de départ du parcours */ @@ -185,7 +185,7 @@ static void g_instructions_study_finalize(GInstructionsStudy *study) * * ******************************************************************************/ -GInstructionsStudy *g_instructions_study_new(GArchProcessor *proc, GProcContext *ctx, GBinFormat *format, size_t begin, size_t end, activity_id_t id, ins_fallback_cb fallback) +GInstructionsStudy *g_instructions_study_new(GArchProcessor *proc, GProcContext *ctx, GExeFormat *format, size_t begin, size_t end, activity_id_t id, ins_fallback_cb fallback) { GInstructionsStudy *result; /* Tâche à retourner */ @@ -310,6 +310,6 @@ void g_instructions_study_establish_links(GInstructionsStudy *study, size_t inde } - establish_links_for_instruction(instr, study->format, study->proc); + establish_links_for_instruction(instr, G_BIN_FORMAT(study->format), study->proc); } diff --git a/src/analysis/disass/instructions.h b/src/analysis/disass/instructions.h index a69e4df..9d76035 100644 --- a/src/analysis/disass/instructions.h +++ b/src/analysis/disass/instructions.h @@ -52,7 +52,7 @@ typedef void (* ins_fallback_cb) (GInstructionsStudy *, size_t); /* Crée une tâche d'étude de instructions différée. */ -GInstructionsStudy *g_instructions_study_new(GArchProcessor *, GProcContext *, GBinFormat *, size_t, size_t, activity_id_t, ins_fallback_cb); +GInstructionsStudy *g_instructions_study_new(GArchProcessor *, GProcContext *, GExeFormat *, size_t, size_t, activity_id_t, ins_fallback_cb); /* Réalise l'appel de type IPH_LINK sur une instruction. */ void g_instructions_study_do_link_operation(GInstructionsStudy *, size_t); |