summaryrefslogtreecommitdiff
path: root/src/analysis
diff options
context:
space:
mode:
Diffstat (limited to 'src/analysis')
-rwxr-xr-xsrc/analysis/Makefile.am5
-rw-r--r--src/analysis/binary.c3
-rw-r--r--src/analysis/disass/disassembler.c4
-rw-r--r--src/analysis/disass/output.c6
-rw-r--r--src/analysis/routine.c14
-rw-r--r--src/analysis/routine.h9
-rw-r--r--src/analysis/type-int.h4
-rw-r--r--src/analysis/type.c3
-rw-r--r--src/analysis/type.h3
-rw-r--r--src/analysis/types/basic.c7
-rw-r--r--src/analysis/types/cse-int.h2
-rw-r--r--src/analysis/types/cse.c5
-rw-r--r--src/analysis/types/encaps.c7
-rw-r--r--src/analysis/types/literal.c7
-rw-r--r--src/analysis/types/template.c7
-rw-r--r--src/analysis/variable.c4
-rw-r--r--src/analysis/variable.h2
17 files changed, 48 insertions, 44 deletions
diff --git a/src/analysis/Makefile.am b/src/analysis/Makefile.am
index c143e1b..8b346f9 100755
--- a/src/analysis/Makefile.am
+++ b/src/analysis/Makefile.am
@@ -19,10 +19,11 @@ libanalysis_la_LIBADD = \
contents/libanalysiscontents.la \
db/libanalysisdb.la \
db/libanalysiskeys.la \
- decomp/libanalysisdecomp.la \
disass/libanalysisdisass.la \
types/libanalysistypes.la
+# decomp/libanalysisdecomp.la
+
libanalysis_la_LDFLAGS =
@@ -30,4 +31,4 @@ AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-SUBDIRS = blocks contents db decomp disass types
+SUBDIRS = blocks contents db disass types
diff --git a/src/analysis/binary.c b/src/analysis/binary.c
index 2563355..64d8fc4 100644
--- a/src/analysis/binary.c
+++ b/src/analysis/binary.c
@@ -1656,9 +1656,10 @@ void ack_completed_disassembly(GDelayedDisassembly *disass, GLoadedBinary *binar
{
binary->dec_buffers = (GCodeBuffer **)calloc(binary->decbuf_count, sizeof(GCodeBuffer *));
+ /*
for (i = 0; i < binary->decbuf_count; i++)
binary->dec_buffers[i] = decompile_all_from_file(binary, files[i]);
-
+ */
}
diff --git a/src/analysis/disass/disassembler.c b/src/analysis/disass/disassembler.c
index 62821ab..813701e 100644
--- a/src/analysis/disass/disassembler.c
+++ b/src/analysis/disass/disassembler.c
@@ -37,7 +37,6 @@
#include "instructions.h"
#include "routines.h"
-#include "../../decomp/lang/asm.h"
#include "../../format/format.h"
#include "../../glibext/delayed-int.h"
#include "../../gui/panels/log.h"
@@ -628,6 +627,7 @@ static void g_delayed_disassembly_process(GDelayedDisassembly *disass, GtkStatus
static void build_disass_prologue(GCodeBuffer *buffer, const char *filename, const char *checksum)
{
+#if 0
GLangOutput *output; /* Modèle de sortie adéquat */
GBufferLine *line; /* Ligne de destination */
bool managed; /* Groupe déjà défini ? */
@@ -714,7 +714,7 @@ static void build_disass_prologue(GCodeBuffer *buffer, const char *filename, con
}
g_object_unref(G_OBJECT(output));
-
+#endif
}
diff --git a/src/analysis/disass/output.c b/src/analysis/disass/output.c
index be4e900..f5decb7 100644
--- a/src/analysis/disass/output.c
+++ b/src/analysis/disass/output.c
@@ -29,7 +29,6 @@
#include "../../arch/processor.h"
#include "../../common/extstr.h"
-#include "../../decomp/lang/asm.h"
#include "../../format/format.h"
#include "../../gui/panels/log.h"
@@ -60,7 +59,6 @@
void print_disassembled_instructions(GCodeBuffer *buffer, GExeFormat *format, GArchProcessor *proc, GtkStatusStack *status)
{
- GLangOutput *output; /* Modèle de sortie adéquat */
GPortionLayer *layer; /* Couche première de portions */
GBinPortion **portions; /* Morceaux d'encadrement */
size_t portions_count; /* Taille de cette liste */
@@ -102,8 +100,6 @@ void print_disassembled_instructions(GCodeBuffer *buffer, GExeFormat *format, GA
- output = g_asm_output_new();
-
layer = g_exe_format_get_main_layer(format);
portions = g_portion_layer_collect_all_portions(layer, &portions_count);
@@ -339,8 +335,6 @@ void print_disassembled_instructions(GCodeBuffer *buffer, GExeFormat *format, GA
g_object_unref(G_OBJECT(layer));
- g_object_unref(G_OBJECT(output));
-
fprintf(stderr, "MISSING :: %u symbols\n", _missing);
diff --git a/src/analysis/routine.c b/src/analysis/routine.c
index a33158d..4f18b59 100644
--- a/src/analysis/routine.c
+++ b/src/analysis/routine.c
@@ -60,7 +60,7 @@ struct _GBinRoutine
GArchInstruction *instr; /* Instructions natives */
GBlockList *blocks; /* Blocs basiques d'instruct° */
- GDecInstruction *dinstr; /* Instructions décompilées */
+ //GDecInstruction *dinstr; /* Instructions décompilées */
};
@@ -893,12 +893,13 @@ void g_binary_routine_set_basic_blocks(GBinRoutine *routine, GBlockList *blocks)
* Remarques : - *
* *
******************************************************************************/
-
+#if 0
GDecInstruction *g_binary_routine_get_decomp_instructions(const GBinRoutine *routine)
{
return routine->dinstr;
}
+#endif
/******************************************************************************
@@ -913,7 +914,7 @@ GDecInstruction *g_binary_routine_get_decomp_instructions(const GBinRoutine *rou
* Remarques : - *
* *
******************************************************************************/
-
+#if 0
void g_binary_routine_set_decomp_instructions(GBinRoutine *routine, GDecInstruction *instr)
{
if (routine->dinstr != NULL)
@@ -922,6 +923,7 @@ void g_binary_routine_set_decomp_instructions(GBinRoutine *routine, GDecInstruct
routine->dinstr = instr;
}
+#endif
/******************************************************************************
@@ -1019,7 +1021,7 @@ char *_g_binary_routine_to_string(const GBinRoutine *routine, Routine2StringOpti
* Remarques : - *
* *
******************************************************************************/
-
+#if 0
void g_binary_routine_output_info(const GBinRoutine *routine, GLangOutput *lang, GCodeBuffer *buffer)
{
GBufferLine *line; /* Adresse d'une ligne nouvelle*/
@@ -1065,6 +1067,7 @@ void g_binary_routine_output_info(const GBinRoutine *routine, GLangOutput *lang,
//g_lang_output_end_routine_prototype(lang, buffer, line);
}
+#endif
/******************************************************************************
@@ -1081,7 +1084,7 @@ void g_binary_routine_output_info(const GBinRoutine *routine, GLangOutput *lang,
* Remarques : - *
* *
******************************************************************************/
-
+#if 0
void g_binary_routine_print_code(const GBinRoutine *routine, GLangOutput *lang, GCodeBuffer *buffer, bool body)
{
GBufferLine *line; /* Adresse d'une ligne nouvelle*/
@@ -1126,3 +1129,4 @@ void g_binary_routine_print_code(const GBinRoutine *routine, GLangOutput *lang,
}
}
+#endif
diff --git a/src/analysis/routine.h b/src/analysis/routine.h
index ed24d6c..48c5361 100644
--- a/src/analysis/routine.h
+++ b/src/analysis/routine.h
@@ -33,7 +33,6 @@
#include "variable.h"
#include "disass/block.h"
//#include "../arch/instruction.h"
-#include "../decomp/instruction.h"
typedef struct _GArchInstruction GArchInstruction;
@@ -170,10 +169,10 @@ GBlockList *g_binary_routine_get_basic_blocks(const GBinRoutine *);
void g_binary_routine_set_basic_blocks(GBinRoutine *, GBlockList *);
/* Fournit les instructions décompilées correspondantes. */
-GDecInstruction *g_binary_routine_get_decomp_instructions(const GBinRoutine *);
+//GDecInstruction *g_binary_routine_get_decomp_instructions(const GBinRoutine *);
/* Définit les instructions décompilées de la routine. */
-void g_binary_routine_set_decomp_instructions(GBinRoutine *, GDecInstruction *);
+//void g_binary_routine_set_decomp_instructions(GBinRoutine *, GDecInstruction *);
/* Décrit le prototype de la routine sous forme de caractères. */
char *_g_binary_routine_to_string(const GBinRoutine *, Routine2StringOptions);
@@ -181,10 +180,10 @@ char *_g_binary_routine_to_string(const GBinRoutine *, Routine2StringOptions);
#define g_binary_routine_to_string(r) _g_binary_routine_to_string((r), RSO_ALL)
/* Procède à l'impression de la description d'une routine. */
-void g_binary_routine_output_info(const GBinRoutine *, GLangOutput *, GCodeBuffer *);
+//void g_binary_routine_output_info(const GBinRoutine *, GLangOutput *, GCodeBuffer *);
/* Procède à l'impression de la décompilation d'une routine. */
-void g_binary_routine_print_code(const GBinRoutine *, GLangOutput *, GCodeBuffer *, bool);
+//void g_binary_routine_print_code(const GBinRoutine *, GLangOutput *, GCodeBuffer *, bool);
diff --git a/src/analysis/type-int.h b/src/analysis/type-int.h
index 85b05e1..489fdaf 100644
--- a/src/analysis/type-int.h
+++ b/src/analysis/type-int.h
@@ -36,7 +36,7 @@ typedef GDataType * (* type_dup_fc) (const GDataType *);
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);
+//typedef void (* output_type_fc) (const GDataType *, GLangOutput *, GBufferLine *, bool, bool);
/* Description de type quelconque (instance) */
@@ -46,7 +46,7 @@ struct _GDataType
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 */
+ //output_type_fc output; /* Impression à l'écran */
GDataType *namespace; /* Espace de noms / classe */
TypeQualifier qualifiers; /* Eventuels qualificatifs */
diff --git a/src/analysis/type.c b/src/analysis/type.c
index 53d3636..35a3f78 100644
--- a/src/analysis/type.c
+++ b/src/analysis/type.c
@@ -220,12 +220,13 @@ char *_g_data_type_to_string(const GDataType *type, bool simple)
* Remarques : - *
* *
******************************************************************************/
-
+/*
void g_data_type_output(const GDataType *type, GLangOutput *lang, GBufferLine *line, bool info, bool full)
{
type->output(type, lang, line, info, full);
}
+*/
/******************************************************************************
diff --git a/src/analysis/type.h b/src/analysis/type.h
index f7fba36..9e11f41 100644
--- a/src/analysis/type.h
+++ b/src/analysis/type.h
@@ -31,7 +31,6 @@
#include "../arch/archbase.h"
-#include "../decomp/output.h"
#include "../glibext/gbufferline.h"
@@ -86,7 +85,7 @@ void g_data_type_add_qualifier(GDataType *, TypeQualifier);
bool g_data_type_is_pointer(const GDataType *, bool);
/* Procède à l'impression de la description d'un type. */
-void g_data_type_output(const GDataType *, GLangOutput *, GBufferLine *, bool, bool);
+//void g_data_type_output(const GDataType *, GLangOutput *, GBufferLine *, bool, bool);
diff --git a/src/analysis/types/basic.c b/src/analysis/types/basic.c
index 7278908..6a52fed 100644
--- a/src/analysis/types/basic.c
+++ b/src/analysis/types/basic.c
@@ -62,7 +62,7 @@ static GDataType *g_basic_type_dup(const GBasicType *);
static char *g_basic_type_to_string(const GBasicType *);
/* Procède à l'impression de la description d'un type. */
-static void g_basic_type_output(const GBasicType *, GLangOutput *, GBufferLine *, bool, bool);
+//static void g_basic_type_output(const GBasicType *, GLangOutput *, GBufferLine *, bool, bool);
@@ -108,7 +108,7 @@ static void g_basic_type_init(GBasicType *type)
data_type->dup = (type_dup_fc)g_basic_type_dup;
data_type->to_string = (type_to_string_fc)g_basic_type_to_string;
- data_type->output = (output_type_fc)g_basic_type_output;
+ //data_type->output = (output_type_fc)g_basic_type_output;
}
@@ -310,7 +310,7 @@ static char *g_basic_type_to_string(const GBasicType *type)
* Remarques : - *
* *
******************************************************************************/
-
+#if 0
static void g_basic_type_output(const GBasicType *type, GLangOutput *lang, GBufferLine *line, bool info, bool full)
{
char *text; /* Version humaine à imprimer */
@@ -324,6 +324,7 @@ static void g_basic_type_output(const GBasicType *type, GLangOutput *lang, GBuff
free(text);
}
+#endif
/******************************************************************************
diff --git a/src/analysis/types/cse-int.h b/src/analysis/types/cse-int.h
index 9486adc..f2c9a0b 100644
--- a/src/analysis/types/cse-int.h
+++ b/src/analysis/types/cse-int.h
@@ -52,7 +52,7 @@ struct _GClassEnumTypeClass
char *g_class_enum_type_to_string(const GClassEnumType *);
/* Procède à l'impression de la description d'un type. */
-void g_class_enum_type_output(const GClassEnumType *, GLangOutput *, GBufferLine *, bool, bool);
+//void g_class_enum_type_output(const GClassEnumType *, GLangOutput *, GBufferLine *, bool, bool);
diff --git a/src/analysis/types/cse.c b/src/analysis/types/cse.c
index bd57244..dca83ec 100644
--- a/src/analysis/types/cse.c
+++ b/src/analysis/types/cse.c
@@ -84,7 +84,7 @@ static void g_class_enum_type_init(GClassEnumType *type)
data_type->dup = (type_dup_fc)g_class_enum_type_dup;
data_type->to_string = (type_to_string_fc)g_class_enum_type_to_string;
- data_type->output = (output_type_fc)g_class_enum_type_output;
+ //data_type->output = (output_type_fc)g_class_enum_type_output;
}
@@ -169,10 +169,11 @@ char *g_class_enum_type_to_string(const GClassEnumType *type)
* Remarques : - *
* *
******************************************************************************/
-
+#if 0
void g_class_enum_type_output(const GClassEnumType *type, GLangOutput *lang, GBufferLine *line, bool info, bool full)
{
g_buffer_line_append_text(line, BLC_LAST_USED, type->name, strlen(type->name),
info ? RTT_COMMENT : RTT_RAW, NULL);
}
+#endif
diff --git a/src/analysis/types/encaps.c b/src/analysis/types/encaps.c
index 17402d5..37932f8 100644
--- a/src/analysis/types/encaps.c
+++ b/src/analysis/types/encaps.c
@@ -62,7 +62,7 @@ static GDataType *g_encapsulated_type_dup(const GEncapsulatedType *);
static char *g_encapsulated_type_to_string(const GEncapsulatedType *);
/* Procède à l'impression de la description d'un type. */
-static void g_encapsulated_type_output(const GEncapsulatedType *, GLangOutput *, GBufferLine *, bool, bool);
+//static void g_encapsulated_type_output(const GEncapsulatedType *, GLangOutput *, GBufferLine *, bool, bool);
@@ -108,7 +108,7 @@ static void g_encapsulated_type_init(GEncapsulatedType *type)
data_type->dup = (type_dup_fc)g_encapsulated_type_dup;
data_type->to_string = (type_to_string_fc)g_encapsulated_type_to_string;
- data_type->output = (output_type_fc)g_encapsulated_type_output;
+ //data_type->output = (output_type_fc)g_encapsulated_type_output;
}
@@ -273,12 +273,13 @@ static char *g_encapsulated_type_to_string(const GEncapsulatedType *type)
* Remarques : - *
* *
******************************************************************************/
-
+#if 0
static void g_encapsulated_type_output(const GEncapsulatedType *type, GLangOutput *lang, GBufferLine *line, bool info, bool full)
{
g_buffer_line_append_text(line, BLC_LAST_USED, "!TODO!", 6, info ? RTT_COMMENT : RTT_RAW, NULL);
}
+#endif
/******************************************************************************
diff --git a/src/analysis/types/literal.c b/src/analysis/types/literal.c
index d4b7edf..bf184e0 100644
--- a/src/analysis/types/literal.c
+++ b/src/analysis/types/literal.c
@@ -65,7 +65,7 @@ static GDataType *g_literal_type_dup(const GLiteralType *);
static char *g_literal_type_to_string(const GLiteralType *);
/* Procède à l'impression de la description d'un type. */
-static void g_literal_type_output(const GLiteralType *, GLangOutput *, GBufferLine *, bool, bool);
+//static void g_literal_type_output(const GLiteralType *, GLangOutput *, GBufferLine *, bool, bool);
@@ -111,7 +111,7 @@ static void g_literal_type_init(GLiteralType *type)
data_type->dup = (type_dup_fc)g_literal_type_dup;
data_type->to_string = (type_to_string_fc)g_literal_type_to_string;
- data_type->output = (output_type_fc)g_literal_type_output;
+ //data_type->output = (output_type_fc)g_literal_type_output;
}
@@ -225,7 +225,7 @@ static char *g_literal_type_to_string(const GLiteralType *type)
* Remarques : - *
* *
******************************************************************************/
-
+#if 0
static void g_literal_type_output(const GLiteralType *type, GLangOutput *lang, GBufferLine *line, bool info, bool full)
{
char *text; /* Version humaine à imprimer */
@@ -239,3 +239,4 @@ static void g_literal_type_output(const GLiteralType *type, GLangOutput *lang, G
free(text);
}
+#endif
diff --git a/src/analysis/types/template.c b/src/analysis/types/template.c
index 42a9ebe..f24eaaa 100644
--- a/src/analysis/types/template.c
+++ b/src/analysis/types/template.c
@@ -65,7 +65,7 @@ static GDataType *g_template_type_dup(const GTemplateType *);
static char *g_template_type_to_string(const GTemplateType *);
/* Procède à l'impression de la description d'un type. */
-static void g_template_type_output(const GTemplateType *, GLangOutput *, GBufferLine *, bool, bool);
+//static void g_template_type_output(const GTemplateType *, GLangOutput *, GBufferLine *, bool, bool);
@@ -112,7 +112,7 @@ static void g_template_type_init(GTemplateType *type)
data_type->dup = (type_dup_fc)g_template_type_dup;
data_type->to_string = (type_to_string_fc)g_template_type_to_string;
- data_type->output = (output_type_fc)g_template_type_output;
+ //data_type->output = (output_type_fc)g_template_type_output;
ce_type = G_CLASS_ENUM_TYPE(type);
@@ -233,7 +233,7 @@ static char *g_template_type_to_string(const GTemplateType *type)
* Remarques : - *
* *
******************************************************************************/
-
+#if 0
static void g_template_type_output(const GTemplateType *type, GLangOutput *lang, GBufferLine *line, bool info, bool full)
{
size_t i; /* Boucle de parcours */
@@ -254,6 +254,7 @@ static void g_template_type_output(const GTemplateType *type, GLangOutput *lang,
g_buffer_line_append_text(line, BLC_LAST_USED, ">", 1, info ? RTT_COMMENT : RTT_LTGT, NULL);
}
+#endif
/******************************************************************************
diff --git a/src/analysis/variable.c b/src/analysis/variable.c
index b390658..02596f6 100644
--- a/src/analysis/variable.c
+++ b/src/analysis/variable.c
@@ -287,7 +287,7 @@ char *g_binary_variable_to_string(const GBinVariable *var, bool simple)
* Remarques : - *
* *
******************************************************************************/
-
+#if 0
void g_binary_variable_output(const GBinVariable *var, GLangOutput *lang, GBufferLine *line, bool info, bool full)
{
g_data_type_output(var->type, lang, line, info, full);
@@ -302,7 +302,7 @@ void g_binary_variable_output(const GBinVariable *var, GLangOutput *lang, GBuffe
}
}
-
+#endif
diff --git a/src/analysis/variable.h b/src/analysis/variable.h
index 162c0e6..00c5e3a 100644
--- a/src/analysis/variable.h
+++ b/src/analysis/variable.h
@@ -77,7 +77,7 @@ void g_binary_variable_set_owner(GBinVariable *, GDataType *);
char *g_binary_variable_to_string(const GBinVariable *, bool);
/* Procède à l'impression de la description d'une variable. */
-void g_binary_variable_output(const GBinVariable *, GLangOutput *, GBufferLine *, bool, bool);
+//void g_binary_variable_output(const GBinVariable *, GLangOutput *, GBufferLine *, bool, bool);
generated by cgit v0.11.2-87-g4458 at 2024-04-28 07:58:37 (GMT)