diff options
| author | Cyrille Bagard <nocbos@gmail.com> | 2015-04-04 13:31:33 (GMT) |
|---|---|---|
| committer | Cyrille Bagard <nocbos@gmail.com> | 2015-04-04 13:31:33 (GMT) |
| commit | 46e46c2894ea92502734c7bbd1cbcc6cb2e46d17 (patch) | |
| tree | 9b338348d6bd78e71746bfb25fa8c864dfe44d1e /src/analysis/blocks/virtual.c | |
| parent | d65fbe084a91d180d17767314f4e34b7456e8436 (diff) | |
Updated the disassembling process order and defined ranks for basic routines.
git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@501 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a
Diffstat (limited to 'src/analysis/blocks/virtual.c')
| -rw-r--r-- | src/analysis/blocks/virtual.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/analysis/blocks/virtual.c b/src/analysis/blocks/virtual.c index 946445c..a3e1695 100644 --- a/src/analysis/blocks/virtual.c +++ b/src/analysis/blocks/virtual.c @@ -27,6 +27,7 @@ #include <malloc.h> +#include "flow.h" #include "../block-int.h" @@ -71,7 +72,7 @@ static void g_virtual_block_dispose(GVirtualBlock *); static void g_virtual_block_finalize(GVirtualBlock *); /* Recherche le bloc contenant une adresse donnée. */ -static GInstrBlock *g_virtual_block_find_by_addr(const GVirtualBlock *, vmpa_t, bool); +static GInstrBlock *g_virtual_block_find_by_addr(const GVirtualBlock *, const vmpa2t *, bool); /* Parcourt le bloc d'instructions dans un ordre donné. */ static bool g_virtual_block_visit(GVirtualBlock *, instr_block_visitor_cb, void *); @@ -225,7 +226,7 @@ GInstrBlock *g_virtual_block_new(void) * * ******************************************************************************/ -static GInstrBlock *g_virtual_block_find_by_addr(const GVirtualBlock *block, vmpa_t addr, bool final) +static GInstrBlock *g_virtual_block_find_by_addr(const GVirtualBlock *block, const vmpa2t *addr, bool final) { GInstrBlock *result; /* Resultat à retourner */ size_t i; /* Boucle de parcours */ @@ -240,7 +241,7 @@ static GInstrBlock *g_virtual_block_find_by_addr(const GVirtualBlock *block, vmp if (ret != NULL) { if (final) result = ret; - else result = block->children[i]; + else result = (G_IS_FLOW_BLOCK(ret) ? G_INSTR_BLOCK(block) : ret); } } |