dfilter: Remove unused DFVM 4th instruction argument
This commit is contained in:
parent
3bb918428e
commit
bebf7afa37
|
@ -76,7 +76,6 @@ dfvm_insn_new(dfvm_opcode_t op)
|
||||||
insn->arg1 = NULL;
|
insn->arg1 = NULL;
|
||||||
insn->arg2 = NULL;
|
insn->arg2 = NULL;
|
||||||
insn->arg3 = NULL;
|
insn->arg3 = NULL;
|
||||||
insn->arg4 = NULL;
|
|
||||||
return insn;
|
return insn;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -131,9 +130,6 @@ dfvm_insn_free(dfvm_insn_t *insn)
|
||||||
if (insn->arg3) {
|
if (insn->arg3) {
|
||||||
dfvm_value_unref(insn->arg3);
|
dfvm_value_unref(insn->arg3);
|
||||||
}
|
}
|
||||||
if (insn->arg4) {
|
|
||||||
dfvm_value_unref(insn->arg4);
|
|
||||||
}
|
|
||||||
g_free(insn);
|
g_free(insn);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -270,8 +266,8 @@ dfvm_dump_str(wmem_allocator_t *alloc, dfilter_t *df, gboolean print_references)
|
||||||
{
|
{
|
||||||
int id, length;
|
int id, length;
|
||||||
dfvm_insn_t *insn;
|
dfvm_insn_t *insn;
|
||||||
dfvm_value_t *arg1, *arg2, *arg3, *arg4;
|
dfvm_value_t *arg1, *arg2, *arg3;
|
||||||
char *arg1_str, *arg2_str, *arg3_str, *arg4_str;
|
char *arg1_str, *arg2_str, *arg3_str;
|
||||||
wmem_strbuf_t *buf;
|
wmem_strbuf_t *buf;
|
||||||
GHashTableIter ref_iter;
|
GHashTableIter ref_iter;
|
||||||
gpointer key, value;
|
gpointer key, value;
|
||||||
|
@ -290,11 +286,9 @@ dfvm_dump_str(wmem_allocator_t *alloc, dfilter_t *df, gboolean print_references)
|
||||||
arg1 = insn->arg1;
|
arg1 = insn->arg1;
|
||||||
arg2 = insn->arg2;
|
arg2 = insn->arg2;
|
||||||
arg3 = insn->arg3;
|
arg3 = insn->arg3;
|
||||||
arg4 = insn->arg4;
|
|
||||||
arg1_str = dfvm_value_tostr(arg1);
|
arg1_str = dfvm_value_tostr(arg1);
|
||||||
arg2_str = dfvm_value_tostr(arg2);
|
arg2_str = dfvm_value_tostr(arg2);
|
||||||
arg3_str = dfvm_value_tostr(arg3);
|
arg3_str = dfvm_value_tostr(arg3);
|
||||||
arg4_str = dfvm_value_tostr(arg4);
|
|
||||||
|
|
||||||
switch (insn->op) {
|
switch (insn->op) {
|
||||||
case CHECK_EXISTS:
|
case CHECK_EXISTS:
|
||||||
|
@ -483,7 +477,6 @@ dfvm_dump_str(wmem_allocator_t *alloc, dfilter_t *df, gboolean print_references)
|
||||||
g_free(arg1_str);
|
g_free(arg1_str);
|
||||||
g_free(arg2_str);
|
g_free(arg2_str);
|
||||||
g_free(arg3_str);
|
g_free(arg3_str);
|
||||||
g_free(arg4_str);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (print_references && g_hash_table_size(df->references) > 0) {
|
if (print_references && g_hash_table_size(df->references) > 0) {
|
||||||
|
|
|
@ -99,7 +99,6 @@ typedef struct {
|
||||||
dfvm_value_t *arg1;
|
dfvm_value_t *arg1;
|
||||||
dfvm_value_t *arg2;
|
dfvm_value_t *arg2;
|
||||||
dfvm_value_t *arg3;
|
dfvm_value_t *arg3;
|
||||||
dfvm_value_t *arg4;
|
|
||||||
} dfvm_insn_t;
|
} dfvm_insn_t;
|
||||||
|
|
||||||
dfvm_insn_t*
|
dfvm_insn_t*
|
||||||
|
|
|
@ -340,7 +340,7 @@ dfw_append_function(dfwork_t *dfw, stnode_t *node, GSList **jumps_ptr)
|
||||||
static void
|
static void
|
||||||
gen_relation_insn(dfwork_t *dfw, dfvm_opcode_t op,
|
gen_relation_insn(dfwork_t *dfw, dfvm_opcode_t op,
|
||||||
dfvm_value_t *arg1, dfvm_value_t *arg2,
|
dfvm_value_t *arg1, dfvm_value_t *arg2,
|
||||||
dfvm_value_t *arg3, dfvm_value_t *arg4)
|
dfvm_value_t *arg3)
|
||||||
{
|
{
|
||||||
dfvm_insn_t *insn;
|
dfvm_insn_t *insn;
|
||||||
|
|
||||||
|
@ -348,7 +348,6 @@ gen_relation_insn(dfwork_t *dfw, dfvm_opcode_t op,
|
||||||
insn->arg1 = dfvm_value_ref(arg1);
|
insn->arg1 = dfvm_value_ref(arg1);
|
||||||
insn->arg2 = dfvm_value_ref(arg2);
|
insn->arg2 = dfvm_value_ref(arg2);
|
||||||
insn->arg3 = dfvm_value_ref(arg3);
|
insn->arg3 = dfvm_value_ref(arg3);
|
||||||
insn->arg4 = dfvm_value_ref(arg4);
|
|
||||||
dfw_append_insn(dfw, insn);
|
dfw_append_insn(dfw, insn);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -365,7 +364,7 @@ gen_relation(dfwork_t *dfw, dfvm_opcode_t op, test_match_t how,
|
||||||
|
|
||||||
/* Then combine them in a DFVM insruction */
|
/* Then combine them in a DFVM insruction */
|
||||||
op = select_opcode(op, how);
|
op = select_opcode(op, how);
|
||||||
gen_relation_insn(dfw, op, val1, val2, NULL, NULL);
|
gen_relation_insn(dfw, op, val1, val2, NULL);
|
||||||
|
|
||||||
/* If either of the relation arguments need an "exit" instruction
|
/* If either of the relation arguments need an "exit" instruction
|
||||||
* to jump to (on failure), mark them */
|
* to jump to (on failure), mark them */
|
||||||
|
@ -418,14 +417,14 @@ gen_relation_in(dfwork_t *dfw, test_match_t how,
|
||||||
|
|
||||||
/* Add test to see if the item is in range. */
|
/* Add test to see if the item is in range. */
|
||||||
op = select_opcode(ANY_IN_RANGE, how);
|
op = select_opcode(ANY_IN_RANGE, how);
|
||||||
gen_relation_insn(dfw, op, val1, val2, val3, NULL);
|
gen_relation_insn(dfw, op, val1, val2, val3);
|
||||||
} else {
|
} else {
|
||||||
/* Normal element: add equality test. */
|
/* Normal element: add equality test. */
|
||||||
val2 = gen_entity(dfw, node1, &node_jumps);
|
val2 = gen_entity(dfw, node1, &node_jumps);
|
||||||
|
|
||||||
/* Add test to see if the item matches */
|
/* Add test to see if the item matches */
|
||||||
op = select_opcode(ANY_EQ, how);
|
op = select_opcode(ANY_EQ, how);
|
||||||
gen_relation_insn(dfw, op, val1, val2, NULL, NULL);
|
gen_relation_insn(dfw, op, val1, val2, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Exit as soon as we find a match */
|
/* Exit as soon as we find a match */
|
||||||
|
@ -491,13 +490,13 @@ gen_arithmetic(dfwork_t *dfw, stnode_t *st_arg, GSList **jumps_ptr)
|
||||||
if (right == NULL) {
|
if (right == NULL) {
|
||||||
/* Generate unary DFVM instruction. */
|
/* Generate unary DFVM instruction. */
|
||||||
reg_val = dfvm_value_new_register(dfw->next_register++);
|
reg_val = dfvm_value_new_register(dfw->next_register++);
|
||||||
gen_relation_insn(dfw, op, val1, reg_val, NULL, NULL);
|
gen_relation_insn(dfw, op, val1, reg_val, NULL);
|
||||||
return reg_val;
|
return reg_val;
|
||||||
}
|
}
|
||||||
|
|
||||||
val2 = gen_entity(dfw, right, jumps_ptr);
|
val2 = gen_entity(dfw, right, jumps_ptr);
|
||||||
reg_val = dfvm_value_new_register(dfw->next_register++);
|
reg_val = dfvm_value_new_register(dfw->next_register++);
|
||||||
gen_relation_insn(dfw, op, val1, val2, reg_val, NULL);
|
gen_relation_insn(dfw, op, val1, val2, reg_val);
|
||||||
return reg_val;
|
return reg_val;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue