Cleaned the code and provided a fast way to demangle strings.

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

2 files changed, 3 insertions, 55 deletions

diff --git a/src/format/elf/helper_x86.c b/src/format/elf/helper_x86.c
index d74c7dd..3b9084c 100644
--- a/src/format/elf/helper_x86.c
+++ b/src/format/elf/helper_x86.c
@@ -291,27 +291,7 @@ void translate_exe_elf_relocations(GElfFormat *format, GArchInstruction **instru
 
                         /* Routine */
 
-                        //printf("++ routine :: %s\n", "_ZN1N1TIiiE2mfES0_IddE"/*g_binary_symbol_to_string(symbols[j])*/);
-                        printf("++ routine :: %s\n", g_binary_symbol_to_string(symbols[j]));
-                        fflush(NULL);
-
-                        //routine = try_to_demangle_routine(get_demangler_by_type(DGT_ITANIUM), "_ZN1N1TIiiE2mfES0_IddE");
-                        routine = try_to_demangle_routine(get_demangler_by_type(DGT_ITANIUM), g_binary_symbol_to_string(symbols[j]));
-
-                        if (routine == NULL)
-                        {
-                            routine = g_binary_routine_new();
-                            g_binary_routine_set_name(routine, strdup(g_binary_symbol_to_string(symbols[j])));
-                            printf("++failed\n");
-                            //exit(0);
-                        }
-                        else printf("++success\n");
-
-                        printf(" -->> '%s'\n", g_binary_routine_get_name(routine));
-
-                        //if (strcmp(g_binary_symbol_to_string(symbols[j]), "_ZNSt8ios_base4InitC1Ev") == 0)
-                        //if (strcmp(g_binary_symbol_to_string(symbols[j]), "_ZNSolsEPFRSoS_E") == 0)
-                        //    exit(0);
+                        routine = try_to_demangle_routine(g_binary_symbol_to_string(symbols[j]));
 
                         g_binary_routine_set_address(routine, address);
 
@@ -419,19 +399,7 @@ void translate_dyn_elf_relocations(GElfFormat *format, GArchInstruction **instru
 
             /* Routine */
 
-            printf("++ routine :: %s\n", name);
-            fflush(NULL);
-
-            routine = try_to_demangle_routine(get_demangler_by_type(DGT_ITANIUM), name);
-
-            if (routine == NULL)
-            {
-                routine = g_binary_routine_new();
-                g_binary_routine_set_name(routine, strdup(name));
-                printf("++failed\n");
-                //exit(0);
-            }
-            else printf("++success\n");
+            routine = try_to_demangle_routine(name);
 
             g_binary_routine_set_address(routine, address);
 
diff --git a/src/format/elf/symbols.c b/src/format/elf/symbols.c
index 3928c27..8d06c05 100644
--- a/src/format/elf/symbols.c
+++ b/src/format/elf/symbols.c
@@ -218,27 +218,7 @@ static bool load_elf_internal_symbols(GElfFormat *format)
 
                 /* Routine */
 
-                printf("routine :: %s\n", name);
-                fflush(NULL);
-
-                if (1/*strcmp(name, "_Z41__static_initialization_and_destruction_0ii") == 0*/)
-                {
-
-                routine = try_to_demangle_routine(get_demangler_by_type(DGT_ITANIUM), name);
-
-                if (routine == NULL)
-                {
-                    routine = g_binary_routine_new();
-                    g_binary_routine_set_name(routine, strdup(name));
-                    printf("failed\n");
-                }
-                else printf("success\n");
-
-                printf(" -->> '%s'\n", g_binary_routine_get_name(routine));
-
-                //exit(0);
-
-                }
+                routine = try_to_demangle_routine(name);
 
                 g_binary_routine_set_address(routine, ELF_SYM(format, sym, st_value));
                 g_binary_routine_set_size(routine, ELF_SYM(format, sym, st_size));