target/rx: Replace operand with prt_ldmi in disassembler
This has consistency with prt_ri(). It loads all data before beginning output. It uses exactly one call to prt() to emit the full instruction. Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Yoshinori Sato <ysato@users.sourceforge.jp> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20190531134315.4109-20-richard.henderson@linaro.org> Acked-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
parent
fa6289e267
commit
e283adea34
|
@ -135,18 +135,18 @@ static void rx_index_addr(DisasContext *ctx, char out[8], int ld, int mi)
|
||||||
sprintf(out, "%u", dsp << (mi < 3 ? mi : 4 - mi));
|
sprintf(out, "%u", dsp << (mi < 3 ? mi : 4 - mi));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void operand(DisasContext *ctx, int ld, int mi, int rs, int rd)
|
static void prt_ldmi(DisasContext *ctx, const char *insn,
|
||||||
|
int ld, int mi, int rs, int rd)
|
||||||
{
|
{
|
||||||
static const char sizes[][4] = {".b", ".w", ".l", ".uw", ".ub"};
|
static const char sizes[][4] = {".b", ".w", ".l", ".uw", ".ub"};
|
||||||
char dsp[8];
|
char dsp[8];
|
||||||
|
|
||||||
if (ld < 3) {
|
if (ld < 3) {
|
||||||
rx_index_addr(ctx, dsp, ld, mi);
|
rx_index_addr(ctx, dsp, ld, mi);
|
||||||
prt("%s[r%d]%s", dsp, rs, sizes[mi]);
|
prt("%s\t%s[r%d]%s, r%d", insn, dsp, rs, sizes[mi], rd);
|
||||||
} else {
|
} else {
|
||||||
prt("r%d", rs);
|
prt("%s\tr%d, r%d", insn, rs, rd);
|
||||||
}
|
}
|
||||||
prt(", r%d", rd);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void prt_ir(DisasContext *ctx, const char *insn, int imm, int rd)
|
static void prt_ir(DisasContext *ctx, const char *insn, int imm, int rd)
|
||||||
|
@ -416,8 +416,7 @@ static bool trans_AND_ir(DisasContext *ctx, arg_AND_ir *a)
|
||||||
/* and rs,rd */
|
/* and rs,rd */
|
||||||
static bool trans_AND_mr(DisasContext *ctx, arg_AND_mr *a)
|
static bool trans_AND_mr(DisasContext *ctx, arg_AND_mr *a)
|
||||||
{
|
{
|
||||||
prt("and\t");
|
prt_ldmi(ctx, "and", a->ld, a->mi, a->rs, a->rd);
|
||||||
operand(ctx, a->ld, a->mi, a->rs, a->rd);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -440,8 +439,7 @@ static bool trans_OR_ir(DisasContext *ctx, arg_OR_ir *a)
|
||||||
/* or rs,rd */
|
/* or rs,rd */
|
||||||
static bool trans_OR_mr(DisasContext *ctx, arg_OR_mr *a)
|
static bool trans_OR_mr(DisasContext *ctx, arg_OR_mr *a)
|
||||||
{
|
{
|
||||||
prt("or\t");
|
prt_ldmi(ctx, "or", a->ld, a->mi, a->rs, a->rd);
|
||||||
operand(ctx, a->ld, a->mi, a->rs, a->rd);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -463,8 +461,7 @@ static bool trans_XOR_ir(DisasContext *ctx, arg_XOR_ir *a)
|
||||||
/* xor rs,rd */
|
/* xor rs,rd */
|
||||||
static bool trans_XOR_mr(DisasContext *ctx, arg_XOR_mr *a)
|
static bool trans_XOR_mr(DisasContext *ctx, arg_XOR_mr *a)
|
||||||
{
|
{
|
||||||
prt("xor\t");
|
prt_ldmi(ctx, "xor", a->ld, a->mi, a->rs, a->rd);
|
||||||
operand(ctx, a->ld, a->mi, a->rs, a->rd);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -479,8 +476,7 @@ static bool trans_TST_ir(DisasContext *ctx, arg_TST_ir *a)
|
||||||
/* tst rs, rd */
|
/* tst rs, rd */
|
||||||
static bool trans_TST_mr(DisasContext *ctx, arg_TST_mr *a)
|
static bool trans_TST_mr(DisasContext *ctx, arg_TST_mr *a)
|
||||||
{
|
{
|
||||||
prt("tst\t");
|
prt_ldmi(ctx, "tst", a->ld, a->mi, a->rs, a->rd);
|
||||||
operand(ctx, a->ld, a->mi, a->rs, a->rd);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -548,8 +544,7 @@ static bool trans_ADD_irr(DisasContext *ctx, arg_ADD_irr *a)
|
||||||
/* add dsp[rs], rd */
|
/* add dsp[rs], rd */
|
||||||
static bool trans_ADD_mr(DisasContext *ctx, arg_ADD_mr *a)
|
static bool trans_ADD_mr(DisasContext *ctx, arg_ADD_mr *a)
|
||||||
{
|
{
|
||||||
prt("add\t");
|
prt_ldmi(ctx, "add", a->ld, a->mi, a->rs, a->rd);
|
||||||
operand(ctx, a->ld, a->mi, a->rs, a->rd);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -573,8 +568,7 @@ static bool trans_CMP_ir(DisasContext *ctx, arg_CMP_ir *a)
|
||||||
/* cmp dsp[rs], rs2 */
|
/* cmp dsp[rs], rs2 */
|
||||||
static bool trans_CMP_mr(DisasContext *ctx, arg_CMP_mr *a)
|
static bool trans_CMP_mr(DisasContext *ctx, arg_CMP_mr *a)
|
||||||
{
|
{
|
||||||
prt("cmp\t");
|
prt_ldmi(ctx, "cmp", a->ld, a->mi, a->rs, a->rd);
|
||||||
operand(ctx, a->ld, a->mi, a->rs, a->rd);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -589,8 +583,7 @@ static bool trans_SUB_ir(DisasContext *ctx, arg_SUB_ir *a)
|
||||||
/* sub dsp[rs], rd */
|
/* sub dsp[rs], rd */
|
||||||
static bool trans_SUB_mr(DisasContext *ctx, arg_SUB_mr *a)
|
static bool trans_SUB_mr(DisasContext *ctx, arg_SUB_mr *a)
|
||||||
{
|
{
|
||||||
prt("sub\t");
|
prt_ldmi(ctx, "sub", a->ld, a->mi, a->rs, a->rd);
|
||||||
operand(ctx, a->ld, a->mi, a->rs, a->rd);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -611,8 +604,7 @@ static bool trans_SBB_rr(DisasContext *ctx, arg_SBB_rr *a)
|
||||||
/* sbb dsp[rs], rd */
|
/* sbb dsp[rs], rd */
|
||||||
static bool trans_SBB_mr(DisasContext *ctx, arg_SBB_mr *a)
|
static bool trans_SBB_mr(DisasContext *ctx, arg_SBB_mr *a)
|
||||||
{
|
{
|
||||||
prt("sbb\t");
|
prt_ldmi(ctx, "sbb", a->ld, RX_IM_LONG, a->rs, a->rd);
|
||||||
operand(ctx, a->ld, RX_IM_LONG, a->rs, a->rd);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -640,8 +632,7 @@ static bool trans_MAX_ir(DisasContext *ctx, arg_MAX_ir *a)
|
||||||
/* max dsp[rs], rd */
|
/* max dsp[rs], rd */
|
||||||
static bool trans_MAX_mr(DisasContext *ctx, arg_MAX_mr *a)
|
static bool trans_MAX_mr(DisasContext *ctx, arg_MAX_mr *a)
|
||||||
{
|
{
|
||||||
prt("max\t");
|
prt_ldmi(ctx, "max", a->ld, a->mi, a->rs, a->rd);
|
||||||
operand(ctx, a->ld, a->mi, a->rs, a->rd);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -656,8 +647,7 @@ static bool trans_MIN_ir(DisasContext *ctx, arg_MIN_ir *a)
|
||||||
/* min dsp[rs], rd */
|
/* min dsp[rs], rd */
|
||||||
static bool trans_MIN_mr(DisasContext *ctx, arg_MIN_mr *a)
|
static bool trans_MIN_mr(DisasContext *ctx, arg_MIN_mr *a)
|
||||||
{
|
{
|
||||||
prt("max\t");
|
prt_ldmi(ctx, "min", a->ld, a->mi, a->rs, a->rd);
|
||||||
operand(ctx, a->ld, a->mi, a->rs, a->rd);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -673,8 +663,7 @@ static bool trans_MUL_ir(DisasContext *ctx, arg_MUL_ir *a)
|
||||||
/* mul dsp[rs], rd */
|
/* mul dsp[rs], rd */
|
||||||
static bool trans_MUL_mr(DisasContext *ctx, arg_MUL_mr *a)
|
static bool trans_MUL_mr(DisasContext *ctx, arg_MUL_mr *a)
|
||||||
{
|
{
|
||||||
prt("mul\t");
|
prt_ldmi(ctx, "mul", a->ld, a->mi, a->rs, a->rd);
|
||||||
operand(ctx, a->ld, a->mi, a->rs, a->rd);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -696,8 +685,7 @@ static bool trans_EMUL_ir(DisasContext *ctx, arg_EMUL_ir *a)
|
||||||
/* emul dsp[rs], rd */
|
/* emul dsp[rs], rd */
|
||||||
static bool trans_EMUL_mr(DisasContext *ctx, arg_EMUL_mr *a)
|
static bool trans_EMUL_mr(DisasContext *ctx, arg_EMUL_mr *a)
|
||||||
{
|
{
|
||||||
prt("emul\t");
|
prt_ldmi(ctx, "emul", a->ld, a->mi, a->rs, a->rd);
|
||||||
operand(ctx, a->ld, a->mi, a->rs, a->rd);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -712,8 +700,7 @@ static bool trans_EMULU_ir(DisasContext *ctx, arg_EMULU_ir *a)
|
||||||
/* emulu dsp[rs], rd */
|
/* emulu dsp[rs], rd */
|
||||||
static bool trans_EMULU_mr(DisasContext *ctx, arg_EMULU_mr *a)
|
static bool trans_EMULU_mr(DisasContext *ctx, arg_EMULU_mr *a)
|
||||||
{
|
{
|
||||||
prt("emulu\t");
|
prt_ldmi(ctx, "emulu", a->ld, a->mi, a->rs, a->rd);
|
||||||
operand(ctx, a->ld, a->mi, a->rs, a->rd);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -728,8 +715,7 @@ static bool trans_DIV_ir(DisasContext *ctx, arg_DIV_ir *a)
|
||||||
/* div dsp[rs], rd */
|
/* div dsp[rs], rd */
|
||||||
static bool trans_DIV_mr(DisasContext *ctx, arg_DIV_mr *a)
|
static bool trans_DIV_mr(DisasContext *ctx, arg_DIV_mr *a)
|
||||||
{
|
{
|
||||||
prt("div\t");
|
prt_ldmi(ctx, "div", a->ld, a->mi, a->rs, a->rd);
|
||||||
operand(ctx, a->ld, a->mi, a->rs, a->rd);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -744,8 +730,7 @@ static bool trans_DIVU_ir(DisasContext *ctx, arg_DIVU_ir *a)
|
||||||
/* divu dsp[rs], rd */
|
/* divu dsp[rs], rd */
|
||||||
static bool trans_DIVU_mr(DisasContext *ctx, arg_DIVU_mr *a)
|
static bool trans_DIVU_mr(DisasContext *ctx, arg_DIVU_mr *a)
|
||||||
{
|
{
|
||||||
prt("divu\t");
|
prt_ldmi(ctx, "divu", a->ld, a->mi, a->rs, a->rd);
|
||||||
operand(ctx, a->ld, a->mi, a->rs, a->rd);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1089,8 +1074,7 @@ static bool trans_FADD_ir(DisasContext *ctx, arg_FADD_ir *a)
|
||||||
/* fadd rs, rd */
|
/* fadd rs, rd */
|
||||||
static bool trans_FADD_mr(DisasContext *ctx, arg_FADD_mr *a)
|
static bool trans_FADD_mr(DisasContext *ctx, arg_FADD_mr *a)
|
||||||
{
|
{
|
||||||
prt("fadd\t");
|
prt_ldmi(ctx, "fadd", a->ld, RX_IM_LONG, a->rs, a->rd);
|
||||||
operand(ctx, a->ld, RX_IM_LONG, a->rs, a->rd);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1105,8 +1089,7 @@ static bool trans_FCMP_ir(DisasContext *ctx, arg_FCMP_ir *a)
|
||||||
/* fcmp rs, rd */
|
/* fcmp rs, rd */
|
||||||
static bool trans_FCMP_mr(DisasContext *ctx, arg_FCMP_mr *a)
|
static bool trans_FCMP_mr(DisasContext *ctx, arg_FCMP_mr *a)
|
||||||
{
|
{
|
||||||
prt("fcmp\t");
|
prt_ldmi(ctx, "fcmp", a->ld, RX_IM_LONG, a->rs, a->rd);
|
||||||
operand(ctx, a->ld, RX_IM_LONG, a->rs, a->rd);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1121,8 +1104,7 @@ static bool trans_FSUB_ir(DisasContext *ctx, arg_FSUB_ir *a)
|
||||||
/* fsub rs, rd */
|
/* fsub rs, rd */
|
||||||
static bool trans_FSUB_mr(DisasContext *ctx, arg_FSUB_mr *a)
|
static bool trans_FSUB_mr(DisasContext *ctx, arg_FSUB_mr *a)
|
||||||
{
|
{
|
||||||
prt("fsub\t");
|
prt_ldmi(ctx, "fsub", a->ld, RX_IM_LONG, a->rs, a->rd);
|
||||||
operand(ctx, a->ld, RX_IM_LONG, a->rs, a->rd);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1130,8 +1112,7 @@ static bool trans_FSUB_mr(DisasContext *ctx, arg_FSUB_mr *a)
|
||||||
/* ftoi rs, rd */
|
/* ftoi rs, rd */
|
||||||
static bool trans_FTOI(DisasContext *ctx, arg_FTOI *a)
|
static bool trans_FTOI(DisasContext *ctx, arg_FTOI *a)
|
||||||
{
|
{
|
||||||
prt("ftoi\t");
|
prt_ldmi(ctx, "ftoi", a->ld, RX_IM_LONG, a->rs, a->rd);
|
||||||
operand(ctx, a->ld, RX_IM_LONG, a->rs, a->rd);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1146,8 +1127,7 @@ static bool trans_FMUL_ir(DisasContext *ctx, arg_FMUL_ir *a)
|
||||||
/* fmul rs, rd */
|
/* fmul rs, rd */
|
||||||
static bool trans_FMUL_mr(DisasContext *ctx, arg_FMUL_mr *a)
|
static bool trans_FMUL_mr(DisasContext *ctx, arg_FMUL_mr *a)
|
||||||
{
|
{
|
||||||
prt("fmul\t");
|
prt_ldmi(ctx, "fmul", a->ld, RX_IM_LONG, a->rs, a->rd);
|
||||||
operand(ctx, a->ld, RX_IM_LONG, a->rs, a->rd);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1162,8 +1142,7 @@ static bool trans_FDIV_ir(DisasContext *ctx, arg_FDIV_ir *a)
|
||||||
/* fdiv rs, rd */
|
/* fdiv rs, rd */
|
||||||
static bool trans_FDIV_mr(DisasContext *ctx, arg_FDIV_mr *a)
|
static bool trans_FDIV_mr(DisasContext *ctx, arg_FDIV_mr *a)
|
||||||
{
|
{
|
||||||
prt("fdiv\t");
|
prt_ldmi(ctx, "fdiv", a->ld, RX_IM_LONG, a->rs, a->rd);
|
||||||
operand(ctx, a->ld, RX_IM_LONG, a->rs, a->rd);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1171,8 +1150,7 @@ static bool trans_FDIV_mr(DisasContext *ctx, arg_FDIV_mr *a)
|
||||||
/* round rs, rd */
|
/* round rs, rd */
|
||||||
static bool trans_ROUND(DisasContext *ctx, arg_ROUND *a)
|
static bool trans_ROUND(DisasContext *ctx, arg_ROUND *a)
|
||||||
{
|
{
|
||||||
prt("round\t");
|
prt_ldmi(ctx, "round", a->ld, RX_IM_LONG, a->rs, a->rd);
|
||||||
operand(ctx, a->ld, RX_IM_LONG, a->rs, a->rd);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1180,8 +1158,7 @@ static bool trans_ROUND(DisasContext *ctx, arg_ROUND *a)
|
||||||
/* itof dsp[rs], rd */
|
/* itof dsp[rs], rd */
|
||||||
static bool trans_ITOF(DisasContext *ctx, arg_ITOF *a)
|
static bool trans_ITOF(DisasContext *ctx, arg_ITOF *a)
|
||||||
{
|
{
|
||||||
prt("itof\t");
|
prt_ldmi(ctx, "itof", a->ld, RX_IM_LONG, a->rs, a->rd);
|
||||||
operand(ctx, a->ld, RX_IM_LONG, a->rs, a->rd);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue