1 files changed, 9 insertions, 75 deletions
diff --git a/src/analysis/disass/area.h b/src/analysis/disass/area.h
index abfa509..99113f6 100644
--- a/src/analysis/disass/area.h
+++ b/src/analysis/disass/area.h
@@ -31,96 +31,30 @@
 
 
 
-
 /* Zone mémoire bien bornée */
-typedef struct _mem_area_v2 mem_area_v2;
-
-
-
+typedef struct _mem_area mem_area;
 
 
 /* Procède au désassemblage d'un contenu binaire exécutable. */
-void load_code_from_mem_area_v2(mem_area_v2 *, mem_area_v2 *, size_t, GProcContext *, const vmpa2t *, bool, GtkStatusStack *, activity_id_t);
-
-
-
+void load_code_from_mem_area(mem_area *, mem_area *, size_t, GProcContext *, const vmpa2t *, bool, GtkStatusStack *, activity_id_t);
 
 /* Détermine une liste de zones contigües à traiter. */
-mem_area_v2 *find_memory_area_by_addr_v2(mem_area_v2 *, size_t, const vmpa2t *);
-
-
+mem_area *compute_memory_areas(const GLoadedBinary *, phys_t, size_t *);
 
 /* Détermine une liste de zones contigües à traiter. */
-mem_area_v2 *compute_memory_areas_v2(const GLoadedBinary *, phys_t, size_t *);
+mem_area *find_memory_area_by_addr(mem_area *, size_t, const vmpa2t *);
 
 /* Insère un symbole dans un découpage en aires. */
-void insert_extra_symbol_into_mem_areas_v2(mem_area_v2 *, size_t, const GBinSymbol *);
+void insert_extra_symbol_into_mem_areas(mem_area *, size_t, const GBinSymbol *);
 
 /* S'assure que l'ensemble des aires est entièrement décodé. */
-void ensure_all_mem_areas_are_filled(mem_area_v2 *, size_t, GProcContext *, GtkStatusStack *, activity_id_t);
+void ensure_all_mem_areas_are_filled(mem_area *, size_t, GProcContext *, GtkStatusStack *, activity_id_t);
 
 /* Rassemble les instructions conservées dans des zones données. */
-GArchInstruction *collect_instructions_from_mem_areas_v2(const mem_area_v2 *, size_t);
-
-
-
-
-
-#include <stdbool.h>
-
-
-
-
-#include "../binary.h"
-#include "../../format/executable.h"
-#include "../../gtkext/gtkextstatusbar.h"
-
-
-//////
-#include "../../arch/raw.h"
-#include "../../arch/instruction.h"
-
-
-
-/* Zone mémoire bien bornée */
-typedef struct _mem_area mem_area;
-
+GArchInstruction *collect_instructions_from_mem_areas(const mem_area *, size_t);
 
-
-
-
-
-
-/* Procède au désassemblage d'un contenu binaire exécutable. */
-bool load_code_from_mem_area(mem_area **, size_t *, size_t *, const GLoadedBinary *, GProcContext *, const vmpa2t *, status_blob_info *);
-
-
-
-
-
-/* S'assure qu'une aire qqcontient toutes ses instructions. */
-void fill_mem_area(mem_area **, size_t *, size_t *, const GLoadedBinary *, GProcContext *, status_blob_info *);
-
-
-
-/* Détermine une liste de zones contigües à traiter. */
-mem_area *compute_memory_areas(GExeFormat *, phys_t, size_t *);
-
-
-
-
-
-
-
-/* Détermine une liste de zones contigües à traiter. */
-size_t find_memory_area_by_addr(mem_area *, size_t, const vmpa2t *);
-
-
-
-
-
-/* Rassemble les instructions conservées dans des zones données. */
-GArchInstruction *collect_instructions_from_mem_areas(mem_area *, size_t);
+/* Libère la mémoire occupée par des zones de données. */
+void release_mem_areas(mem_area *, size_t);