From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3BA1C46470 for ; Mon, 27 May 2019 15:43:45 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C11612146F for ; Mon, 27 May 2019 15:43:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C11612146F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=users.sourceforge.jp Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:47357 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVHmr-0003lv-2G for qemu-devel@archiver.kernel.org; Mon, 27 May 2019 11:43:45 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56098) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVHin-0000ZF-DM for qemu-devel@nongnu.org; Mon, 27 May 2019 11:39:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVHil-0007NQ-Kw for qemu-devel@nongnu.org; Mon, 27 May 2019 11:39:33 -0400 Received: from mail01.asahi-net.or.jp ([202.224.55.13]:38020) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVHil-00079i-7p for qemu-devel@nongnu.org; Mon, 27 May 2019 11:39:31 -0400 Received: from h61-195-96-97.vps.ablenet.jp (h61-195-96-97.ablenetvps.ne.jp [61.195.96.97]) (Authenticated sender: PQ4Y-STU) by mail01.asahi-net.or.jp (Postfix) with ESMTPA id 3CCD3121341; Tue, 28 May 2019 00:39:26 +0900 (JST) Received: from yo-satoh-debian.ysato.ml (ZM005235.ppp.dion.ne.jp [222.8.5.235]) by h61-195-96-97.vps.ablenet.jp (Postfix) with ESMTPSA id F0243240086; Tue, 28 May 2019 00:39:25 +0900 (JST) Date: Tue, 28 May 2019 00:29:42 +0900 Message-ID: <874l5f7w61.wl-ysato@users.sourceforge.jp> From: Yoshinori Sato To: Richard Henderson In-Reply-To: <20190523150803.31504-3-richard.henderson@linaro.org> References: <20190523150803.31504-1-richard.henderson@linaro.org> <20190523150803.31504-3-richard.henderson@linaro.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL/10.8 EasyPG/1.0.0 Emacs/25.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 202.224.55.13 Subject: Re: [Qemu-devel] [PATCH 2/6] target/rx: Replace operand with prt_ldmi in disassembler X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, 24 May 2019 00:07:59 +0900, Richard Henderson wrote: > > 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. > > Signed-off-by: Richard Henderson Reviewed-by: Yoshinori Sato > --- > target/rx/disas.c | 77 +++++++++++++++++------------------------------ > 1 file changed, 27 insertions(+), 50 deletions(-) > > diff --git a/target/rx/disas.c b/target/rx/disas.c > index 64342537ee..515b365528 100644 > --- a/target/rx/disas.c > +++ b/target/rx/disas.c > @@ -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)); > } > > -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"}; > char dsp[8]; > > if (ld < 3) { > 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 { > - 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) > @@ -416,8 +416,7 @@ static bool trans_AND_ir(DisasContext *ctx, arg_AND_ir *a) > /* and rs,rd */ > static bool trans_AND_mr(DisasContext *ctx, arg_AND_mr *a) > { > - prt("and\t"); > - operand(ctx, a->ld, a->mi, a->rs, a->rd); > + prt_ldmi(ctx, "and", a->ld, a->mi, a->rs, a->rd); > return true; > } > > @@ -440,8 +439,7 @@ static bool trans_OR_ir(DisasContext *ctx, arg_OR_ir *a) > /* or rs,rd */ > static bool trans_OR_mr(DisasContext *ctx, arg_OR_mr *a) > { > - prt("or\t"); > - operand(ctx, a->ld, a->mi, a->rs, a->rd); > + prt_ldmi(ctx, "or", a->ld, a->mi, a->rs, a->rd); > return true; > } > > @@ -463,8 +461,7 @@ static bool trans_XOR_ir(DisasContext *ctx, arg_XOR_ir *a) > /* xor rs,rd */ > static bool trans_XOR_mr(DisasContext *ctx, arg_XOR_mr *a) > { > - prt("xor\t"); > - operand(ctx, a->ld, a->mi, a->rs, a->rd); > + prt_ldmi(ctx, "xor", a->ld, a->mi, a->rs, a->rd); > return true; > } > > @@ -479,8 +476,7 @@ static bool trans_TST_ir(DisasContext *ctx, arg_TST_ir *a) > /* tst rs, rd */ > static bool trans_TST_mr(DisasContext *ctx, arg_TST_mr *a) > { > - prt("tst\t"); > - operand(ctx, a->ld, a->mi, a->rs, a->rd); > + prt_ldmi(ctx, "tst", a->ld, a->mi, a->rs, a->rd); > return true; > } > > @@ -548,8 +544,7 @@ static bool trans_ADD_irr(DisasContext *ctx, arg_ADD_irr *a) > /* add dsp[rs], rd */ > static bool trans_ADD_mr(DisasContext *ctx, arg_ADD_mr *a) > { > - prt("add\t"); > - operand(ctx, a->ld, a->mi, a->rs, a->rd); > + prt_ldmi(ctx, "add", a->ld, a->mi, a->rs, a->rd); > return true; > } > > @@ -573,8 +568,7 @@ static bool trans_CMP_ir(DisasContext *ctx, arg_CMP_ir *a) > /* cmp dsp[rs], rs2 */ > static bool trans_CMP_mr(DisasContext *ctx, arg_CMP_mr *a) > { > - prt("cmp\t"); > - operand(ctx, a->ld, a->mi, a->rs, a->rd); > + prt_ldmi(ctx, "cmp", a->ld, a->mi, a->rs, a->rd); > return true; > } > > @@ -589,8 +583,7 @@ static bool trans_SUB_ir(DisasContext *ctx, arg_SUB_ir *a) > /* sub dsp[rs], rd */ > static bool trans_SUB_mr(DisasContext *ctx, arg_SUB_mr *a) > { > - prt("sub\t"); > - operand(ctx, a->ld, a->mi, a->rs, a->rd); > + prt_ldmi(ctx, "sub", a->ld, a->mi, a->rs, a->rd); > return true; > } > > @@ -611,8 +604,7 @@ static bool trans_SBB_rr(DisasContext *ctx, arg_SBB_rr *a) > /* sbb dsp[rs], rd */ > static bool trans_SBB_mr(DisasContext *ctx, arg_SBB_mr *a) > { > - prt("sbb\t"); > - operand(ctx, a->ld, RX_IM_LONG, a->rs, a->rd); > + prt_ldmi(ctx, "sbb", a->ld, RX_IM_LONG, a->rs, a->rd); > return true; > } > > @@ -640,8 +632,7 @@ static bool trans_MAX_ir(DisasContext *ctx, arg_MAX_ir *a) > /* max dsp[rs], rd */ > static bool trans_MAX_mr(DisasContext *ctx, arg_MAX_mr *a) > { > - prt("max\t"); > - operand(ctx, a->ld, a->mi, a->rs, a->rd); > + prt_ldmi(ctx, "max", a->ld, a->mi, a->rs, a->rd); > return true; > } > > @@ -656,8 +647,7 @@ static bool trans_MIN_ir(DisasContext *ctx, arg_MIN_ir *a) > /* min dsp[rs], rd */ > static bool trans_MIN_mr(DisasContext *ctx, arg_MIN_mr *a) > { > - prt("max\t"); > - operand(ctx, a->ld, a->mi, a->rs, a->rd); > + prt_ldmi(ctx, "min", a->ld, a->mi, a->rs, a->rd); > return true; > } > > @@ -673,8 +663,7 @@ static bool trans_MUL_ir(DisasContext *ctx, arg_MUL_ir *a) > /* mul dsp[rs], rd */ > static bool trans_MUL_mr(DisasContext *ctx, arg_MUL_mr *a) > { > - prt("mul\t"); > - operand(ctx, a->ld, a->mi, a->rs, a->rd); > + prt_ldmi(ctx, "mul", a->ld, a->mi, a->rs, a->rd); > return true; > } > > @@ -696,8 +685,7 @@ static bool trans_EMUL_ir(DisasContext *ctx, arg_EMUL_ir *a) > /* emul dsp[rs], rd */ > static bool trans_EMUL_mr(DisasContext *ctx, arg_EMUL_mr *a) > { > - prt("emul\t"); > - operand(ctx, a->ld, a->mi, a->rs, a->rd); > + prt_ldmi(ctx, "emul", a->ld, a->mi, a->rs, a->rd); > return true; > } > > @@ -712,8 +700,7 @@ static bool trans_EMULU_ir(DisasContext *ctx, arg_EMULU_ir *a) > /* emulu dsp[rs], rd */ > static bool trans_EMULU_mr(DisasContext *ctx, arg_EMULU_mr *a) > { > - prt("emulu\t"); > - operand(ctx, a->ld, a->mi, a->rs, a->rd); > + prt_ldmi(ctx, "emulu", a->ld, a->mi, a->rs, a->rd); > return true; > } > > @@ -728,8 +715,7 @@ static bool trans_DIV_ir(DisasContext *ctx, arg_DIV_ir *a) > /* div dsp[rs], rd */ > static bool trans_DIV_mr(DisasContext *ctx, arg_DIV_mr *a) > { > - prt("div\t"); > - operand(ctx, a->ld, a->mi, a->rs, a->rd); > + prt_ldmi(ctx, "div", a->ld, a->mi, a->rs, a->rd); > return true; > } > > @@ -744,8 +730,7 @@ static bool trans_DIVU_ir(DisasContext *ctx, arg_DIVU_ir *a) > /* divu dsp[rs], rd */ > static bool trans_DIVU_mr(DisasContext *ctx, arg_DIVU_mr *a) > { > - prt("divu\t"); > - operand(ctx, a->ld, a->mi, a->rs, a->rd); > + prt_ldmi(ctx, "divu", a->ld, a->mi, a->rs, a->rd); > return true; > } > > @@ -1089,8 +1074,7 @@ static bool trans_FADD_ir(DisasContext *ctx, arg_FADD_ir *a) > /* fadd rs, rd */ > static bool trans_FADD_mr(DisasContext *ctx, arg_FADD_mr *a) > { > - prt("fadd\t"); > - operand(ctx, a->ld, RX_IM_LONG, a->rs, a->rd); > + prt_ldmi(ctx, "fadd", a->ld, RX_IM_LONG, a->rs, a->rd); > return true; > } > > @@ -1105,8 +1089,7 @@ static bool trans_FCMP_ir(DisasContext *ctx, arg_FCMP_ir *a) > /* fcmp rs, rd */ > static bool trans_FCMP_mr(DisasContext *ctx, arg_FCMP_mr *a) > { > - prt("fcmp\t"); > - operand(ctx, a->ld, RX_IM_LONG, a->rs, a->rd); > + prt_ldmi(ctx, "fcmp", a->ld, RX_IM_LONG, a->rs, a->rd); > return true; > } > > @@ -1121,8 +1104,7 @@ static bool trans_FSUB_ir(DisasContext *ctx, arg_FSUB_ir *a) > /* fsub rs, rd */ > static bool trans_FSUB_mr(DisasContext *ctx, arg_FSUB_mr *a) > { > - prt("fsub\t"); > - operand(ctx, a->ld, RX_IM_LONG, a->rs, a->rd); > + prt_ldmi(ctx, "fsub", a->ld, RX_IM_LONG, a->rs, a->rd); > return true; > } > > @@ -1130,8 +1112,7 @@ static bool trans_FSUB_mr(DisasContext *ctx, arg_FSUB_mr *a) > /* ftoi rs, rd */ > static bool trans_FTOI(DisasContext *ctx, arg_FTOI *a) > { > - prt("ftoi\t"); > - operand(ctx, a->ld, RX_IM_LONG, a->rs, a->rd); > + prt_ldmi(ctx, "ftoi", a->ld, RX_IM_LONG, a->rs, a->rd); > return true; > } > > @@ -1146,8 +1127,7 @@ static bool trans_FMUL_ir(DisasContext *ctx, arg_FMUL_ir *a) > /* fmul rs, rd */ > static bool trans_FMUL_mr(DisasContext *ctx, arg_FMUL_mr *a) > { > - prt("fmul\t"); > - operand(ctx, a->ld, RX_IM_LONG, a->rs, a->rd); > + prt_ldmi(ctx, "fmul", a->ld, RX_IM_LONG, a->rs, a->rd); > return true; > } > > @@ -1162,8 +1142,7 @@ static bool trans_FDIV_ir(DisasContext *ctx, arg_FDIV_ir *a) > /* fdiv rs, rd */ > static bool trans_FDIV_mr(DisasContext *ctx, arg_FDIV_mr *a) > { > - prt("fdiv\t"); > - operand(ctx, a->ld, RX_IM_LONG, a->rs, a->rd); > + prt_ldmi(ctx, "fdiv", a->ld, RX_IM_LONG, a->rs, a->rd); > return true; > } > > @@ -1171,8 +1150,7 @@ static bool trans_FDIV_mr(DisasContext *ctx, arg_FDIV_mr *a) > /* round rs, rd */ > static bool trans_ROUND(DisasContext *ctx, arg_ROUND *a) > { > - prt("round\t"); > - operand(ctx, a->ld, RX_IM_LONG, a->rs, a->rd); > + prt_ldmi(ctx, "round", a->ld, RX_IM_LONG, a->rs, a->rd); > return true; > } > > @@ -1180,8 +1158,7 @@ static bool trans_ROUND(DisasContext *ctx, arg_ROUND *a) > /* itof dsp[rs], rd */ > static bool trans_ITOF(DisasContext *ctx, arg_ITOF *a) > { > - prt("itof\t"); > - operand(ctx, a->ld, RX_IM_LONG, a->rs, a->rd); > + prt_ldmi(ctx, "itof", a->ld, RX_IM_LONG, a->rs, a->rd); > return true; > } > > -- > 2.17.1 >