Commit 67eb12d8 authored by Richard Henderson's avatar Richard Henderson Committed by Philippe Mathieu-Daudé
Browse files

target/rx: Emit all disassembly in one prt() 



Many of the multi-part prints have been eliminated by previous
patches.  Eliminate the rest of them.

Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarYoshinori Sato <ysato@users.sourceforge.jp>
Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-Id: <20190531134315.4109-22-richard.henderson@linaro.org>
Acked-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
parent 5cf7c960

target/rx/disas.c

+39 −36
Original line number Diff line number Diff line
@@ -228,24 +228,21 @@ static bool trans_MOV_ra(DisasContext *ctx, arg_MOV_ra *a) 
/* mov.[bwl] rs,rd */

static bool trans_MOV_mm(DisasContext *ctx, arg_MOV_mm *a)

{

    char dspd[8], dsps[8];

    char dspd[8], dsps[8], szc = size[a->sz];



    prt("mov.%c\t", size[a->sz]);

    if (a->lds == 3 && a->ldd == 3) {

        /* mov.[bwl] rs,rd */

        prt("r%d, r%d", a->rs, a->rd);

        return true;

    }

    if (a->lds == 3) {

        prt("mov.%c\tr%d, r%d", szc, a->rs, a->rd);

    } else if (a->lds == 3) {

        rx_index_addr(ctx, dspd, a->ldd, a->sz);

        prt("r%d, %s[r%d]", a->rs, dspd, a->rd);

        prt("mov.%c\tr%d, %s[r%d]", szc, a->rs, dspd, a->rd);

    } else if (a->ldd == 3) {

        rx_index_addr(ctx, dsps, a->lds, a->sz);

        prt("%s[r%d], r%d", dsps, a->rs, a->rd);

        prt("mov.%c\t%s[r%d], r%d", szc, dsps, a->rs, a->rd);

    } else {

        rx_index_addr(ctx, dsps, a->lds, a->sz);

        rx_index_addr(ctx, dspd, a->ldd, a->sz);

        prt("%s[r%d], %s[r%d]", dsps, a->rs, dspd, a->rd);

        prt("mov.%c\t%s[r%d], %s[r%d]", szc, dsps, a->rs, dspd, a->rd);

    }

    return true;

}
@@ -254,8 +251,11 @@ static bool trans_MOV_mm(DisasContext *ctx, arg_MOV_mm *a) 
/* mov.[bwl] rs,[-rd] */

static bool trans_MOV_rp(DisasContext *ctx, arg_MOV_rp *a)

{

    prt("mov.%c\tr%d, ", size[a->sz], a->rs);

    prt((a->ad == 0) ? "[r%d+]" : "[-r%d]", a->rd);

    if (a->ad) {

        prt("mov.%c\tr%d, [-r%d]", size[a->sz], a->rs, a->rd);

    } else {

        prt("mov.%c\tr%d, [r%d+]", size[a->sz], a->rs, a->rd);

    }

    return true;

}
@@ -263,9 +263,11 @@ static bool trans_MOV_rp(DisasContext *ctx, arg_MOV_rp *a) 
/* mov.[bwl] [-rd],rs */

static bool trans_MOV_pr(DisasContext *ctx, arg_MOV_pr *a)

{

    prt("mov.%c\t", size[a->sz]);

    prt((a->ad == 0) ? "[r%d+]" : "[-r%d]", a->rd);

    prt(", r%d", a->rs);

    if (a->ad) {

        prt("mov.%c\t[-r%d], r%d", size[a->sz], a->rd, a->rs);

    } else {

        prt("mov.%c\t[r%d+], r%d", size[a->sz], a->rd, a->rs);

    }

    return true;

}
@@ -299,9 +301,11 @@ static bool trans_MOVU_ar(DisasContext *ctx, arg_MOVU_ar *a) 
/* movu.[bw] [-rs],rd */

static bool trans_MOVU_pr(DisasContext *ctx, arg_MOVU_pr *a)

{

    prt("movu.%c\t", size[a->sz]);

    prt((a->ad == 0) ? "[r%d+]" : "[-r%d]", a->rd);

    prt(", r%d", a->rs);

    if (a->ad) {

        prt("movu.%c\t[-r%d], r%d", size[a->sz], a->rd, a->rs);

    } else {

        prt("movu.%c\t[r%d+], r%d", size[a->sz], a->rd, a->rs);

    }

    return true;

}
@@ -478,11 +482,11 @@ static bool trans_TST_mr(DisasContext *ctx, arg_TST_mr *a) 
/* not rs, rd */

static bool trans_NOT_rr(DisasContext *ctx, arg_NOT_rr *a)

{

    prt("not\t");

    if (a->rs != a->rd) {

        prt("r%d, ", a->rs);

        prt("not\tr%d, r%d", a->rs, a->rd);

    } else {

        prt("not\tr%d", a->rs);

    }

    prt("r%d", a->rd);

    return true;

}
@@ -490,11 +494,11 @@ static bool trans_NOT_rr(DisasContext *ctx, arg_NOT_rr *a) 
/* neg rs, rd */

static bool trans_NEG_rr(DisasContext *ctx, arg_NEG_rr *a)

{

    prt("neg\t");

    if (a->rs != a->rd) {

        prt("r%d, ", a->rs);

        prt("neg\tr%d, r%d", a->rs, a->rd);

    } else {

        prt("neg\tr%d", a->rs);

    }

    prt("r%d", a->rd);

    return true;

}
@@ -606,11 +610,10 @@ static bool trans_SBB_mr(DisasContext *ctx, arg_SBB_mr *a) 
/* abs rs, rd */

static bool trans_ABS_rr(DisasContext *ctx, arg_ABS_rr *a)

{

    prt("abs\t");

    if (a->rs == a->rd) {

        prt("r%d", a->rd);

    if (a->rs != a->rd) {

        prt("abs\tr%d, r%d", a->rs, a->rd);

    } else {

        prt("r%d, r%d", a->rs, a->rd);

        prt("abs\tr%d", a->rs);

    }

    return true;

}
@@ -733,11 +736,11 @@ static bool trans_DIVU_mr(DisasContext *ctx, arg_DIVU_mr *a) 
/* shll #imm:5, rs, rd */

static bool trans_SHLL_irr(DisasContext *ctx, arg_SHLL_irr *a)

{

    prt("shll\t#%d, ", a->imm);

    if (a->rs2 != a->rd) {

        prt("r%d, ", a->rs2);

        prt("shll\t#%d, r%d, r%d", a->imm, a->rs2, a->rd);

    } else {

        prt("shll\t#%d, r%d", a->imm, a->rd);

    }

    prt("r%d", a->rd);

    return true;

}
@@ -752,11 +755,11 @@ static bool trans_SHLL_rr(DisasContext *ctx, arg_SHLL_rr *a) 
/* shar #imm:5, rs, rd */

static bool trans_SHAR_irr(DisasContext *ctx, arg_SHAR_irr *a)

{

    prt("shar\t#%d,", a->imm);

    if (a->rs2 != a->rd) {

        prt("r%d, ", a->rs2);

        prt("shar\t#%d, r%d, r%d", a->imm, a->rs2, a->rd);

    } else {

        prt("shar\t#%d, r%d", a->imm, a->rd);

    }

    prt("r%d", a->rd);

    return true;

}
@@ -771,11 +774,11 @@ static bool trans_SHAR_rr(DisasContext *ctx, arg_SHAR_rr *a) 
/* shlr #imm:5, rs, rd */

static bool trans_SHLR_irr(DisasContext *ctx, arg_SHLR_irr *a)

{

    prt("shlr\t#%d, ", a->imm);

    if (a->rs2 != a->rd) {

        prt("r%d, ", a->rs2);

        prt("shlr\t#%d, r%d, r%d", a->imm, a->rs2, a->rd);

    } else {

        prt("shlr\t#%d, r%d", a->imm, a->rd);

    }

    prt("r%d", a->rd);

    return true;

}