Changed the old bin_routine structure to a GBinRoutine GObject.

git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@68 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a

12 files changed, 33 insertions, 33 deletions

diff --git a/src/format/dwarf/Makefile.am b/src/format/dwarf/Makefile.am
index 6bfccf0..de1d228 100644
--- a/src/format/dwarf/Makefile.am
+++ b/src/format/dwarf/Makefile.am
@@ -11,7 +11,7 @@ libformatdwarf_la_SOURCES =				\
 libformatdwarf_la_LDFLAGS = $(LIBGTK_LIBS)
 
 
-INCLUDES = 
+INCLUDES = $(LIBGTK_CFLAGS)
 
 AM_CPPFLAGS = 
 
diff --git a/src/format/elf/e_elf.c b/src/format/elf/e_elf.c
index b5e3406..373df2b 100644
--- a/src/format/elf/e_elf.c
+++ b/src/format/elf/e_elf.c
@@ -576,14 +576,14 @@ bool resolve_elf_symbol(const elf_format *format, char **label, SymbolType *type
 *                                                                             *
 ******************************************************************************/
 
-bin_routine **get_all_elf_routines(const elf_format *format, size_t *count)
+GBinRoutine **get_all_elf_routines(const elf_format *format, size_t *count)
 {
-    bin_routine **result;                   /* Tableau à retourner         */
+    GBinRoutine **result;                   /* Tableau à retourner         */
     size_t i;                               /* Boucle de parcours          */
 
-    result = (bin_routine **)calloc(format->sym_count, sizeof(bin_routine *));
+    result = (GBinRoutine **)calloc(format->sym_count, sizeof(GBinRoutine *));
     *count = format->sym_count;
-
+    /*
     for (i = 0; i < format->sym_count; i++)
     {
         result[i] = create_binary_routine();
@@ -592,7 +592,7 @@ bin_routine **get_all_elf_routines(const elf_format *format, size_t *count)
         set_binary_routine_name(result[i], strdup(format->symbols[i].name));
 
     }
-
+    */
     return result;
 
 }
diff --git a/src/format/elf/e_elf.h b/src/format/elf/e_elf.h
index f0c2c12..9327fe6 100644
--- a/src/format/elf/e_elf.h
+++ b/src/format/elf/e_elf.h
@@ -56,7 +56,7 @@ size_t get_elf_symbols(const elf_format *, char ***, SymbolType **, uint64_t **)
 bool resolve_elf_symbol(const elf_format *, char **, SymbolType *, uint64_t *);
 
 /* Fournit le prototype de toutes les routines détectées. */
-bin_routine **get_all_elf_routines(const elf_format *, size_t *);
+GBinRoutine **get_all_elf_routines(const elf_format *, size_t *);
 
 
 
diff --git a/src/format/exe_format-int.h b/src/format/exe_format-int.h
index bb96ea5..781b1c3 100644
--- a/src/format/exe_format-int.h
+++ b/src/format/exe_format-int.h
@@ -70,7 +70,7 @@ typedef size_t (* get_resolved_fc) (const exe_format *, char ***, ResolvedType *
 typedef bool (* resolve_symbol_fc) (const exe_format *, char **, SymbolType *, uint64_t *);
 
 /* Fournit le prototype de toutes les routines détectées. */
-typedef bin_routine ** (* get_all_routines_fc) (const exe_format *, size_t *);
+typedef GBinRoutine ** (* get_all_routines_fc) (const exe_format *, size_t *);
 
 
 /* Support générique d'un format d'exécutable */
diff --git a/src/format/exe_format.c b/src/format/exe_format.c
index 5ddb934..6a5c55c 100644
--- a/src/format/exe_format.c
+++ b/src/format/exe_format.c
@@ -515,7 +515,7 @@ bool resolve_exe_symbol(const exe_format *format, char **label, SymbolType *type
 *                                                                             *
 ******************************************************************************/
 
-bin_routine **get_all_exe_routines(const exe_format *format, size_t *count)
+GBinRoutine **get_all_exe_routines(const exe_format *format, size_t *count)
 {
     return format->get_all_routines(format, count);
 
diff --git a/src/format/exe_format.h b/src/format/exe_format.h
index de9f025..a6d91f2 100644
--- a/src/format/exe_format.h
+++ b/src/format/exe_format.h
@@ -148,7 +148,7 @@ size_t get_exe_resolved_items(const exe_format *, char ***, ResolvedType **, uin
 bool resolve_exe_symbol(const exe_format *, char **, SymbolType *, uint64_t *);
 
 /* Fournit le prototype de toutes les routines détectées. */
-bin_routine **get_all_exe_routines(const exe_format *, size_t *);
+GBinRoutine **get_all_exe_routines(const exe_format *, size_t *);
 
 
 
diff --git a/src/format/java/e_java.c b/src/format/java/e_java.c
index 18300e8..76172b2 100755
--- a/src/format/java/e_java.c
+++ b/src/format/java/e_java.c
@@ -48,7 +48,7 @@ bin_part **get_java_default_code_parts(const java_format *, size_t *);
 
 
 /* Fournit le prototype de toutes les routines détectées. */
-bin_routine **get_all_java_routines(const java_format *, size_t *);
+GBinRoutine **get_all_java_routines(const java_format *, size_t *);
 
 
 
@@ -275,7 +275,7 @@ bin_part **get_java_default_code_parts(const java_format *format, size_t *count)
 *                                                                             *
 ******************************************************************************/
 
-bin_routine **get_all_java_routines(const java_format *format, size_t *count)
+GBinRoutine **get_all_java_routines(const java_format *format, size_t *count)
 {
     *count = 0;
 
diff --git a/src/format/mangling/demangler-int.h b/src/format/mangling/demangler-int.h
index 2189bd0..f137fa0 100644
--- a/src/format/mangling/demangler-int.h
+++ b/src/format/mangling/demangler-int.h
@@ -34,7 +34,7 @@
 typedef bool (* can_be_demangled_fc) (name_demangler *, const char *);
 
 /* Procède au décodage d'une chaîne de caractères. */
-typedef bin_routine * (* demangle_routine_fc) (name_demangler *, const char *);
+typedef GBinRoutine * (* demangle_routine_fc) (name_demangler *, const char *);
 
 
 /* Décodeur de nom d'éléments */
diff --git a/src/format/mangling/demangler.c b/src/format/mangling/demangler.c
index 5675800..e8b6b0f 100644
--- a/src/format/mangling/demangler.c
+++ b/src/format/mangling/demangler.c
@@ -120,9 +120,9 @@ name_demangler *get_demangler_by_type(DemanglerType type)
 *                                                                             *
 ******************************************************************************/
 
-bin_routine *try_to_demangle_routine(name_demangler *demangler, const char *name)
+GBinRoutine *try_to_demangle_routine(name_demangler *demangler, const char *name)
 {
-    bin_routine *result;                    /* Construction à remonter     */
+    GBinRoutine *result;                    /* Construction à remonter     */
 
     result = NULL;
 
diff --git a/src/format/mangling/demangler.h b/src/format/mangling/demangler.h
index 259d73d..3c9a6c1 100644
--- a/src/format/mangling/demangler.h
+++ b/src/format/mangling/demangler.h
@@ -52,7 +52,7 @@ bool init_all_demanglers(void);
 name_demangler *get_demangler_by_type(DemanglerType);
 
 /* Tente de décoder une chaîne de caractères donnée. */
-bin_routine *try_to_demangle_routine(name_demangler *, const char *);
+GBinRoutine *try_to_demangle_routine(name_demangler *, const char *);
 
 
 
diff --git a/src/format/mangling/itanium_gram.y b/src/format/mangling/itanium_gram.y
index 7c13c79..4fa7bcb 100644
--- a/src/format/mangling/itanium_gram.y
+++ b/src/format/mangling/itanium_gram.y
@@ -39,7 +39,7 @@ typedef struct _itanium_demangler
 bool can_be_itanium_demangled(itanium_demangler *, const char *);
 
 /* Procède au décodage d'une chaîne de caractères. */
-bin_routine *demangle_itanium_routine(itanium_demangler *, const char *);
+GBinRoutine *demangle_itanium_routine(itanium_demangler *, const char *);
 
 
 
@@ -104,7 +104,7 @@ char *strmerge(char *str1, const char *sep, char *str2);
 }
 
 %parse-param { itanium_demangler *demangler }
-%parse-param { bin_routine *routine }
+%parse-param { GBinRoutine *routine }
 
 
 %token ITANIUM_SIGNATURE
@@ -207,8 +207,8 @@ encoding:
 
 
 name:
-    nested_name                     { $$ = $1; set_binary_routine_name(routine, $1); }
-    | unscoped_name                 { $$ = $1; /*set_binary_routine_name(routine, $1);*/ }
+    nested_name                     { $$ = $1; g_binary_routine_set_name(routine, $1); }
+    | unscoped_name                 { $$ = $1; /*g_binary_routine_set_name(routine, $1);*/ }
     | unscoped_template_name template_args  { $$ = stradd($1, $2); /* TODO : merge -> free */ }
     ;
 
@@ -256,12 +256,12 @@ identifier:
     ;
 
 ctor_dtor_name:
-    C1                              { set_binary_routine_type(routine, RTT_CONSTRUCTOR); }
-    | C2                            { set_binary_routine_type(routine, RTT_CONSTRUCTOR); }
-    | C3                            { set_binary_routine_type(routine, RTT_CONSTRUCTOR); }
-    | D1                            { set_binary_routine_type(routine, RTT_DESTRUCTOR); }
-    | D2                            { set_binary_routine_type(routine, RTT_DESTRUCTOR); }
-    | D3                            { set_binary_routine_type(routine, RTT_DESTRUCTOR); }
+    C1                              { g_binary_routine_set_type(routine, RTT_CONSTRUCTOR); }
+    | C2                            { g_binary_routine_set_type(routine, RTT_CONSTRUCTOR); }
+    | C3                            { g_binary_routine_set_type(routine, RTT_CONSTRUCTOR); }
+    | D1                            { g_binary_routine_set_type(routine, RTT_DESTRUCTOR); }
+    | D2                            { g_binary_routine_set_type(routine, RTT_DESTRUCTOR); }
+    | D3                            { g_binary_routine_set_type(routine, RTT_DESTRUCTOR); }
     ;
 
 
@@ -319,8 +319,8 @@ builtin_type:
 
 
 bare_function_type:
-    bare_function_type type         { add_arg_to_binary_routine(routine, $2); }
-    | type                          { add_arg_to_binary_routine(routine, $1); }
+    bare_function_type type         { g_binary_routine_add_arg(routine, $2); }
+    | type                          { g_binary_routine_add_arg(routine, $1); }
     ;
 
 class_enum_type:
@@ -448,13 +448,13 @@ bool can_be_itanium_demangled(itanium_demangler *itanium, const char *name)
 *                                                                             *
 ******************************************************************************/
 
-bin_routine *demangle_itanium_routine(itanium_demangler *demangler, const char *name)
+GBinRoutine *demangle_itanium_routine(itanium_demangler *demangler, const char *name)
 {
-    bin_routine *result;                    /* Construction à retourner    */
+    GBinRoutine *result;                    /* Construction à retourner    */
 	YY_BUFFER_STATE buffer;                 /* Tampon pour bison           */
 	int ret;                                /* Bilan de l'appel            */
 
-    result = create_binary_routine();
+    result = g_binary_routine_new();
 
 	buffer = yy_scan_string(name);
 	ret = yyparse(demangler, result);
@@ -462,7 +462,7 @@ bin_routine *demangle_itanium_routine(itanium_demangler *demangler, const char *
 
     if (ret != 0)
     {
-        delete_binary_routine(result);
+        /*delete_binary_routine(result); FIXME */
         result = NULL;
     }
 
diff --git a/src/format/pe/Makefile.am b/src/format/pe/Makefile.am
index 7fb0d91..a11d912 100755
--- a/src/format/pe/Makefile.am
+++ b/src/format/pe/Makefile.am
@@ -8,7 +8,7 @@ libformatpe_la_SOURCES =				\
 libformatpe_la_LDFLAGS = 
 
 
-INCLUDES = 
+INCLUDES = $(LIBGTK_CFLAGS)
 
 AM_CPPFLAGS =