From patchwork Tue Mar 17 16:36:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 184633 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp4366227ile; Tue, 17 Mar 2020 09:49:08 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvtmEjtiCie6Mpu44A/XfA5rrF/k3nDFTV9PDHEGCyxLuMF0QFJal0VKFhACej0RInJp6aV X-Received: by 2002:a0c:e7c3:: with SMTP id c3mr74993qvo.62.1584463747939; Tue, 17 Mar 2020 09:49:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584463747; cv=none; d=google.com; s=arc-20160816; b=CF5oyheCaDzZQI9GbT2h/n2qMiGkWrsAXHbbQESdeMF8lafxKc5SC+rgMn56EaXLNK w5Q7YLwPs0HSlbNIWjMZu5l0U1n9m8cpL7ZYwZCb3FVffoU2im3dx2blsVo45iYatJwa bbq1u4jh2rTXKvuvgcIrjBq7YXLH7T5TWq6wohqMwP6bVoZCtgMN0chW1GpFXtNnUKNT rEzffnnmS9LD1Zjn3cuwedgcPPeg9eZh7HA+HM1Q5NiFFJNCpQTnpLd1D1CnGINZOKsW 623aPVG/0a8nOlc2V+cMQmH9FIJFep6wwfgP2UuCh68xWFVrGqAod6rhwCVbZeXuHPwh CAHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Yyb54Z5z/ykNOhXoH1gOKUFqMaavHpOhkHDAz9vguSE=; b=yfXWG3fD7rT9LGIexnreUZ4qT9hHW/Z1N1x4ujklLGKiccPMK1PIxpxI8WCXTBWJht usgkP+m8QnQizrhwnjoGJ3WR+JeJJaP59kRMimIO6wUAb8dv1XqBiP5Fi2baX6ZJAcso M+ueo5aeCd2I0jC78WeJs1nSiM7rQ5XnAPmbvuf967lsReJ6LZrtMITsW3bmUZP1BSLh N1nhn98ySD109dGx5qGqn1wcmNW6A2HrLzn3Y3htW+4a6Cfnr2uQXeGXk5wec/a0yqdN p/WH8YkBxn+qqgMriBNKEdSWI2mad26QW3WpZHqegr2oweu4TQ+B7D61hhhOEKOCQ+A6 pJxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=XmPpHWY8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=amsat.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f3si2120042qtc.267.2020.03.17.09.49.07 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Mar 2020 09:49:07 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=XmPpHWY8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=amsat.org Received: from localhost ([::1]:36824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEFOt-0005QS-DZ for patch@linaro.org; Tue, 17 Mar 2020 12:49:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35963) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEFCl-0003vW-Ur for qemu-devel@nongnu.org; Tue, 17 Mar 2020 12:36:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEFCk-0003wQ-7T for qemu-devel@nongnu.org; Tue, 17 Mar 2020 12:36:35 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:37371) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jEFCj-0003p5-VD for qemu-devel@nongnu.org; Tue, 17 Mar 2020 12:36:34 -0400 Received: by mail-wm1-x344.google.com with SMTP id a141so22755406wme.2 for ; Tue, 17 Mar 2020 09:36:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Yyb54Z5z/ykNOhXoH1gOKUFqMaavHpOhkHDAz9vguSE=; b=XmPpHWY8AVuixOtR7Jk3RVcJQehHWonDGm4s4ahpCkV99AG0nHBngUrUej8ekOScGt 3qFBo2aPFMlgnZVwQAxJLz0De2sqKKVpT3Yo/GilQYizRPs9huD/Tf3EFo+y4X05hPxM xSEiHKtr2OsqPUvSwjPA9XGgHsl0N3S48SwkgdYbuQR2ylolWPliBXUG9fH/MhAdWsDO U1huhqlUFOa8ruyqT7QnLl95GN28Sjg/Gd9X+Uv6ajZww9aB2bsavlOw9/vf7cz6K1M+ Bdnqu9zmYrNTKEqaFrYf/bw4ghy2Kk3BR1PxZaJTcRIQHvQiIfpkdBfI7KVDNpbYKShM upXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Yyb54Z5z/ykNOhXoH1gOKUFqMaavHpOhkHDAz9vguSE=; b=RQOePulKvfiFcGgFuat84xFY6v9hkrpLirjuL1GdIXoeeg7ti2yzfo64lE6KgNi+IO m1QwohjRnDsus+MQ0oMRE5jih0hmyACZq7D/k6tFVU+esBzXJa4XJeluu0PQi8lgGbfx uckuFT/yoB+6Gd9V0e0ups32mxxLJdKIBMaIpUdwmkInN5/0ZEhNQZlss71eMfPeaU/3 TnBwoTDoavH23OWkyF5Xg5llbbvHICSgw8MXyK0vbVATpx8OwIIMFnIt1fNPLbtX/8hq 8FjJXuCnXa8p4XnZkxKsKLwRm/rkiOS/T0RUoqfy3/UmxV4BRSngQFpF7c6WS2o9Dx5r zemA== X-Gm-Message-State: ANhLgQ3WdsDRPVg+yNxQ7OLfyfKrHgPIlxRqzeM+O8es4Q6HXKMjJCyM Gj8jeol4dQFPQMwDH7XFsuZGTTP3 X-Received: by 2002:a05:600c:214f:: with SMTP id v15mr169207wml.110.1584462992162; Tue, 17 Mar 2020 09:36:32 -0700 (PDT) Received: from x1w.redhat.com (96.red-83-59-163.dynamicip.rima-tde.net. [83.59.163.96]) by smtp.gmail.com with ESMTPSA id b202sm4618697wmd.15.2020.03.17.09.36.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2020 09:36:31 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 10/13] target/rx: Emit all disassembly in one prt() Date: Tue, 17 Mar 2020 17:36:13 +0100 Message-Id: <20200317163616.30027-11-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200317163616.30027-1-f4bug@amsat.org> References: <20200317163616.30027-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , =?utf-8?q?Philippe_?= =?utf-8?q?Mathieu-Daud=C3=A9?= , Yoshinori Sato , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Many of the multi-part prints have been eliminated by previous patches. Eliminate the rest of them. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Yoshinori Sato Tested-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson Message-Id: <20190531134315.4109-22-richard.henderson@linaro.org> Acked-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- target/rx/disas.c | 75 ++++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 36 deletions(-) -- 2.21.1 diff --git a/target/rx/disas.c b/target/rx/disas.c index a0c444020c..814ef97480 100644 --- a/target/rx/disas.c +++ b/target/rx/disas.c @@ -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; }