Improved the basic support of Dwarf information.

4 files changed, 160 insertions, 4 deletions

diff --git a/src/format/dwarf/v4/Makefile.am b/src/format/dwarf/v4/Makefile.am
index fb3bc43..b0c9719 100644
--- a/src/format/dwarf/v4/Makefile.am
+++ b/src/format/dwarf/v4/Makefile.am
@@ -2,7 +2,8 @@
 noinst_LTLIBRARIES = libformatdwarfv4.la
 
 libformatdwarfv4_la_SOURCES =			\
-	dwarf.h dwarf.c
+	dwarf.h dwarf.c						\
+	form.h form.c
 
 libformatdwarfv4_la_LDFLAGS = $(LIBGTK_LIBS)
 
diff --git a/src/format/dwarf/v4/dwarf.c b/src/format/dwarf/v4/dwarf.c
index 164d321..52345e8 100644
--- a/src/format/dwarf/v4/dwarf.c
+++ b/src/format/dwarf/v4/dwarf.c
@@ -27,6 +27,9 @@
 #include "../dwarf-int.h"
 
 
+#include "form.h"
+
+
 
 /* Format de débogage DWARF v4 (instance) */
 struct _GDwarfV4Format
@@ -76,12 +79,17 @@ G_DEFINE_TYPE(GDwarfV4Format, g_dwarfv4_format, G_TYPE_DWARF_FORMAT);
 static void g_dwarfv4_format_class_init(GDwarfV4FormatClass *klass)
 {
     GObjectClass *object;                   /* Autre version de la classe  */
+    GDwarfFormatClass *dwarf;               /* Version parente de la classe*/
 
     object = G_OBJECT_CLASS(klass);
 
     object->dispose = (GObjectFinalizeFunc/* ! */)g_dwarfv4_format_dispose;
     object->finalize = (GObjectFinalizeFunc)g_dwarfv4_format_finalize;
 
+    dwarf = G_DWARF_FORMAT_CLASS(klass);
+
+    dwarf->read_form = (read_form_value_fc)read_dwarf_v4_form_value;
+
 }
 
 
@@ -160,11 +168,13 @@ GBinFormat *g_dwarfv4_format_new(GBinContent *content, GExeFormat *parent)
 
     result = g_object_new(G_TYPE_DWARFV4_FORMAT, NULL);
 
-
-
     g_binary_format_set_content(G_BIN_FORMAT(result), content);
 
-
+    if (!g_dwarf_format_load(G_DWARF_FORMAT(result), parent))
+    {
+        g_object_unref(G_OBJECT(result));
+        result = NULL;
+    }
 
     return G_BIN_FORMAT(result);
 
diff --git a/src/format/dwarf/v4/form.c b/src/format/dwarf/v4/form.c
new file mode 100644
index 0000000..fffc0c3
--- /dev/null
+++ b/src/format/dwarf/v4/form.c
@@ -0,0 +1,106 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * form.c - chargement en mémoire des valeurs d'attributs
+ *
+ * Copyright (C) 2015 Cyrille Bagard
+ *
+ *  This file is part of Chrysalide.
+ *
+ *  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/>.
+ */
+
+
+#include "form.h"
+
+
+#include "../dwarf-int.h"
+#include "../v2/form.h"
+
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : format = contenu binaire de débogage à parcourir.            *
+*                cu     = unité de compilation parente.                       *
+*                form   = nature de la valeur à lire.                         *
+*                pos    = tête de lecture au sein des données. [OUT]          *
+*                value  = valeur au format donné lue. [OUT]                   *
+*                                                                             *
+*  Description : Lit la valeur correspondant à un type donné.                 *
+*                                                                             *
+*  Retour      : Bilan de l'opération.                                        *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+bool read_dwarf_v4_form_value(const GDwarfFormat *format, const dw_compil_unit_header *cu, DwarfForm form, vmpa2t *pos, dw_v4_form_value *value)
+{
+    bool result;                            /* Bilan de lecture à renvoyer */
+    GBinContent *content;                   /* Contenu binaire à parcourir */
+    SourceEndian endian;                    /* Boutisme des enregistrements*/
+    uint32_t tmp32;                         /* Données sur 32 bits         */
+    uint64_t tmp64;                         /* Données sur 64 bits         */
+    uleb128_t tmpuleb;                      /* Données sur xxx bits        */
+
+    content = G_BIN_FORMAT(format)->content;
+    endian = g_binary_format_get_endianness(G_BIN_FORMAT(format));
+
+    switch (form)
+    {
+        case DW_FORM_sec_offset:
+
+            if (cu->is_32b)
+            {
+                    result = g_binary_content_read_u32(content, pos, endian, &tmp32);
+                    tmp64 = tmp32;
+            }
+            else
+                result = g_binary_content_read_u64(content, pos, endian, &tmp64);
+
+            value->sec_offset = tmp64;
+            break;
+
+        case DW_FORM_exprloc:
+
+            tmpuleb = 0;    /* Pour GCC */
+
+            result = g_binary_content_read_uleb128(content, pos, &tmpuleb);
+            if (!result) break;
+
+            value->expr.size = tmpuleb;
+
+            value->expr.start = g_binary_content_get_raw_access(content, pos, value->expr.size);
+            result = (value->expr.start != NULL);
+
+            break;
+
+        case DW_FORM_flag_present:
+            result = true;
+            value->has_flag = true;
+            break;
+
+        case DW_FORM_ref_sig8:
+            result = g_binary_content_read_u64(content, pos, endian, &value->signature);
+            break;
+
+        default:
+            result = read_dwarf_v2_form_value(format, cu, form, pos, &value->v2);
+            break;
+
+    }
+
+    return result;
+
+}
diff --git a/src/format/dwarf/v4/form.h b/src/format/dwarf/v4/form.h
new file mode 100644
index 0000000..ac36142
--- /dev/null
+++ b/src/format/dwarf/v4/form.h
@@ -0,0 +1,39 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * form.h - prototypes pour le chargement en mémoire des valeurs d'attributs
+ *
+ * Copyright (C) 2015 Cyrille Bagard
+ *
+ *  This file is part of Chrysalide.
+ *
+ *  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 _FORMAT_DWARF_V4_FORM_H
+#define _FORMAT_DWARF_V4_FORM_H
+
+
+#include "../dwarf.h"
+#include "../dwarf_def.h"
+#include "../../../analysis/content.h"
+
+
+
+/* Lit la valeur correspondant à un type donné. */
+bool read_dwarf_v4_form_value(const GDwarfFormat *, const dw_compil_unit_header *, DwarfForm, vmpa2t *, dw_v4_form_value *);
+
+
+
+#endif  /* _FORMAT_DWARF_V4_FORM_H */