summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am64
-rw-r--r--src/analysis/routine.c4
-rw-r--r--src/analysis/type.c2
-rw-r--r--src/arch/instruction.c19
-rw-r--r--src/arch/instruction.h3
-rw-r--r--src/gui/Makefile.am3
-rw-r--r--src/gui/menus/Makefile.am2
-rw-r--r--src/gui/panels/panel.c2
8 files changed, 59 insertions, 40 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 9432240..35cd031 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
-lib_LTLIBRARIES = liboidaglibext.la liboidadisass.la liboidagtkext.la liboidagui.la liboidaplugin.la
+lib_LTLIBRARIES = libchrysaglibext.la libchrysadisass.la libchrysagtkext.la libchrysagui.la libchrysaplugin.la
-bin_PROGRAMS=openida
+bin_PROGRAMS = chrysalide
@@ -9,14 +9,14 @@ bin_PROGRAMS=openida
# Bibliothèques dynamiques
############################################################
-#--- liboidadisas
+#--- libchrysadisas
-liboidadisass_la_SOURCES =
+libchrysadisass_la_SOURCES =
-liboidadisass_la_LDFLAGS = $(LIBGTK_LIBS) $(LIBXML_LIBS) \
- -Lcommon/.libs -lcommon -L.libs -loidaglibext
+libchrysadisass_la_LDFLAGS = $(LIBGTK_LIBS) $(LIBXML_LIBS) \
+ -Lcommon/.libs -lcommon -L.libs -lchrysaglibext
-liboidadisass_la_LIBADD = \
+libchrysadisass_la_LIBADD = \
analysis/libanalysis.la \
arch/libarch.la \
debug/libdebug.la \
@@ -25,47 +25,48 @@ liboidadisass_la_LIBADD = \
format/libformat.la
-#--- liboidaglibext
+#--- libchrysaglibext
-liboidaglibext_la_SOURCES =
+libchrysaglibext_la_SOURCES =
-liboidaglibext_la_LDFLAGS = $(LIBGTK_LIBS) $(LIBGRAPH_LIBS)
+libchrysaglibext_la_LDFLAGS = $(LIBGTK_LIBS) $(LIBGRAPH_LIBS)
-liboidaglibext_la_LIBADD = \
+libchrysaglibext_la_LIBADD = \
glibext/libglibext.la
-#--- liboidagtkext
+#--- libchrysagtkext
-liboidagtkext_la_SOURCES =
+libchrysagtkext_la_SOURCES =
-liboidagtkext_la_LDFLAGS = $(LIBGTK_LIBS) $(LIBGRAPH_LIBS) \
- -L.libs -loidadisass
+libchrysagtkext_la_LDFLAGS = $(LIBGTK_LIBS) $(LIBGRAPH_LIBS) \
+ -L.libs -lchrysadisass
-liboidagtkext_la_LIBADD = \
+libchrysagtkext_la_LIBADD = \
graph/libgraph.la \
gtkext/libgtkext.la
-#--- liboidagui
+#--- libchrysagui
-liboidagui_la_SOURCES =
+libchrysagui_la_SOURCES =
-liboidagui_la_LDFLAGS = $(LIBGTK_LIBS) \
- -L.libs -loidagtkext
+libchrysagui_la_LDFLAGS = $(LIBGTK_LIBS) \
+ -L.libs -lchrysagtkext
-liboidagui_la_LIBADD = \
+libchrysagui_la_LIBADD = \
+ gui/libgui.la \
panels/libpanels.la
-#--- liboidaplugin
+#--- libchrysaplugin
-liboidaplugin_la_SOURCES =
+libchrysaplugin_la_SOURCES =
-liboidaplugin_la_LDFLAGS = $(LIBGTK_LIBS) \
- -L.libs -loidadisass -loidagui
+libchrysaplugin_la_LDFLAGS = $(LIBGTK_LIBS) \
+ -L.libs -lchrysadisass -lchrysagui
-liboidaplugin_la_LIBADD = \
+libchrysaplugin_la_LIBADD = \
plugins/libplugins.la
@@ -74,7 +75,7 @@ liboidaplugin_la_LIBADD = \
# Programme principal
############################################################
-openida_SOURCES = \
+chrysalide_SOURCES = \
configuration.h configuration.c \
editor.h editor.c \
main.c \
@@ -90,16 +91,15 @@ AM_CPPFLAGS =
AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-openida_LDFLAGS = $(LIBGTK_LIBS) -L/usr/X11R6/lib -ldl -lm $(LIBXML_LIBS) `pkg-config --libs gthread-2.0` $(LIBPYTHON_LIBS) \
- -L.libs -loidaglibext -loidadisass -loidagtkext \
+chrysalide_LDFLAGS = $(LIBGTK_LIBS) -L/usr/X11R6/lib -ldl -lm $(LIBXML_LIBS) `pkg-config --libs gthread-2.0` $(LIBPYTHON_LIBS) \
+ -L.libs -lchrysaglibext -lchrysadisass -lchrysagtkext -lchrysagui \
-Lcommon/.libs -lcommon \
-Lpanels/.libs -lpanels \
-Lplugins/.libs -lplugins
-openida_LDADD = $(LIBINTL) \
- dialogs/libdialogs.la \
- gui/libgui.la
+chrysalide_LDADD = $(LIBINTL) \
+ dialogs/libdialogs.la
diff --git a/src/analysis/routine.c b/src/analysis/routine.c
index b4fc51f..7151fdc 100644
--- a/src/analysis/routine.c
+++ b/src/analysis/routine.c
@@ -744,7 +744,7 @@ char *_g_binary_routine_to_string(const GBinRoutine *routine, Routine2StringOpti
{
case RTT_CONSTRUCTOR:
result = strdup(g_binary_routine_get_name(routine));
- result = stradd(result, "::");
+ result = stradd(result, "." /* FIXME */);
break;
case RTT_DESTRUCTOR:
@@ -772,7 +772,7 @@ char *_g_binary_routine_to_string(const GBinRoutine *routine, Routine2StringOpti
namespace = g_openida_type_to_string(routine->namespace);
result = stradd(result, namespace);
- result = stradd(result, "::");
+ result = stradd(result, "." /* FIXME */);
free(namespace);
diff --git a/src/analysis/type.c b/src/analysis/type.c
index be49d98..d04e7ce 100644
--- a/src/analysis/type.c
+++ b/src/analysis/type.c
@@ -388,7 +388,7 @@ char *_g_openida_type_to_string(const GOpenidaType *type, bool simple)
{
namespace = g_openida_type_to_string(type->namespace);
- result = strprep(result, "::");
+ result = strprep(result, "." /* FIXME */);
result = strprep(result, namespace);
free(namespace);
diff --git a/src/arch/instruction.c b/src/arch/instruction.c
index 2d1836b..240ffbe 100644
--- a/src/arch/instruction.c
+++ b/src/arch/instruction.c
@@ -586,6 +586,25 @@ size_t g_arch_instruction_get_destinations(const GArchInstruction *instr, GArchI
/******************************************************************************
* *
+* Paramètres : instr = instruction d'assemblage à consulter. *
+* *
+* Description : Fournit le nom humain de l'instruction manipulée. *
+* *
+* Retour : Mot clef de bas niveau. *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+const char *g_arch_instruction_get_keyword(const GArchInstruction *instr)
+{
+ return instr->get_text(instr, NULL/* FIXME */, 0/* FIXME */);
+
+}
+
+
+/******************************************************************************
+* *
* Paramètres : instr = instruction d'assemblage à représenter. *
* buffer = espace où placer ledit contenu. *
* syntax = type de représentation demandée. *
diff --git a/src/arch/instruction.h b/src/arch/instruction.h
index fd059a1..bf78bfd 100644
--- a/src/arch/instruction.h
+++ b/src/arch/instruction.h
@@ -118,6 +118,9 @@ size_t g_arch_instruction_get_destinations(const GArchInstruction *, GArchInstru
/* --------------------- CONVERSIONS DU FORMAT DES INSTRUCTIONS --------------------- */
+/* Fournit le nom humain de l'instruction manipulée. */
+const char *g_arch_instruction_get_keyword(const GArchInstruction *);
+
/* Ajoute à un tampon GLib le contenu de l'instance spécifiée. */
void g_arch_instruction_print(const GArchInstruction *, GCodeBuffer *, MemoryDataSize, const bin_t *, AsmSyntax);
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 24ba5e5..c0a03f0 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -8,8 +8,7 @@ libgui_la_SOURCES = \
libgui_la_LIBADD = \
menus/libguimenus.la \
panels/libguipanels.la \
- tb/libguitb.la \
- ../dialogs/libdialogs.la
+ tb/libguitb.la
libgui_la_LDFLAGS =
diff --git a/src/gui/menus/Makefile.am b/src/gui/menus/Makefile.am
index 0f41d14..3aebdc0 100644
--- a/src/gui/menus/Makefile.am
+++ b/src/gui/menus/Makefile.am
@@ -12,7 +12,7 @@ libguimenus_la_SOURCES = \
libguimenus_la_LDFLAGS =
-libguimenus_LIBADD = $(LIBINTL) \
+libguimenus_la_LIBADD = $(LIBINTL) \
../../dialogs/libdialogs.la
diff --git a/src/gui/panels/panel.c b/src/gui/panels/panel.c
index f70a1ab..dc6a89f 100644
--- a/src/gui/panels/panel.c
+++ b/src/gui/panels/panel.c
@@ -669,6 +669,4 @@ static void rebuild_panels_interface(const panel_node *current)
}
- //g_object_unref(G_OBJECT(widget));
-
}
generated by cgit v0.11.2-87-g4458 at 2024-12-26 15:27:29 (GMT)