diff options
author | Cyrille Bagard <nocbos@gmail.com> | 2019-08-14 20:53:39 (GMT) |
---|---|---|
committer | Cyrille Bagard <nocbos@gmail.com> | 2019-08-14 20:53:39 (GMT) |
commit | 60b70b8701c822eddc65269773621690932a57bd (patch) | |
tree | d3a033c86eb091e3d81dec77b0855406d737596d /src | |
parent | 2c97b766469c25b09c3b173aa6b8abdb066671c1 (diff) |
Updated the Python bindings for binary symbols.
Diffstat (limited to 'src')
-rw-r--r-- | src/analysis/binary.c | 2 | ||||
-rw-r--r-- | src/analysis/disass/area.c | 2 | ||||
-rw-r--r-- | src/analysis/disass/output.c | 2 | ||||
-rw-r--r-- | src/analysis/disass/routines.c | 4 | ||||
-rw-r--r-- | src/analysis/routine.c | 2 | ||||
-rw-r--r-- | src/arch/target.c | 2 | ||||
-rw-r--r-- | src/format/strsym.c | 4 | ||||
-rw-r--r-- | src/format/symbol-int.h | 2 | ||||
-rw-r--r-- | src/format/symbol.c | 12 | ||||
-rw-r--r-- | src/format/symbol.h | 4 | ||||
-rw-r--r-- | src/gtkext/gtkgraphdisplay.c | 2 | ||||
-rw-r--r-- | src/gui/dialogs/gotox.c | 4 | ||||
-rw-r--r-- | src/gui/panels/symbols.c | 6 | ||||
-rw-r--r-- | src/panels/strings.c | 2 |
14 files changed, 25 insertions, 25 deletions
diff --git a/src/analysis/binary.c b/src/analysis/binary.c index cfb4ea0..80d12d3 100644 --- a/src/analysis/binary.c +++ b/src/analysis/binary.c @@ -1823,7 +1823,7 @@ static void on_binary_processor_changed(GArchProcessor *proc, GArchInstruction * * la fonction print_disassembled_instructions(). */ - stype = g_binary_symbol_get_target_type(symbol); + stype = g_binary_symbol_get_stype(symbol); if (stype == STP_ENTRY_POINT) flags |= BLF_ENTRYPOINT; diff --git a/src/analysis/disass/area.c b/src/analysis/disass/area.c index 9649d6f..5569a11 100644 --- a/src/analysis/disass/area.c +++ b/src/analysis/disass/area.c @@ -675,7 +675,7 @@ static void update_address_as_routine(GBinFormat *format, const vmpa2t *addr) if (found) { - sym_type = g_binary_symbol_get_target_type(symbol); + sym_type = g_binary_symbol_get_stype(symbol); wrong_type = (sym_type != STP_ROUTINE && sym_type != STP_ENTRY_POINT); } diff --git a/src/analysis/disass/output.c b/src/analysis/disass/output.c index 83a6815..932e9cc 100644 --- a/src/analysis/disass/output.c +++ b/src/analysis/disass/output.c @@ -239,7 +239,7 @@ void print_disassembled_instructions(GBufferCache *cache, GCodingLanguage *lang, { /* Coupure pour une nouvelle routine */ - stype = g_binary_symbol_get_target_type(symbol); + stype = g_binary_symbol_get_stype(symbol); if (stype == STP_ROUTINE || stype == STP_ENTRY_POINT) { diff --git a/src/analysis/disass/routines.c b/src/analysis/disass/routines.c index d7821d0..42eee76 100644 --- a/src/analysis/disass/routines.c +++ b/src/analysis/disass/routines.c @@ -252,7 +252,7 @@ static void g_routines_study_process(GRoutinesStudy *study, GtkStatusStack *stat { symbol = g_binary_format_get_symbol(study->format, i); - type = g_binary_symbol_get_target_type(symbol); + type = g_binary_symbol_get_stype(symbol); if (type == STP_ROUTINE || type == STP_ENTRY_POINT) study->fallback(study, G_BIN_ROUTINE(symbol), i); @@ -302,7 +302,7 @@ void g_routines_study_compute_limits(GRoutinesStudy *study, GBinRoutine *routine * symboles suivants. */ - if (g_binary_symbol_get_target_type(next_symbol) == STP_CODE_LABEL) + if (g_binary_symbol_get_stype(next_symbol) == STP_CODE_LABEL) goto skip_symbol; range = g_binary_symbol_get_range(next_symbol); diff --git a/src/analysis/routine.c b/src/analysis/routine.c index 41e314c..21abe9c 100644 --- a/src/analysis/routine.c +++ b/src/analysis/routine.c @@ -110,7 +110,7 @@ static void g_bin_routine_init(GBinRoutine *routine) symbol = G_BIN_SYMBOL(routine); - g_binary_symbol_set_target_type(symbol, STP_ROUTINE); + g_binary_symbol_set_stype(symbol, STP_ROUTINE); routine->ret_type = NULL; diff --git a/src/arch/target.c b/src/arch/target.c index db4d058..a8acd67 100644 --- a/src/arch/target.c +++ b/src/arch/target.c @@ -412,7 +412,7 @@ static char *g_target_operand_build_tooltip(const GTargetOperand *operand, const if (operand->symbol != NULL && operand->diff == 0) { - stype = g_binary_symbol_get_target_type(operand->symbol); + stype = g_binary_symbol_get_stype(operand->symbol); switch (stype) { diff --git a/src/format/strsym.c b/src/format/strsym.c index ed38a6b..ecfcc55 100644 --- a/src/format/strsym.c +++ b/src/format/strsym.c @@ -255,7 +255,7 @@ GBinSymbol *g_string_symbol_new_read_only(GBinFormat *format, const mrange_t *ra parent = G_BIN_SYMBOL(result); g_binary_symbol_set_range(parent, range); - g_binary_symbol_set_target_type(parent, STP_RO_STRING); + g_binary_symbol_set_stype(parent, STP_RO_STRING); result->encoding = encoding; @@ -296,7 +296,7 @@ GBinSymbol *g_string_symbol_new_dynamic(const char *string, const vmpa2t *addr, init_mrange(&range, addr, strlen(string)); g_binary_symbol_set_range(parent, &range); - g_binary_symbol_set_target_type(parent, STP_DYN_STRING); + g_binary_symbol_set_stype(parent, STP_DYN_STRING); result->encoding = encoding; diff --git a/src/format/symbol-int.h b/src/format/symbol-int.h index 1b8672d..d6717ac 100644 --- a/src/format/symbol-int.h +++ b/src/format/symbol-int.h @@ -40,7 +40,7 @@ struct _GBinSymbol GObject parent; /* A laisser en premier */ mrange_t range; /* Couverture mémoire */ - SymbolType type; /* Type du symbole */ + SymbolType stype; /* Type du symbole */ SymbolStatus status; /* Visibilité du symbole */ char *alt; /* Nom alternatif */ diff --git a/src/format/symbol.c b/src/format/symbol.c index 22403c5..149dd2a 100644 --- a/src/format/symbol.c +++ b/src/format/symbol.c @@ -123,7 +123,7 @@ static void g_binary_symbol_class_init(GBinSymbolClass *klass) static void g_binary_symbol_init(GBinSymbol *symbol) { - g_binary_symbol_set_target_type(symbol, STP_COUNT); + g_binary_symbol_set_stype(symbol, STP_COUNT); g_binary_symbol_set_status(symbol, SSS_INTERNAL); @@ -214,7 +214,7 @@ GBinSymbol *g_binary_symbol_new(const mrange_t *range, SymbolType type) result = g_object_new(G_TYPE_BIN_SYMBOL, NULL); g_binary_symbol_set_range(result, range); - g_binary_symbol_set_target_type(result, type); + g_binary_symbol_set_stype(result, type); return result; @@ -326,9 +326,9 @@ const mrange_t *g_binary_symbol_get_range(const GBinSymbol *symbol) * * ******************************************************************************/ -void g_binary_symbol_set_target_type(GBinSymbol *symbol, SymbolType type) +void g_binary_symbol_set_stype(GBinSymbol *symbol, SymbolType type) { - symbol->type = type; + symbol->stype = type; } @@ -345,9 +345,9 @@ void g_binary_symbol_set_target_type(GBinSymbol *symbol, SymbolType type) * * ******************************************************************************/ -SymbolType g_binary_symbol_get_target_type(const GBinSymbol *symbol) +SymbolType g_binary_symbol_get_stype(const GBinSymbol *symbol) { - return symbol->type; + return symbol->stype; } diff --git a/src/format/symbol.h b/src/format/symbol.h index 577a6a0..14fed23 100644 --- a/src/format/symbol.h +++ b/src/format/symbol.h @@ -98,10 +98,10 @@ void g_binary_symbol_set_range(GBinSymbol *, const mrange_t *); const mrange_t *g_binary_symbol_get_range(const GBinSymbol *); /* Définit le type du symbole. */ -void g_binary_symbol_set_target_type(GBinSymbol *, SymbolType); +void g_binary_symbol_set_stype(GBinSymbol *, SymbolType); /* Fournit le type du symbole. */ -SymbolType g_binary_symbol_get_target_type(const GBinSymbol *); +SymbolType g_binary_symbol_get_stype(const GBinSymbol *); /* Définit la visibilité du symbole. */ void g_binary_symbol_set_status(GBinSymbol *, SymbolStatus); diff --git a/src/gtkext/gtkgraphdisplay.c b/src/gtkext/gtkgraphdisplay.c index aeecc0f..ed3c923 100644 --- a/src/gtkext/gtkgraphdisplay.c +++ b/src/gtkext/gtkgraphdisplay.c @@ -941,7 +941,7 @@ static void gtk_graph_display_prepare_for_cursor(GtkGraphDisplay *display, const if (!found) goto no_symbol_found; - type = g_binary_symbol_get_target_type(symbol); + type = g_binary_symbol_get_stype(symbol); if (type != STP_ROUTINE && type != STP_ENTRY_POINT) goto bad_symbol_type; diff --git a/src/gui/dialogs/gotox.c b/src/gui/dialogs/gotox.c index 97c031e..2993999 100644 --- a/src/gui/dialogs/gotox.c +++ b/src/gui/dialogs/gotox.c @@ -240,7 +240,7 @@ GtkWidget *create_gotox_dialog_for_entry_points(GtkWindow *parent, GLoadedBinary symbol != NULL; symbol = get_symbol_iterator_next(siter)) { - if (g_binary_symbol_get_target_type(symbol) != STP_ENTRY_POINT) + if (g_binary_symbol_get_stype(symbol) != STP_ENTRY_POINT) goto cgdfep_next; copy_vmpa(&addr, get_mrange_addr(g_binary_symbol_get_range(symbol))); @@ -475,7 +475,7 @@ static void add_new_location_to_list(GtkTreeStore *store, GLoadedBinary *binary, filename = NULL; else - switch (g_binary_symbol_get_target_type(symbol)) + switch (g_binary_symbol_get_stype(symbol)) { case STP_ENTRY_POINT: filename = find_pixmap_file("entrypoint.png"); diff --git a/src/gui/panels/symbols.c b/src/gui/panels/symbols.c index 6ea7a72..7901df0 100644 --- a/src/gui/panels/symbols.c +++ b/src/gui/panels/symbols.c @@ -799,7 +799,7 @@ static void reload_symbols_for_new_list_view(const GSymbolsPanel *panel, GtkStat symbol != NULL; symbol = get_symbol_iterator_next(siter)) { - switch (g_binary_symbol_get_target_type(symbol)) + switch (g_binary_symbol_get_stype(symbol)) { case STP_ROUTINE: case STP_ENTRY_POINT: @@ -1080,7 +1080,7 @@ static void reload_symbols_for_new_tree_view(const GSymbolsPanel *panel, GtkStat symbol != NULL; symbol = get_symbol_iterator_next(siter)) { - switch (g_binary_symbol_get_target_type(symbol)) + switch (g_binary_symbol_get_stype(symbol)) { case STP_ROUTINE: case STP_ENTRY_POINT: @@ -1480,7 +1480,7 @@ static bool is_symbol_matching(const symbols_update_data *data, const GBinSymbol #ifndef NDEBUG - type = g_binary_symbol_get_target_type(symbol); + type = g_binary_symbol_get_stype(symbol); assert(type == STP_ROUTINE || type == STP_ENTRY_POINT || type == STP_OBJECT); diff --git a/src/panels/strings.c b/src/panels/strings.c index c60ef0a..25d1e41 100644 --- a/src/panels/strings.c +++ b/src/panels/strings.c @@ -137,7 +137,7 @@ void handle_new_exe_on_strings_panel(GtkWidget *panel, const GExeFormat *format) { if (g_binary_symbol_get_status(symbols[i]) == SSS_IMPORTED) continue; - if (g_binary_symbol_get_target_type(symbols[i]) != STP_STRING) continue; + if (g_binary_symbol_get_stype(symbols[i]) != STP_STRING) continue; range = g_binary_symbol_get_range(symbols[i]); mrange_virt_to_string(range, MDS_UNDEFINED, true, address, NULL); |