summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorCyrille Bagard <nocbos@gmail.com>2018-07-19 20:00:40 (GMT)
committerCyrille Bagard <nocbos@gmail.com>2018-07-19 20:00:40 (GMT)
commit12abead3f60d6f72c0d41672af87215dfc13c8fc (patch)
tree3fda90b6e1b439644a39730ae8935c74da1f2d44 /plugins
parent79ae70be75b534c18fbfce38294f5ba7feef0e11 (diff)
Deleted all references to any asm syntax.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/arm/v7/instruction.c7
-rw-r--r--plugins/arm/v7/operands/estate.c5
-rw-r--r--plugins/arm/v7/operands/iflags.c5
-rw-r--r--plugins/arm/v7/operands/it.c5
-rw-r--r--plugins/arm/v7/operands/limitation.c5
-rw-r--r--plugins/arm/v7/operands/maccess.c11
-rw-r--r--plugins/arm/v7/operands/offset.c7
-rw-r--r--plugins/arm/v7/operands/register.c7
-rw-r--r--plugins/arm/v7/operands/reglist.c7
-rw-r--r--plugins/arm/v7/operands/rotation.c7
-rw-r--r--plugins/arm/v7/operands/shift.c7
-rw-r--r--plugins/arm/v7/registers/banked.c9
-rw-r--r--plugins/arm/v7/registers/basic.c9
-rw-r--r--plugins/arm/v7/registers/coproc.c9
-rw-r--r--plugins/arm/v7/registers/simd.c9
-rw-r--r--plugins/arm/v7/registers/special.c9
-rw-r--r--plugins/dalvik/context.h3
-rw-r--r--plugins/dalvik/operands/args.c9
-rw-r--r--plugins/dalvik/operands/pool.c5
-rw-r--r--plugins/dalvik/pseudo/fill.c7
-rw-r--r--plugins/dalvik/pseudo/switch.c7
-rw-r--r--plugins/dalvik/register.c25
-rw-r--r--plugins/dalvik/v35/instruction.c7
-rw-r--r--plugins/fmtp/def.h1
-rw-r--r--plugins/lnxsyscalls/hops_armv7.c4
-rw-r--r--plugins/pychrysalide/arch/immediate.c18
-rw-r--r--plugins/pychrysalide/arch/instruction.c2
-rw-r--r--plugins/pychrysalide/arch/module.c4
-rw-r--r--plugins/stackvars/operand.c3
29 files changed, 77 insertions, 136 deletions
diff --git a/plugins/arm/v7/instruction.c b/plugins/arm/v7/instruction.c
index ee75efd..97adddd 100644
--- a/plugins/arm/v7/instruction.c
+++ b/plugins/arm/v7/instruction.c
@@ -76,7 +76,7 @@ static void g_armv7_instruction_finalize(GArmV7Instruction *);
static const char *g_armv7_instruction_get_encoding(const GArmV7Instruction *);
/* Fournit le nom humain de l'instruction manipulée. */
-static const char *g_armv7_instruction_get_keyword(const GArmV7Instruction *, AsmSyntax);
+static const char *g_armv7_instruction_get_keyword(const GArmV7Instruction *);
/* Complète un désassemblage accompli pour une instruction. */
static void g_armv7_instruction_call_hook(GArmV7Instruction *, InstrProcessHook, GArchProcessor *, GProcContext *, GExeFormat *);
@@ -281,8 +281,7 @@ void g_armv7_instruction_set_encoding(GArmV7Instruction *instr, const char *enco
/******************************************************************************
* *
-* Paramètres : instr = instruction d'assemblage à consulter. *
-* syntax = type de représentation demandée. *
+* Paramètres : instr = instruction d'assemblage à consulter. *
* *
* Description : Fournit le nom humain de l'instruction manipulée. *
* *
@@ -292,7 +291,7 @@ void g_armv7_instruction_set_encoding(GArmV7Instruction *instr, const char *enco
* *
******************************************************************************/
-static const char *g_armv7_instruction_get_keyword(const GArmV7Instruction *instr, AsmSyntax syntax)
+static const char *g_armv7_instruction_get_keyword(const GArmV7Instruction *instr)
{
const char *result; /* Désignation à retourner */
GArmInstruction *parent; /* Autre forme de l'instance */
diff --git a/plugins/arm/v7/operands/estate.c b/plugins/arm/v7/operands/estate.c
index 8460375..281f02b 100644
--- a/plugins/arm/v7/operands/estate.c
+++ b/plugins/arm/v7/operands/estate.c
@@ -63,7 +63,7 @@ static void g_armv7_endian_operand_finalize(GArmV7EndianOperand *);
static int g_armv7_endian_operand_compare(const GArmV7EndianOperand *, const GArmV7EndianOperand *);
/* Traduit un opérande en version humainement lisible. */
-static void g_armv7_endian_operand_print(const GArmV7EndianOperand *, GBufferLine *, AsmSyntax);
+static void g_armv7_endian_operand_print(const GArmV7EndianOperand *, GBufferLine *);
@@ -198,7 +198,6 @@ static int g_armv7_endian_operand_compare(const GArmV7EndianOperand *a, const GA
* *
* Paramètres : operand = opérande à traiter. *
* line = ligne tampon où imprimer l'opérande donné. *
-* syntax = type de représentation demandée. *
* *
* Description : Traduit un opérande en version humainement lisible. *
* *
@@ -208,7 +207,7 @@ static int g_armv7_endian_operand_compare(const GArmV7EndianOperand *a, const GA
* *
******************************************************************************/
-static void g_armv7_endian_operand_print(const GArmV7EndianOperand *operand, GBufferLine *line, AsmSyntax syntax)
+static void g_armv7_endian_operand_print(const GArmV7EndianOperand *operand, GBufferLine *line)
{
if (operand->big)
g_buffer_line_append_text(line, BLC_ASSEMBLY, "BE", 2, RTT_KEY_WORD, NULL);
diff --git a/plugins/arm/v7/operands/iflags.c b/plugins/arm/v7/operands/iflags.c
index e7b1b41..5c3e9ca 100644
--- a/plugins/arm/v7/operands/iflags.c
+++ b/plugins/arm/v7/operands/iflags.c
@@ -61,7 +61,7 @@ static void g_armv7_iflags_operand_dispose(GArmV7IFlagsOperand *);
static void g_armv7_iflags_operand_finalize(GArmV7IFlagsOperand *);
/* Traduit un opérande en version humainement lisible. */
-static void g_armv7_iflags_operand_print(const GArmV7IFlagsOperand *, GBufferLine *, AsmSyntax);
+static void g_armv7_iflags_operand_print(const GArmV7IFlagsOperand *, GBufferLine *);
@@ -175,7 +175,6 @@ static void g_armv7_iflags_operand_finalize(GArmV7IFlagsOperand *operand)
* *
* Paramètres : operand = opérande à traiter. *
* line = ligne tampon où imprimer l'opérande donné. *
-* syntax = type de représentation demandée. *
* *
* Description : Traduit un opérande en version humainement lisible. *
* *
@@ -185,7 +184,7 @@ static void g_armv7_iflags_operand_finalize(GArmV7IFlagsOperand *operand)
* *
******************************************************************************/
-static void g_armv7_iflags_operand_print(const GArmV7IFlagsOperand *operand, GBufferLine *line, AsmSyntax syntax)
+static void g_armv7_iflags_operand_print(const GArmV7IFlagsOperand *operand, GBufferLine *line)
{
if (operand->abort_bit)
g_buffer_line_append_text(line, BLC_ASSEMBLY, "A", 1, RTT_REGISTER, NULL);
diff --git a/plugins/arm/v7/operands/it.c b/plugins/arm/v7/operands/it.c
index f8232d1..52ae3c9 100644
--- a/plugins/arm/v7/operands/it.c
+++ b/plugins/arm/v7/operands/it.c
@@ -67,7 +67,7 @@ static void g_armv7_itcond_operand_finalize(GArmV7ITCondOperand *);
static int g_armv7_itcond_operand_compare(const GArmV7ITCondOperand *, const GArmV7ITCondOperand *);
/* Traduit un opérande en version humainement lisible. */
-static void g_armv7_itcond_operand_print(const GArmV7ITCondOperand *, GBufferLine *, AsmSyntax);
+static void g_armv7_itcond_operand_print(const GArmV7ITCondOperand *, GBufferLine *);
@@ -205,7 +205,6 @@ static int g_armv7_itcond_operand_compare(const GArmV7ITCondOperand *a, const GA
* *
* Paramètres : operand = opérande à traiter. *
* line = ligne tampon où imprimer l'opérande donné. *
-* syntax = type de représentation demandée. *
* *
* Description : Traduit un opérande en version humainement lisible. *
* *
@@ -215,7 +214,7 @@ static int g_armv7_itcond_operand_compare(const GArmV7ITCondOperand *a, const GA
* *
******************************************************************************/
-static void g_armv7_itcond_operand_print(const GArmV7ITCondOperand *operand, GBufferLine *line, AsmSyntax syntax)
+static void g_armv7_itcond_operand_print(const GArmV7ITCondOperand *operand, GBufferLine *line)
{
const char *kw; /* Mot clef à imprimer */
diff --git a/plugins/arm/v7/operands/limitation.c b/plugins/arm/v7/operands/limitation.c
index 6ed32fb..a89cbff 100644
--- a/plugins/arm/v7/operands/limitation.c
+++ b/plugins/arm/v7/operands/limitation.c
@@ -63,7 +63,7 @@ static void g_armv7_limitation_operand_finalize(GArmV7LimitationOperand *);
static int g_armv7_limitation_operand_compare(const GArmV7LimitationOperand *, const GArmV7LimitationOperand *);
/* Traduit un opérande en version humainement lisible. */
-static void g_armv7_limitation_operand_print(const GArmV7LimitationOperand *, GBufferLine *, AsmSyntax);
+static void g_armv7_limitation_operand_print(const GArmV7LimitationOperand *, GBufferLine *);
@@ -198,7 +198,6 @@ static int g_armv7_limitation_operand_compare(const GArmV7LimitationOperand *a,
* *
* Paramètres : operand = opérande à traiter. *
* line = ligne tampon où imprimer l'opérande donné. *
-* syntax = type de représentation demandée. *
* *
* Description : Traduit un opérande en version humainement lisible. *
* *
@@ -208,7 +207,7 @@ static int g_armv7_limitation_operand_compare(const GArmV7LimitationOperand *a,
* *
******************************************************************************/
-static void g_armv7_limitation_operand_print(const GArmV7LimitationOperand *operand, GBufferLine *line, AsmSyntax syntax)
+static void g_armv7_limitation_operand_print(const GArmV7LimitationOperand *operand, GBufferLine *line)
{
switch (operand->type)
{
diff --git a/plugins/arm/v7/operands/maccess.c b/plugins/arm/v7/operands/maccess.c
index f5307f7..392bae0 100644
--- a/plugins/arm/v7/operands/maccess.c
+++ b/plugins/arm/v7/operands/maccess.c
@@ -67,7 +67,7 @@ static void g_armv7_maccess_operand_finalize(GArmV7MAccessOperand *);
static int g_armv7_maccess_operand_compare(const GArmV7MAccessOperand *, const GArmV7MAccessOperand *);
/* Traduit un opérande en version humainement lisible. */
-static void g_armv7_maccess_operand_print(const GArmV7MAccessOperand *, GBufferLine *, AsmSyntax);
+static void g_armv7_maccess_operand_print(const GArmV7MAccessOperand *, GBufferLine *);
@@ -228,7 +228,6 @@ static int g_armv7_maccess_operand_compare(const GArmV7MAccessOperand *a, const
* *
* Paramètres : operand = opérande à traiter. *
* line = ligne tampon où imprimer l'opérande donné. *
-* syntax = type de représentation demandée. *
* *
* Description : Traduit un opérande en version humainement lisible. *
* *
@@ -238,11 +237,11 @@ static int g_armv7_maccess_operand_compare(const GArmV7MAccessOperand *a, const
* *
******************************************************************************/
-static void g_armv7_maccess_operand_print(const GArmV7MAccessOperand *operand, GBufferLine *line, AsmSyntax syntax)
+static void g_armv7_maccess_operand_print(const GArmV7MAccessOperand *operand, GBufferLine *line)
{
g_buffer_line_append_text(line, BLC_ASSEMBLY, "[", 1, RTT_HOOK, NULL);
- g_arch_operand_print(operand->base, line, syntax);
+ g_arch_operand_print(operand->base, line);
if (operand->post_indexed)
g_buffer_line_append_text(line, BLC_ASSEMBLY, "]", 1, RTT_HOOK, NULL);
@@ -252,7 +251,7 @@ static void g_armv7_maccess_operand_print(const GArmV7MAccessOperand *operand, G
g_buffer_line_append_text(line, BLC_ASSEMBLY, ",", 1, RTT_PUNCT, NULL);
g_buffer_line_append_text(line, BLC_ASSEMBLY, " ", 1, RTT_RAW, NULL);
- g_arch_operand_print(operand->offset, line, syntax);
+ g_arch_operand_print(operand->offset, line);
}
@@ -261,7 +260,7 @@ static void g_armv7_maccess_operand_print(const GArmV7MAccessOperand *operand, G
g_buffer_line_append_text(line, BLC_ASSEMBLY, ",", 1, RTT_PUNCT, NULL);
g_buffer_line_append_text(line, BLC_ASSEMBLY, " ", 1, RTT_RAW, NULL);
- g_arch_operand_print(operand->shift, line, syntax);
+ g_arch_operand_print(operand->shift, line);
}
diff --git a/plugins/arm/v7/operands/offset.c b/plugins/arm/v7/operands/offset.c
index ffa3fac..c78b3f1 100644
--- a/plugins/arm/v7/operands/offset.c
+++ b/plugins/arm/v7/operands/offset.c
@@ -64,7 +64,7 @@ static void g_armv7_offset_operand_finalize(GArmV7OffsetOperand *);
static int g_armv7_offset_operand_compare(const GArmV7OffsetOperand *, const GArmV7OffsetOperand *);
/* Traduit un opérande en version humainement lisible. */
-static void g_armv7_offset_operand_print(const GArmV7OffsetOperand *, GBufferLine *, AsmSyntax);
+static void g_armv7_offset_operand_print(const GArmV7OffsetOperand *, GBufferLine *);
@@ -208,7 +208,6 @@ static int g_armv7_offset_operand_compare(const GArmV7OffsetOperand *a, const GA
* *
* Paramètres : operand = opérande à traiter. *
* line = ligne tampon où imprimer l'opérande donné. *
-* syntax = type de représentation demandée. *
* *
* Description : Traduit un opérande en version humainement lisible. *
* *
@@ -218,12 +217,12 @@ static int g_armv7_offset_operand_compare(const GArmV7OffsetOperand *a, const GA
* *
******************************************************************************/
-static void g_armv7_offset_operand_print(const GArmV7OffsetOperand *operand, GBufferLine *line, AsmSyntax syntax)
+static void g_armv7_offset_operand_print(const GArmV7OffsetOperand *operand, GBufferLine *line)
{
if (!operand->positive)
g_buffer_line_append_text(line, BLC_ASSEMBLY, "-", 1, RTT_KEY_WORD, NULL);
- g_arch_operand_print(operand->value, line, syntax);
+ g_arch_operand_print(operand->value, line);
}
diff --git a/plugins/arm/v7/operands/register.c b/plugins/arm/v7/operands/register.c
index 80a3769..3699197 100644
--- a/plugins/arm/v7/operands/register.c
+++ b/plugins/arm/v7/operands/register.c
@@ -62,7 +62,7 @@ static void g_armv7_register_operand_dispose(GArmV7RegisterOperand *);
static void g_armv7_register_operand_finalize(GArmV7RegisterOperand *);
/* Traduit un opérande en version humainement lisible. */
-static void g_armv7_register_operand_print(const GArmV7RegisterOperand *, GBufferLine *, AsmSyntax);
+static void g_armv7_register_operand_print(const GArmV7RegisterOperand *, GBufferLine *);
@@ -174,7 +174,6 @@ static void g_armv7_register_operand_finalize(GArmV7RegisterOperand *operand)
* *
* Paramètres : operand = opérande à traiter. *
* line = ligne tampon où imprimer l'opérande donné. *
-* syntax = type de représentation demandée. *
* *
* Description : Traduit un opérande en version humainement lisible. *
* *
@@ -184,13 +183,13 @@ static void g_armv7_register_operand_finalize(GArmV7RegisterOperand *operand)
* *
******************************************************************************/
-static void g_armv7_register_operand_print(const GArmV7RegisterOperand *operand, GBufferLine *line, AsmSyntax syntax)
+static void g_armv7_register_operand_print(const GArmV7RegisterOperand *operand, GBufferLine *line)
{
GArchOperandClass *parent; /* Classe parente */
parent = G_ARCH_OPERAND_CLASS(g_armv7_register_operand_parent_class);
- parent->print(G_ARCH_OPERAND(operand), line, syntax);
+ parent->print(G_ARCH_OPERAND(operand), line);
if (operand->write_back)
g_buffer_line_append_text(line, BLC_ASSEMBLY, "!", 1, RTT_PUNCT, NULL);
diff --git a/plugins/arm/v7/operands/reglist.c b/plugins/arm/v7/operands/reglist.c
index 53b24a4..9b6aaa7 100644
--- a/plugins/arm/v7/operands/reglist.c
+++ b/plugins/arm/v7/operands/reglist.c
@@ -73,7 +73,7 @@ static void g_armv7_reglist_operand_finalize(GArmV7RegListOperand *);
static int g_armv7_reglist_operand_compare(const GArmV7RegListOperand *, const GArmV7RegListOperand *);
/* Traduit un opérande en version humainement lisible. */
-static void g_armv7_reglist_operand_print(const GArmV7RegListOperand *, GBufferLine *, AsmSyntax);
+static void g_armv7_reglist_operand_print(const GArmV7RegListOperand *, GBufferLine *);
@@ -240,7 +240,6 @@ static int g_armv7_reglist_operand_compare(const GArmV7RegListOperand *a, const
* *
* Paramètres : operand = opérande à traiter. *
* line = ligne tampon où imprimer l'opérande donné. *
-* syntax = type de représentation demandée. *
* *
* Description : Traduit un opérande en version humainement lisible. *
* *
@@ -250,7 +249,7 @@ static int g_armv7_reglist_operand_compare(const GArmV7RegListOperand *a, const
* *
******************************************************************************/
-static void g_armv7_reglist_operand_print(const GArmV7RegListOperand *operand, GBufferLine *line, AsmSyntax syntax)
+static void g_armv7_reglist_operand_print(const GArmV7RegListOperand *operand, GBufferLine *line)
{
size_t i; /* Boucle de parcours */
@@ -264,7 +263,7 @@ static void g_armv7_reglist_operand_print(const GArmV7RegListOperand *operand, G
g_buffer_line_append_text(line, BLC_ASSEMBLY, " ", 1, RTT_RAW, NULL);
}
- g_arch_register_print(G_ARCH_REGISTER(operand->registers[i]), line, syntax);
+ g_arch_register_print(G_ARCH_REGISTER(operand->registers[i]), line);
}
diff --git a/plugins/arm/v7/operands/rotation.c b/plugins/arm/v7/operands/rotation.c
index c091044..fcde0d9 100644
--- a/plugins/arm/v7/operands/rotation.c
+++ b/plugins/arm/v7/operands/rotation.c
@@ -62,7 +62,7 @@ static void g_armv7_rotation_operand_finalize(GArmV7RotationOperand *);
static int g_armv7_rotation_operand_compare(const GArmV7RotationOperand *, const GArmV7RotationOperand *);
/* Traduit un opérande en version humainement lisible. */
-static void g_armv7_rotation_operand_print(const GArmV7RotationOperand *, GBufferLine *, AsmSyntax);
+static void g_armv7_rotation_operand_print(const GArmV7RotationOperand *, GBufferLine *);
@@ -201,7 +201,6 @@ static int g_armv7_rotation_operand_compare(const GArmV7RotationOperand *a, cons
* *
* Paramètres : operand = opérande à traiter. *
* line = ligne tampon où imprimer l'opérande donné. *
-* syntax = type de représentation demandée. *
* *
* Description : Traduit un opérande en version humainement lisible. *
* *
@@ -211,13 +210,13 @@ static int g_armv7_rotation_operand_compare(const GArmV7RotationOperand *a, cons
* *
******************************************************************************/
-static void g_armv7_rotation_operand_print(const GArmV7RotationOperand *operand, GBufferLine *line, AsmSyntax syntax)
+static void g_armv7_rotation_operand_print(const GArmV7RotationOperand *operand, GBufferLine *line)
{
g_buffer_line_append_text(line, BLC_ASSEMBLY, "ror", 3, RTT_KEY_WORD, NULL);
g_buffer_line_append_text(line, BLC_ASSEMBLY, " ", 1, RTT_RAW, NULL);
- g_arch_operand_print(operand->value, line, syntax);
+ g_arch_operand_print(operand->value, line);
}
diff --git a/plugins/arm/v7/operands/shift.c b/plugins/arm/v7/operands/shift.c
index e0637ee..b13b361 100644
--- a/plugins/arm/v7/operands/shift.c
+++ b/plugins/arm/v7/operands/shift.c
@@ -64,7 +64,7 @@ static void g_armv7_shift_operand_finalize(GArmV7ShiftOperand *);
static int g_armv7_shift_operand_compare(const GArmV7ShiftOperand *, const GArmV7ShiftOperand *);
/* Traduit un opérande en version humainement lisible. */
-static void g_armv7_shift_operand_print(const GArmV7ShiftOperand *, GBufferLine *, AsmSyntax);
+static void g_armv7_shift_operand_print(const GArmV7ShiftOperand *, GBufferLine *);
@@ -208,7 +208,6 @@ static int g_armv7_shift_operand_compare(const GArmV7ShiftOperand *a, const GArm
* *
* Paramètres : operand = opérande à traiter. *
* line = ligne tampon où imprimer l'opérande donné. *
-* syntax = type de représentation demandée. *
* *
* Description : Traduit un opérande en version humainement lisible. *
* *
@@ -218,7 +217,7 @@ static int g_armv7_shift_operand_compare(const GArmV7ShiftOperand *a, const GArm
* *
******************************************************************************/
-static void g_armv7_shift_operand_print(const GArmV7ShiftOperand *operand, GBufferLine *line, AsmSyntax syntax)
+static void g_armv7_shift_operand_print(const GArmV7ShiftOperand *operand, GBufferLine *line)
{
switch (operand->shift_type)
{
@@ -241,7 +240,7 @@ static void g_armv7_shift_operand_print(const GArmV7ShiftOperand *operand, GBuff
g_buffer_line_append_text(line, BLC_ASSEMBLY, " ", 1, RTT_RAW, NULL);
- g_arch_operand_print(operand->shift_value, line, syntax);
+ g_arch_operand_print(operand->shift_value, line);
}
diff --git a/plugins/arm/v7/registers/banked.c b/plugins/arm/v7/registers/banked.c
index 72274a6..c141d74 100644
--- a/plugins/arm/v7/registers/banked.c
+++ b/plugins/arm/v7/registers/banked.c
@@ -65,7 +65,7 @@ static void g_armv7_banked_register_dispose(GArmV7BankedRegister *);
static void g_armv7_banked_register_finalize(GArmV7BankedRegister *);
/* Traduit un registre en version humainement lisible. */
-static void g_armv7_banked_register_print(const GArmV7BankedRegister *, GBufferLine *, AsmSyntax);
+static void g_armv7_banked_register_print(const GArmV7BankedRegister *, GBufferLine *);
/* Convertit en indice des paramètres d'encodage. */
static BankedRegisterTarget convert_r_sysm_to_target(uint8_t, uint8_t);
@@ -193,9 +193,8 @@ static void g_armv7_banked_register_finalize(GArmV7BankedRegister *reg)
/******************************************************************************
* *
-* Paramètres : reg = registre à transcrire. *
-* line = ligne tampon où imprimer l'opérande donné. *
-* syntax = type de représentation demandée. *
+* Paramètres : reg = registre à transcrire. *
+* line = ligne tampon où imprimer l'opérande donné. *
* *
* Description : Traduit un registre en version humainement lisible. *
* *
@@ -205,7 +204,7 @@ static void g_armv7_banked_register_finalize(GArmV7BankedRegister *reg)
* *
******************************************************************************/
-static void g_armv7_banked_register_print(const GArmV7BankedRegister *reg, GBufferLine *line, AsmSyntax syntax)
+static void g_armv7_banked_register_print(const GArmV7BankedRegister *reg, GBufferLine *line)
{
BankedRegisterTarget target; /* Registre ciblé */
char key[MAX_REGNAME_LEN]; /* Mot clef principal */
diff --git a/plugins/arm/v7/registers/basic.c b/plugins/arm/v7/registers/basic.c
index 7194c7f..526e864 100644
--- a/plugins/arm/v7/registers/basic.c
+++ b/plugins/arm/v7/registers/basic.c
@@ -65,7 +65,7 @@ static void g_armv7_basic_register_dispose(GArmV7BasicRegister *);
static void g_armv7_basic_register_finalize(GArmV7BasicRegister *);
/* Traduit un registre en version humainement lisible. */
-static void g_armv7_basic_register_print(const GArmV7BasicRegister *, GBufferLine *, AsmSyntax);
+static void g_armv7_basic_register_print(const GArmV7BasicRegister *, GBufferLine *);
/* Crée une réprésentation de registre de base ARMv7. */
static GArchRegister *_g_armv7_basic_register_new(uint8_t);
@@ -190,9 +190,8 @@ static void g_armv7_basic_register_finalize(GArmV7BasicRegister *reg)
/******************************************************************************
* *
-* Paramètres : reg = registre à transcrire. *
-* line = ligne tampon où imprimer l'opérande donné. *
-* syntax = type de représentation demandée. *
+* Paramètres : reg = registre à transcrire. *
+* line = ligne tampon où imprimer l'opérande donné. *
* *
* Description : Traduit un registre en version humainement lisible. *
* *
@@ -202,7 +201,7 @@ static void g_armv7_basic_register_finalize(GArmV7BasicRegister *reg)
* *
******************************************************************************/
-static void g_armv7_basic_register_print(const GArmV7BasicRegister *reg, GBufferLine *line, AsmSyntax syntax)
+static void g_armv7_basic_register_print(const GArmV7BasicRegister *reg, GBufferLine *line)
{
char key[MAX_REGNAME_LEN]; /* Mot clef principal */
size_t klen; /* Taille de ce mot clef */
diff --git a/plugins/arm/v7/registers/coproc.c b/plugins/arm/v7/registers/coproc.c
index f13a7aa..8200343 100644
--- a/plugins/arm/v7/registers/coproc.c
+++ b/plugins/arm/v7/registers/coproc.c
@@ -66,7 +66,7 @@ static void g_armv7_cp_register_dispose(GArmV7CpRegister *);
static void g_armv7_cp_register_finalize(GArmV7CpRegister *);
/* Traduit un registre en version humainement lisible. */
-static void g_armv7_cp_register_print(const GArmV7CpRegister *, GBufferLine *, AsmSyntax);
+static void g_armv7_cp_register_print(const GArmV7CpRegister *, GBufferLine *);
/* Crée une réprésentation de registre de co-processeur ARMv7. */
static GArchRegister *_g_armv7_cp_register_new(uint8_t);
@@ -191,9 +191,8 @@ static void g_armv7_cp_register_finalize(GArmV7CpRegister *reg)
/******************************************************************************
* *
-* Paramètres : reg = registre à transcrire. *
-* line = ligne tampon où imprimer l'opérande donné. *
-* syntax = type de représentation demandée. *
+* Paramètres : reg = registre à transcrire. *
+* line = ligne tampon où imprimer l'opérande donné. *
* *
* Description : Traduit un registre en version humainement lisible. *
* *
@@ -203,7 +202,7 @@ static void g_armv7_cp_register_finalize(GArmV7CpRegister *reg)
* *
******************************************************************************/
-static void g_armv7_cp_register_print(const GArmV7CpRegister *reg, GBufferLine *line, AsmSyntax syntax)
+static void g_armv7_cp_register_print(const GArmV7CpRegister *reg, GBufferLine *line)
{
char key[MAX_REGNAME_LEN]; /* Mot clef principal */
size_t klen; /* Taille de ce mot clef */
diff --git a/plugins/arm/v7/registers/simd.c b/plugins/arm/v7/registers/simd.c
index d762d90..ad84ede 100644
--- a/plugins/arm/v7/registers/simd.c
+++ b/plugins/arm/v7/registers/simd.c
@@ -68,7 +68,7 @@ static void g_armv7_simd_register_dispose(GArmV7SIMDRegister *);
static void g_armv7_simd_register_finalize(GArmV7SIMDRegister *);
/* Traduit un registre en version humainement lisible. */
-static void g_armv7_simd_register_print(const GArmV7SIMDRegister *, GBufferLine *, AsmSyntax);
+static void g_armv7_simd_register_print(const GArmV7SIMDRegister *, GBufferLine *);
/* Crée une réprésentation de registre SIMD ARMv7. */
static GArchRegister *_g_armv7_simd_register_new(SIMDRegisterMapping, uint8_t);
@@ -199,9 +199,8 @@ static void g_armv7_simd_register_finalize(GArmV7SIMDRegister *reg)
/******************************************************************************
* *
-* Paramètres : reg = registre à transcrire. *
-* line = ligne tampon où imprimer l'opérande donné. *
-* syntax = type de représentation demandée. *
+* Paramètres : reg = registre à transcrire. *
+* line = ligne tampon où imprimer l'opérande donné. *
* *
* Description : Traduit un registre en version humainement lisible. *
* *
@@ -211,7 +210,7 @@ static void g_armv7_simd_register_finalize(GArmV7SIMDRegister *reg)
* *
******************************************************************************/
-static void g_armv7_simd_register_print(const GArmV7SIMDRegister *reg, GBufferLine *line, AsmSyntax syntax)
+static void g_armv7_simd_register_print(const GArmV7SIMDRegister *reg, GBufferLine *line)
{
char key[MAX_REGNAME_LEN]; /* Mot clef principal */
size_t klen; /* Taille de ce mot clef */
diff --git a/plugins/arm/v7/registers/special.c b/plugins/arm/v7/registers/special.c
index 8f80c71..156b9bf 100644
--- a/plugins/arm/v7/registers/special.c
+++ b/plugins/arm/v7/registers/special.c
@@ -65,7 +65,7 @@ static void g_armv7_special_register_dispose(GArmV7SpecialRegister *);
static void g_armv7_special_register_finalize(GArmV7SpecialRegister *);
/* Traduit un registre en version humainement lisible. */
-static void g_armv7_special_register_print(const GArmV7SpecialRegister *, GBufferLine *, AsmSyntax);
+static void g_armv7_special_register_print(const GArmV7SpecialRegister *, GBufferLine *);
/* Crée une réprésentation de registre spécial ARMv7. */
static GArchRegister *_g_armv7_special_register_new(SpecRegTarget);
@@ -190,9 +190,8 @@ static void g_armv7_special_register_finalize(GArmV7SpecialRegister *reg)
/******************************************************************************
* *
-* Paramètres : reg = registre à transcrire. *
-* line = ligne tampon où imprimer l'opérande donné. *
-* syntax = type de représentation demandée. *
+* Paramètres : reg = registre à transcrire. *
+* line = ligne tampon où imprimer l'opérande donné. *
* *
* Description : Traduit un registre en version humainement lisible. *
* *
@@ -202,7 +201,7 @@ static void g_armv7_special_register_finalize(GArmV7SpecialRegister *reg)
* *
******************************************************************************/
-static void g_armv7_special_register_print(const GArmV7SpecialRegister *reg, GBufferLine *line, AsmSyntax syntax)
+static void g_armv7_special_register_print(const GArmV7SpecialRegister *reg, GBufferLine *line)
{
SpecRegTarget target; /* Registre ciblé */
char key[MAX_REGNAME_LEN]; /* Mot clef principal */
diff --git a/plugins/dalvik/context.h b/plugins/dalvik/context.h
index 85924c2..dbcc979 100644
--- a/plugins/dalvik/context.h
+++ b/plugins/dalvik/context.h
@@ -29,9 +29,6 @@
#include <stdbool.h>
-#include <arch/archbase.h>
-
-
#include "instruction.h"
diff --git a/plugins/dalvik/operands/args.c b/plugins/dalvik/operands/args.c
index 5224567..b131a33 100644
--- a/plugins/dalvik/operands/args.c
+++ b/plugins/dalvik/operands/args.c
@@ -68,7 +68,7 @@ static void g_dalvik_args_operand_finalize(GDalvikArgsOperand *);
static int g_dalvik_args_operand_compare(const GDalvikArgsOperand *, const GDalvikArgsOperand *);
/* Traduit un opérande en version humainement lisible. */
-static void g_dalvik_args_operand_print(const GDalvikArgsOperand *, GBufferLine *, AsmSyntax);
+static void g_dalvik_args_operand_print(const GDalvikArgsOperand *, GBufferLine *);
@@ -225,7 +225,6 @@ static int g_dalvik_args_operand_compare(const GDalvikArgsOperand *a, const GDal
* *
* Paramètres : operand = opérande à traiter. *
* line = ligne tampon où imprimer l'opérande donné. *
-* syntax = type de représentation demandée. *
* *
* Description : Traduit un opérande en version humainement lisible. *
* *
@@ -235,7 +234,7 @@ static int g_dalvik_args_operand_compare(const GDalvikArgsOperand *a, const GDal
* *
******************************************************************************/
-static void g_dalvik_args_operand_print(const GDalvikArgsOperand *operand, GBufferLine *line, AsmSyntax syntax)
+static void g_dalvik_args_operand_print(const GDalvikArgsOperand *operand, GBufferLine *line)
{
size_t i; /* Boucle de parcours */
@@ -243,14 +242,14 @@ static void g_dalvik_args_operand_print(const GDalvikArgsOperand *operand, GBuff
if (operand->count > 0)
{
- g_arch_operand_print(operand->args[0], line, syntax);
+ g_arch_operand_print(operand->args[0], line);
for (i = 1; i < operand->count; i++)
{
g_buffer_line_append_text(line, BLC_ASSEMBLY, ",", 1, RTT_PUNCT, NULL);
g_buffer_line_append_text(line, BLC_ASSEMBLY, " ", 1, RTT_RAW, NULL);
- g_arch_operand_print(operand->args[i], line, syntax);
+ g_arch_operand_print(operand->args[i], line);
}
diff --git a/plugins/dalvik/operands/pool.c b/plugins/dalvik/operands/pool.c
index 4e2183b..6e4229b 100644
--- a/plugins/dalvik/operands/pool.c
+++ b/plugins/dalvik/operands/pool.c
@@ -77,7 +77,7 @@ static void g_dalvik_pool_operand_finalize(GDalvikPoolOperand *);
static int g_dalvik_pool_operand_compare(const GDalvikPoolOperand *, const GDalvikPoolOperand *);
/* Traduit un opérande en version humainement lisible. */
-static void g_dalvik_pool_operand_print(const GDalvikPoolOperand *, GBufferLine *, AsmSyntax);
+static void g_dalvik_pool_operand_print(const GDalvikPoolOperand *, GBufferLine *);
@@ -251,7 +251,6 @@ static int g_dalvik_pool_operand_compare(const GDalvikPoolOperand *a, const GDal
* *
* Paramètres : operand = opérande à traiter. *
* line = ligne tampon où imprimer l'opérande donné. *
-* syntax = type de représentation demandée. *
* *
* Description : Traduit un opérande en version humainement lisible. *
* *
@@ -261,7 +260,7 @@ static int g_dalvik_pool_operand_compare(const GDalvikPoolOperand *a, const GDal
* *
******************************************************************************/
-static void g_dalvik_pool_operand_print(const GDalvikPoolOperand *operand, GBufferLine *line, AsmSyntax syntax)
+static void g_dalvik_pool_operand_print(const GDalvikPoolOperand *operand, GBufferLine *line)
{
const char *string; /* Chaîne de caractères #1 */
GDataType *type; /* Type à représenter */
diff --git a/plugins/dalvik/pseudo/fill.c b/plugins/dalvik/pseudo/fill.c
index 92178d9..12382f7 100644
--- a/plugins/dalvik/pseudo/fill.c
+++ b/plugins/dalvik/pseudo/fill.c
@@ -65,7 +65,7 @@ static void g_dalvik_fill_instr_dispose(GDalvikFillInstr *);
static void g_dalvik_fill_instr_finalize(GDalvikFillInstr *);
/* Fournit le nom humain de l'instruction manipulée. */
-static const char *g_dalvik_fill_instruction_get_keyword(const GDalvikFillInstr *, AsmSyntax);
+static const char *g_dalvik_fill_instruction_get_keyword(const GDalvikFillInstr *);
@@ -227,8 +227,7 @@ GArchInstruction *g_dalvik_fill_instr_new(uint16_t ident, GDalvikContext *ctx, c
/******************************************************************************
* *
-* Paramètres : instr = instruction d'assemblage à consulter. *
-* syntax = type de représentation demandée. *
+* Paramètres : instr = instruction d'assemblage à consulter. *
* *
* Description : Fournit le nom humain de l'instruction manipulée. *
* *
@@ -238,7 +237,7 @@ GArchInstruction *g_dalvik_fill_instr_new(uint16_t ident, GDalvikContext *ctx, c
* *
******************************************************************************/
-static const char *g_dalvik_fill_instruction_get_keyword(const GDalvikFillInstr *instr, AsmSyntax syntax)
+static const char *g_dalvik_fill_instruction_get_keyword(const GDalvikFillInstr *instr)
{
const char *result; /* Désignation à retourner */
diff --git a/plugins/dalvik/pseudo/switch.c b/plugins/dalvik/pseudo/switch.c
index cbfb975..ea3aa90 100644
--- a/plugins/dalvik/pseudo/switch.c
+++ b/plugins/dalvik/pseudo/switch.c
@@ -70,7 +70,7 @@ static void g_dalvik_switch_instr_finalize(GDalvikSwitchInstr *);
static bool g_dalvik_switch_decode_data(GDalvikSwitchInstr *, const GBinContent *, const vmpa2t *);
/* Fournit le nom humain de l'instruction manipulée. */
-static const char *g_dalvik_switch_instruction_get_keyword(const GDalvikSwitchInstr *, AsmSyntax);
+static const char *g_dalvik_switch_instruction_get_keyword(const GDalvikSwitchInstr *);
@@ -284,8 +284,7 @@ static bool g_dalvik_switch_decode_data(GDalvikSwitchInstr *instr, const GBinCon
/******************************************************************************
* *
-* Paramètres : instr = instruction d'assemblage à consulter. *
-* syntax = type de représentation demandée. *
+* Paramètres : instr = instruction d'assemblage à consulter. *
* *
* Description : Fournit le nom humain de l'instruction manipulée. *
* *
@@ -295,7 +294,7 @@ static bool g_dalvik_switch_decode_data(GDalvikSwitchInstr *instr, const GBinCon
* *
******************************************************************************/
-static const char *g_dalvik_switch_instruction_get_keyword(const GDalvikSwitchInstr *instr, AsmSyntax syntax)
+static const char *g_dalvik_switch_instruction_get_keyword(const GDalvikSwitchInstr *instr)
{
const char *result; /* Désignation à retourner */
diff --git a/plugins/dalvik/register.c b/plugins/dalvik/register.c
index 458d219..0120495 100644
--- a/plugins/dalvik/register.c
+++ b/plugins/dalvik/register.c
@@ -73,7 +73,7 @@ static void g_dalvik_register_finalize(GDalvikRegister *);
static guint g_dalvik_register_hash(const GDalvikRegister *);
/* Traduit un registre en version humainement lisible. */
-static void g_dalvik_register_print(const GDalvikRegister *, GBufferLine *, AsmSyntax);
+static void g_dalvik_register_print(const GDalvikRegister *, GBufferLine *);
/* Crée une réprésentation de registre Dalvik. */
static GArchRegister *_g_dalvik_register_new(uint16_t);
@@ -224,9 +224,8 @@ static guint g_dalvik_register_hash(const GDalvikRegister *reg)
/******************************************************************************
* *
-* Paramètres : reg = registre à transcrire. *
-* line = ligne tampon où imprimer l'opérande donné. *
-* syntax = type de représentation demandée. *
+* Paramètres : reg = registre à transcrire. *
+* line = ligne tampon où imprimer l'opérande donné. *
* *
* Description : Traduit un registre en version humainement lisible. *
* *
@@ -236,26 +235,12 @@ static guint g_dalvik_register_hash(const GDalvikRegister *reg)
* *
******************************************************************************/
-static void g_dalvik_register_print(const GDalvikRegister *reg, GBufferLine *line, AsmSyntax syntax)
+static void g_dalvik_register_print(const GDalvikRegister *reg, GBufferLine *line)
{
char key[MAX_REGNAME_LEN]; /* Mot clef principal */
size_t klen; /* Taille de ce mot clef */
- switch (syntax)
- {
- case ASX_INTEL:
- klen = snprintf(key, MAX_REGNAME_LEN, "v%hu", reg->index);
- break;
-
- case ASX_ATT:
- klen = snprintf(key, MAX_REGNAME_LEN, "%%v%hu", reg->index);
- break;
-
- default:
- klen = 0;
- break;
-
- }
+ klen = snprintf(key, MAX_REGNAME_LEN, "v%hu", reg->index);
g_buffer_line_append_text(line, BLC_ASSEMBLY, key, klen, RTT_REGISTER, NULL);
diff --git a/plugins/dalvik/v35/instruction.c b/plugins/dalvik/v35/instruction.c
index a8a3d95..28cb0dd 100644
--- a/plugins/dalvik/v35/instruction.c
+++ b/plugins/dalvik/v35/instruction.c
@@ -65,7 +65,7 @@ static void g_dalvik35_instruction_finalize(GDalvik35Instruction *);
static const char *g_dalvik35_instruction_get_encoding(const GDalvik35Instruction *);
/* Fournit le nom humain de l'instruction manipulée. */
-static const char *g_dalvik35_instruction_get_keyword(const GDalvik35Instruction *, AsmSyntax);
+static const char *g_dalvik35_instruction_get_keyword(const GDalvik35Instruction *);
/* Complète un désassemblage accompli pour une instruction. */
static void g_dalvik35_instruction_call_hook(GDalvik35Instruction *, InstrProcessHook, GArchProcessor *, GProcContext *, GExeFormat *);
@@ -217,8 +217,7 @@ static const char *g_dalvik35_instruction_get_encoding(const GDalvik35Instructio
/******************************************************************************
* *
-* Paramètres : instr = instruction d'assemblage à consulter. *
-* syntax = type de représentation demandée. *
+* Paramètres : instr = instruction d'assemblage à consulter. *
* *
* Description : Fournit le nom humain de l'instruction manipulée. *
* *
@@ -228,7 +227,7 @@ static const char *g_dalvik35_instruction_get_encoding(const GDalvik35Instructio
* *
******************************************************************************/
-static const char *g_dalvik35_instruction_get_keyword(const GDalvik35Instruction *instr, AsmSyntax syntax)
+static const char *g_dalvik35_instruction_get_keyword(const GDalvik35Instruction *instr)
{
const char *result; /* Désignation à retourner */
itid_t uid; /* Accès simplifié */
diff --git a/plugins/fmtp/def.h b/plugins/fmtp/def.h
index 8af70b8..2fa4761 100644
--- a/plugins/fmtp/def.h
+++ b/plugins/fmtp/def.h
@@ -28,7 +28,6 @@
#include <stdbool.h>
-#include <arch/archbase.h>
#include <common/cpp.h>
diff --git a/plugins/lnxsyscalls/hops_armv7.c b/plugins/lnxsyscalls/hops_armv7.c
index ebd4b2c..d706a10 100644
--- a/plugins/lnxsyscalls/hops_armv7.c
+++ b/plugins/lnxsyscalls/hops_armv7.c
@@ -93,7 +93,7 @@ static bool is_armv7_linux_syscall(GArchInstruction *instr)
bool result; /* Conclusion à diffuser */
const char *kwd; /* Désignation d'instruction */
- kwd = g_arch_instruction_get_keyword(instr, ASX_INTEL);
+ kwd = g_arch_instruction_get_keyword(instr);
result = (strcmp(kwd, "svc") == 0);
@@ -139,7 +139,7 @@ static bool resolve_armv7_linux_syscall_number(tracked_path *exec, GArchProcesso
if (got_nr)
{
instr = get_register_write_location(exec, 0, reg);
- kwd = g_arch_instruction_get_keyword(instr, ASX_INTEL);
+ kwd = g_arch_instruction_get_keyword(instr);
/* ... et uniquement les instructions 'mov r7, <imm>' */
if (strncmp(kwd, "mov", 3) != 0)
diff --git a/plugins/pychrysalide/arch/immediate.c b/plugins/pychrysalide/arch/immediate.c
index 794571d..e3c5c34 100644
--- a/plugins/pychrysalide/arch/immediate.c
+++ b/plugins/pychrysalide/arch/immediate.c
@@ -498,26 +498,12 @@ static PyObject *py_imm_operand_to_string(PyObject *self, PyObject *args)
{
PyObject *result; /* Instance à retourner */
GImmOperand *operand; /* Version GLib de l'opérande */
- unsigned int raw_syntax; /* Affichage brut à utiliser */
- int ret; /* Bilan de lecture des args. */
- AsmSyntax syntax; /* Affichage final à utiliser */
char value[IMM_MAX_SIZE]; /* Valeur humainement lisible */
operand = G_IMM_OPERAND(pygobject_get(self));
assert(operand != NULL);
- ret = PyArg_ParseTuple(args, "I", &raw_syntax);
- if (!ret) return NULL;
-
- syntax = raw_syntax;
-
- if (syntax != ASX_INTEL && syntax != ASX_ATT)
- {
- PyErr_SetString(PyExc_ValueError, _("Invalid syntax type"));
- return NULL;
- }
-
- g_imm_operand_to_string(operand, syntax, value);
+ g_imm_operand_to_string(operand, value);
result = PyUnicode_FromString(value);
@@ -620,7 +606,7 @@ PyTypeObject *get_python_imm_operand_type(void)
static PyMethodDef py_imm_operand_methods[] = {
{
"to_string", py_imm_operand_to_string,
- METH_VARARGS,
+ METH_NOARGS,
"to_string($self, syntax, /)\n--\n\nConvert the immediate operand to a string."
},
{ NULL }
diff --git a/plugins/pychrysalide/arch/instruction.c b/plugins/pychrysalide/arch/instruction.c
index 7d5462d..e9a2e04 100644
--- a/plugins/pychrysalide/arch/instruction.c
+++ b/plugins/pychrysalide/arch/instruction.c
@@ -322,7 +322,7 @@ static PyObject *py_arch_instruction_get_keyword(PyObject *self, void *unused)
const char *kw; /* Valeur récupérée */
instr = G_ARCH_INSTRUCTION(pygobject_get(self));
- kw = g_arch_instruction_get_keyword(instr, 0/* FIXME*/);
+ kw = g_arch_instruction_get_keyword(instr);
result = PyUnicode_FromString(kw);
diff --git a/plugins/pychrysalide/arch/module.c b/plugins/pychrysalide/arch/module.c
index 9c10965..406b78c 100644
--- a/plugins/pychrysalide/arch/module.c
+++ b/plugins/pychrysalide/arch/module.c
@@ -87,10 +87,6 @@ static bool py_base_define_constants(PyTypeObject *obj_type)
result &= PyDict_AddIntMacro(obj_type, MDS_32_BITS);
result &= PyDict_AddIntMacro(obj_type, MDS_64_BITS);
- result &= PyDict_AddIntMacro(obj_type, ASX_INTEL);
- result &= PyDict_AddIntMacro(obj_type, ASX_ATT);
- result &= PyDict_AddIntMacro(obj_type, ASX_COUNT);
-
return result;
}
diff --git a/plugins/stackvars/operand.c b/plugins/stackvars/operand.c
index 964996a..2b05209 100644
--- a/plugins/stackvars/operand.c
+++ b/plugins/stackvars/operand.c
@@ -130,7 +130,6 @@ GArchOperand *g_stack_var_operand_new(const GBinRoutine *routine, const GX86ModR
* *
* Paramètres : operand = opérande à transcrire. *
* format = format du binaire manipulé. *
-* syntax = type de représentation demandée. *
* buffer = zone de texte à venir compléter. *
* iter = point d'insertion du nouveau texte. *
* *
@@ -142,7 +141,7 @@ GArchOperand *g_stack_var_operand_new(const GBinRoutine *routine, const GX86ModR
* *
******************************************************************************/
-static void g_stack_var_operand_add_to_gtk_buffer(const GStackVarOperand *operand, const GExeFormat *format, AsmSyntax syntax, GtkTextBuffer *buffer, GtkTextIter *iter)
+static void g_stack_var_operand_add_to_gtk_buffer(const GStackVarOperand *operand, const GExeFormat *format, GtkTextBuffer *buffer, GtkTextIter *iter)
{
const GImmOperand *displacement; /* Décalage supplémentaire */
size_t value; /* Position dans la pile */