From nobody Sun Feb 8 12:38:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1562315963; cv=none; d=zoho.com; s=zohoarc; b=j3iIQlQjw+Affxzcp3+4NxRl4sN5ZlrO1SIAcXAJJk4VotcXE4KTf3RpnaSSUdRRGvVOXeYUm5fV9gPyuYg7nFK/ZAvzxbwzV2eiTaVtvxPEtPq0tU5+VdW7bPSPcruPob6Iep/c2sjBF0+iR7qXzxA78xGys6Btzq7aZfHhlqw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562315963; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=m48QTFxwZpa0wL4FBmo2IBPWtbo/UJRRDWyZpjLaKCw=; b=Dskyvr9Nh7I78IpdKkl51NNgTqKHA8x7VaC9Ujik1lFbAeOZV/HoNFph3AkSGWvG79HHMki39L5O12EV4NkWJdVXyCvv69xD9NH/1TnZKcReFu6OOcZ4/MS4yTjllCkJLMru1y+FD09wPPhnG4h9mIKfNiOOwi9EXvk7Sae/abI= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562315963926575.0771450686939; Fri, 5 Jul 2019 01:39:23 -0700 (PDT) Received: from localhost ([::1]:50558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjJkX-0004DK-0F for importer@patchew.org; Fri, 05 Jul 2019 04:39:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57013) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjJdj-0003N8-Pl for qemu-devel@nongnu.org; Fri, 05 Jul 2019 04:32:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjJdf-00062s-UY for qemu-devel@nongnu.org; Fri, 05 Jul 2019 04:32:19 -0400 Received: from mail03.asahi-net.or.jp ([202.224.55.15]:39712) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hjJdf-0005sa-HJ for qemu-devel@nongnu.org; Fri, 05 Jul 2019 04:32:15 -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 mail03.asahi-net.or.jp (Postfix) with ESMTPA id 287934DDF0; Fri, 5 Jul 2019 17:32:04 +0900 (JST) Received: from yo-satoh-debian.localdomain (ZM005235.ppp.dion.ne.jp [222.8.5.235]) by h61-195-96-97.vps.ablenet.jp (Postfix) with ESMTPSA id C6F9A240086; Fri, 5 Jul 2019 17:32:03 +0900 (JST) From: Yoshinori Sato To: qemu-devel@nongnu.org Date: Fri, 5 Jul 2019 17:31:31 +0900 Message-Id: <20190705083141.106254-13-ysato@users.sourceforge.jp> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190705083141.106254-1-ysato@users.sourceforge.jp> References: <20190705083141.106254-1-ysato@users.sourceforge.jp> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 202.224.55.15 Subject: [Qemu-devel] [PATCH v22 12/22] target/rx: Collect all bytes during disassembly 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: peter.maydell@linaro.org, imammedo@redhat.com, Richard Henderson , Yoshinori Sato , philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Richard Henderson Collected, to be used in the next patch. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Yoshinori Sato Signed-off-by: Yoshinori Sato Message-Id: <20190607091116.49044-23-ysato@users.sourceforge.jp> Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- target/rx/disas.c | 62 +++++++++++++++++++++++++++++++++++++--------------= ---- 1 file changed, 42 insertions(+), 20 deletions(-) diff --git a/target/rx/disas.c b/target/rx/disas.c index ebc1a44249..5a32a87534 100644 --- a/target/rx/disas.c +++ b/target/rx/disas.c @@ -25,43 +25,59 @@ typedef struct DisasContext { disassemble_info *dis; uint32_t addr; uint32_t pc; + uint8_t len; + uint8_t bytes[8]; } DisasContext; =20 =20 static uint32_t decode_load_bytes(DisasContext *ctx, uint32_t insn, - int i, int n) + int i, int n) { - bfd_byte buf; + uint32_t addr =3D ctx->addr; + + g_assert(ctx->len =3D=3D i); + g_assert(n <=3D ARRAY_SIZE(ctx->bytes)); + while (++i <=3D n) { - ctx->dis->read_memory_func(ctx->addr++, &buf, 1, ctx->dis); - insn |=3D buf << (32 - i * 8); + ctx->dis->read_memory_func(addr++, &ctx->bytes[i - 1], 1, ctx->dis= ); + insn |=3D ctx->bytes[i - 1] << (32 - i * 8); } + ctx->addr =3D addr; + ctx->len =3D n; + return insn; } =20 static int32_t li(DisasContext *ctx, int sz) { - int32_t addr; - bfd_byte buf[4]; - addr =3D ctx->addr; + uint32_t addr =3D ctx->addr; + uintptr_t len =3D ctx->len; =20 switch (sz) { case 1: + g_assert(len + 1 <=3D ARRAY_SIZE(ctx->bytes)); ctx->addr +=3D 1; - ctx->dis->read_memory_func(addr, buf, 1, ctx->dis); - return (int8_t)buf[0]; + ctx->len +=3D 1; + ctx->dis->read_memory_func(addr, ctx->bytes + len, 1, ctx->dis); + return (int8_t)ctx->bytes[len]; case 2: + g_assert(len + 2 <=3D ARRAY_SIZE(ctx->bytes)); ctx->addr +=3D 2; - ctx->dis->read_memory_func(addr, buf, 2, ctx->dis); - return ldsw_le_p(buf); + ctx->len +=3D 2; + ctx->dis->read_memory_func(addr, ctx->bytes + len, 2, ctx->dis); + return ldsw_le_p(ctx->bytes + len); case 3: + g_assert(len + 3 <=3D ARRAY_SIZE(ctx->bytes)); ctx->addr +=3D 3; - ctx->dis->read_memory_func(addr, buf, 3, ctx->dis); - return (int8_t)buf[2] << 16 | lduw_le_p(buf); + ctx->len +=3D 3; + ctx->dis->read_memory_func(addr, ctx->bytes + len, 3, ctx->dis); + return (int8_t)ctx->bytes[len + 2] << 16 | lduw_le_p(ctx->bytes + = len); case 0: + g_assert(len + 4 <=3D ARRAY_SIZE(ctx->bytes)); ctx->addr +=3D 4; - ctx->dis->read_memory_func(addr, buf, 4, ctx->dis); - return ldl_le_p(buf); + ctx->len +=3D 4; + ctx->dis->read_memory_func(addr, ctx->bytes + len, 4, ctx->dis); + return ldl_le_p(ctx->bytes + len); default: g_assert_not_reached(); } @@ -110,7 +126,7 @@ static const char psw[] =3D { static void rx_index_addr(DisasContext *ctx, char out[8], int ld, int mi) { uint32_t addr =3D ctx->addr; - uint8_t buf[2]; + uintptr_t len =3D ctx->len; uint16_t dsp; =20 switch (ld) { @@ -119,14 +135,18 @@ static void rx_index_addr(DisasContext *ctx, char out= [8], int ld, int mi) out[0] =3D '\0'; return; case 1: + g_assert(len + 1 <=3D ARRAY_SIZE(ctx->bytes)); ctx->addr +=3D 1; - ctx->dis->read_memory_func(addr, buf, 1, ctx->dis); - dsp =3D buf[0]; + ctx->len +=3D 1; + ctx->dis->read_memory_func(addr, ctx->bytes + len, 1, ctx->dis); + dsp =3D ctx->bytes[len]; break; case 2: + g_assert(len + 2 <=3D ARRAY_SIZE(ctx->bytes)); ctx->addr +=3D 2; - ctx->dis->read_memory_func(addr, buf, 2, ctx->dis); - dsp =3D lduw_le_p(buf); + ctx->len +=3D 2; + ctx->dis->read_memory_func(addr, ctx->bytes + len, 2, ctx->dis); + dsp =3D lduw_le_p(ctx->bytes + len); break; default: g_assert_not_reached(); @@ -1392,8 +1412,10 @@ int print_insn_rx(bfd_vma addr, disassemble_info *di= s) DisasContext ctx; uint32_t insn; int i; + ctx.dis =3D dis; ctx.pc =3D ctx.addr =3D addr; + ctx.len =3D 0; =20 insn =3D decode_load(&ctx); if (!decode(&ctx, insn)) { --=20 2.11.0