From e5bda7574625e43c2576b9457fc2bd89a79aa43d Mon Sep 17 00:00:00 2001
From: Cyrille Bagard <nocbos@gmail.com>
Date: Mon, 20 Mar 2017 00:20:57 +0100
Subject: Removed the useless STP_FUNCTION symbol type.

---
 ChangeLog                        | 15 +++++++++++++++
 plugins/pychrysa/format/symbol.c |  1 -
 src/analysis/disass/output.c     |  2 +-
 src/format/elf/helper_x86.c      |  6 +++---
 src/format/symbol.c              |  1 -
 src/format/symbol.h              |  1 -
 6 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 155f8e7..0bf54a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+17-03-20  Cyrille Bagard <nocbos@gmail.com>
+
+	* plugins/pychrysa/format/symbol.c:
+	* src/analysis/disass/output.c:
+	Update code.
+
+	* src/format/elf/helper_x86.c:
+	Replace STP_FUNCTION by STP_ROUTINE.
+
+	* src/format/symbol.c:
+	Update code.
+
+	* src/format/symbol.h:
+	Remove the useless STP_FUNCTION symbol type.
+
 17-03-19  Cyrille Bagard <nocbos@gmail.com>
 
 	* configure.ac:
diff --git a/plugins/pychrysa/format/symbol.c b/plugins/pychrysa/format/symbol.c
index 101b694..53fb9c9 100644
--- a/plugins/pychrysa/format/symbol.c
+++ b/plugins/pychrysa/format/symbol.c
@@ -584,7 +584,6 @@ static bool py_binary_symbol_define_constants(PyTypeObject *obj_type)
     result &= PyDict_AddIntMacro(obj_type, STP_ROUTINE);
     result &= PyDict_AddIntMacro(obj_type, STP_CODE_LABEL);
     result &= PyDict_AddIntMacro(obj_type, STP_OBJECT);
-    result &= PyDict_AddIntMacro(obj_type, STP_FUNCTION);
     result &= PyDict_AddIntMacro(obj_type, STP_ENTRY_POINT);
     result &= PyDict_AddIntMacro(obj_type, STP_STRING);
     result &= PyDict_AddIntMacro(obj_type, STP_RO_STRING);
diff --git a/src/analysis/disass/output.c b/src/analysis/disass/output.c
index a6e5f51..fcbc0c6 100644
--- a/src/analysis/disass/output.c
+++ b/src/analysis/disass/output.c
@@ -201,7 +201,7 @@ void print_disassembled_instructions(GBufferCache *cache, GCodingLanguage *lang,
 
                 stype = g_binary_symbol_get_target_type(symbols[sym_index]);
 
-                if (stype == STP_ROUTINE || stype == STP_FUNCTION || stype == STP_ENTRY_POINT)
+                if (stype == STP_ROUTINE || stype == STP_ENTRY_POINT)
                 {
                     /* Impression de la marque de début */
 
diff --git a/src/format/elf/helper_x86.c b/src/format/elf/helper_x86.c
index 596911f..826ac40 100644
--- a/src/format/elf/helper_x86.c
+++ b/src/format/elf/helper_x86.c
@@ -140,7 +140,7 @@ bool load_elf_x86_relocated_symbols(GElfFormat *format, const elf_shdr *relxxx,
                     name = "unknown";
                 }
 
-                symbol = g_binary_symbol_new(STP_FUNCTION);
+                symbol = g_binary_symbol_new(STP_ROUTINE);
                 g_binary_format_add_symbol(G_BIN_FORMAT(format), symbol);
 
                 break;
@@ -323,7 +323,7 @@ void translate_exe_elf_relocations(GElfFormat *format, GArchInstruction **instru
 
                         /* Symbole uniquement */
 
-                        symbol = g_binary_symbol_new(STP_FUNCTION);
+                        symbol = g_binary_symbol_new(STP_ROUTINE);
 
                         g_binary_symbol_attach_routine(symbol, routine);
 
@@ -431,7 +431,7 @@ void translate_dyn_elf_relocations(GElfFormat *format, GArchInstruction **instru
 
             /* Symbole uniquement */
 
-            symbol = g_binary_symbol_new(STP_FUNCTION);
+            symbol = g_binary_symbol_new(STP_ROUTINE);
 
             g_binary_symbol_attach_routine(symbol, routine);
 
diff --git a/src/format/symbol.c b/src/format/symbol.c
index 434054a..898ce9a 100644
--- a/src/format/symbol.c
+++ b/src/format/symbol.c
@@ -372,7 +372,6 @@ bool g_binary_symbol_is_block_start(GBinSymbol *symbol)
     {
         case STP_ROUTINE:
         case STP_OBJECT:
-        case STP_FUNCTION:
         case STP_ENTRY_POINT:
         case STP_STRING:
         case STP_RO_STRING:
diff --git a/src/format/symbol.h b/src/format/symbol.h
index 4a48cf8..2b8abf8 100644
--- a/src/format/symbol.h
+++ b/src/format/symbol.h
@@ -46,7 +46,6 @@ typedef enum _SymbolType
     STP_ROUTINE,                            /* Simple morceau de code      */
     STP_CODE_LABEL,                         /* Renvoi au sein de code      */
     STP_OBJECT,                             /* Objet quelconque            */
-    STP_FUNCTION,                           /* Simple morceau de code      */
     STP_ENTRY_POINT,                        /* Morceau de code en entrée   */
     STP_STRING,                             /* Chaîne de caractères        */
     STP_RO_STRING,                          /* Chaîne de caractères        */
-- 
cgit v0.11.2-87-g4458