Handled Dalvik exception handlers in the graphic view.

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

2 files changed, 98 insertions, 0 deletions

diff --git a/src/analysis/disass/links.c b/src/analysis/disass/links.c
index 4d799fc..7cc3c27 100644
--- a/src/analysis/disass/links.c
+++ b/src/analysis/disass/links.c
@@ -50,12 +50,14 @@ void establish_links_between_lines(GArchInstruction *list, GBinRoutine **routine
     vmpa_t addr;                            /* Adresse référencée          */
     InstructionLinkType type;               /* Type de référence           */
     GArchInstruction *target;               /* Ligne visée par la référence*/
+    GArchInstruction *prev;                 /* Instruction précédente      */
 
     for (i = 0; i < count; i++)
     {
         start = g_binary_routine_get_address(routines[i]);
         end = start + g_binary_routine_get_size(routines[i]);
 
+        /* Définition de toutes les destinations */
         for (iter = g_arch_instruction_find_by_address(list, start, true);
              iter != NULL;
              iter = g_arch_instruction_get_next_iter(list, iter, end))
@@ -104,10 +106,39 @@ void establish_links_between_lines(GArchInstruction *list, GBinRoutine **routine
 
                     break;
 
+                default:
+                    /**
+                     * Note pour GCC : à ce stade du désassemblage, ILT_CATCH_EXCEPTION
+                     * ne peut être présente, car ne provenant que de greffons.
+                     * Pour ILT_EXEC_FLOW, sa seule insertion est ici, plus bas.
+                     */
+                    break;
+
             }
 
         }
 
+        /* Rattachement de deux blocs selon le flux normal */
+
+        iter = g_arch_instruction_find_by_address(list, start, true);
+
+        for (iter = g_arch_instruction_get_next_iter(list, iter, end);
+             iter != NULL;
+             iter = g_arch_instruction_get_next_iter(list, iter, end))
+        {
+            if (!g_arch_instruction_has_sources(iter))
+                continue;
+
+            prev = g_arch_instruction_get_prev_iter(list, iter);
+
+            if (g_arch_instruction_is_return(prev))
+                continue;
+
+            if (!g_arch_instruction_has_destinations(prev))
+                g_arch_instruction_link_with(prev, iter, ILT_EXEC_FLOW);
+
+        }
+
         gtk_extended_status_bar_update_activity(statusbar, id, (i + 1) * 1.0 / count);
 
     }
diff --git a/src/analysis/type-int.h b/src/analysis/type-int.h
new file mode 100644
index 0000000..a26deeb
--- /dev/null
+++ b/src/analysis/type-int.h
@@ -0,0 +1,67 @@
+
+/* OpenIDA - Outil d'analyse de fichiers binaires
+ * type-int.h - prototypes pour la définition interne des types de données
+ *
+ * Copyright (C) 2012 Cyrille Bagard
+ *
+ *  This file is part of OpenIDA.
+ *
+ *  OpenIDA is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  OpenIDA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef _ANALYSIS_TYPE_INT_H
+#define _ANALYSIS_TYPE_INT_H
+
+
+#include "type.h"
+
+
+
+/* Décrit le type fourni sous forme de caractères. */
+typedef GDataType * (* type_dup_fc) (const GDataType *);
+
+/* Décrit le type fourni sous forme de caractères. */
+typedef char * (* type_to_string_fc) (const GDataType *);
+
+/* Procède à l'impression de la description d'un type. */
+typedef void (* output_type_fc) (const GDataType *, GLangOutput *, GBufferLine *, bool, bool);
+
+
+/* Description de type quelconque (instance) */
+struct _GDataType
+{
+    GObject parent;                         /* A laisser en premier        */
+
+    type_dup_fc dup;                        /* Copie d'instance existante  */
+    type_to_string_fc to_string;            /* Conversion au format texte  */
+    output_type_fc output;                  /* Impression à l'écran        */
+
+    GDataType *namespace;                   /* Espace de noms / classe     */
+    TypeQualifier qualifiers;               /* Eventuels qualificatifs     */
+
+    GTypesManager *manager;                 /* Gestionnaire global         */
+
+};
+
+/* Description de type quelconque (classe) */
+struct _GDataTypeClass
+{
+    GObjectClass parent;                    /* A laisser en premier        */
+
+};
+
+
+
+#endif  /* _ANALYSIS_TYPE_INT_H */