@@ -2127,22 +2127,27 @@ static pseudo_t linearize_range(struct entrypoint *ep, struct statement *stmt)
ALLOCATOR(asm_rules, "asm rules");
ALLOCATOR(asm_constraint, "asm constraints");
-static void add_asm_input(struct entrypoint *ep, struct instruction *insn, struct asm_operand *op)
+static void add_asm_rule(struct instruction *insn, struct asm_constraint_list **list, struct asm_operand *op, pseudo_t pseudo)
{
- pseudo_t pseudo = linearize_expression(ep, op->expr);
struct asm_constraint *rule = __alloc_asm_constraint(0);
-
+ rule->is_memory = op->is_memory;
rule->ident = op->name;
rule->constraint = op->constraint ? op->constraint->string->data : "";
use_pseudo(insn, pseudo, &rule->pseudo);
- add_ptr_list(&insn->asm_rules->inputs, rule);
+ add_ptr_list(list, rule);
+}
+
+static void add_asm_input(struct entrypoint *ep, struct instruction *insn, struct asm_operand *op)
+{
+ pseudo_t pseudo = linearize_expression(ep, op->expr);
+
+ add_asm_rule(insn, &insn->asm_rules->inputs, op, pseudo);
}
static void add_asm_output(struct entrypoint *ep, struct instruction *insn, struct asm_operand *op)
{
struct access_data ad = { NULL, };
pseudo_t pseudo;
- struct asm_constraint *rule;
if (op->is_memory) {
pseudo = linearize_expression(ep, op->expr);
@@ -2152,12 +2157,8 @@ static void add_asm_output(struct entrypoint *ep, struct instruction *insn, stru
pseudo = alloc_pseudo(insn);
linearize_store_gen(ep, pseudo, &ad);
}
- rule = __alloc_asm_constraint(0);
- rule->is_memory = op->is_memory;
- rule->ident = op->name;
- rule->constraint = op->constraint ? op->constraint->string->data : "";
- use_pseudo(insn, pseudo, &rule->pseudo);
- add_ptr_list(&insn->asm_rules->outputs, rule);
+
+ add_asm_rule(insn, &insn->asm_rules->outputs, op, pseudo);
}
static pseudo_t linearize_asm_statement(struct entrypoint *ep, struct statement *stmt)
The functions add_asm_input() and add_asm_output() are very similar. So, factorize out the common part. Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com> --- linearize.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)