From nobody Tue Feb 10 23:13:21 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; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1558624514; cv=none; d=zoho.com; s=zohoarc; b=UnT7vcv0haraIjHLW5V8HQWRN61Ue6LRzUHCU1XjTJmzVutzapk6UDuuYrUqihEWV/OnFgZhIlVheAVRjBoGCzhgvdAWPodAM5DeUVB1t9bYOEcVQ0vjsOLZDXp57JC2Ic2fuFdbnlnYqYKjAasxx/47s2YMC+BEeL4pKVyDLIE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558624514; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Ww2LSp6bczaair+HE3835uyxzaqJh3az+j6QKvIto98=; b=ERz2+u6khnZ7E8BdVat/Cmoba20p659O2P9O2g8r9ZziU3xyw6sPSFsbLLb9zAm2BXKCKnB+l61DFltyz39HLhMrx2EqFn6QZVoXp4LHwAsKy345pzSVq8yOLnm+ifSBjR3S9I17nbk2cKKGXmNOAswgtIlBhHYGXlhqKysiQtU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1558624514462288.6576905527196; Thu, 23 May 2019 08:15:14 -0700 (PDT) Received: from localhost ([127.0.0.1]:38607 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTpQy-0004jQ-9j for importer@patchew.org; Thu, 23 May 2019 11:15:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39705) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTpKJ-0007Sc-RR for qemu-devel@nongnu.org; Thu, 23 May 2019 11:08:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTpKI-0001st-MR for qemu-devel@nongnu.org; Thu, 23 May 2019 11:08:15 -0400 Received: from mail-ua1-x942.google.com ([2607:f8b0:4864:20::942]:36937) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hTpKI-0001si-HS for qemu-devel@nongnu.org; Thu, 23 May 2019 11:08:14 -0400 Received: by mail-ua1-x942.google.com with SMTP id t18so2299970uar.4 for ; Thu, 23 May 2019 08:08:14 -0700 (PDT) Received: from localhost.localdomain (ip-173-130-215-183.orldfl.spcsdns.net. [173.130.215.183]) by smtp.gmail.com with ESMTPSA id p70sm4227462vsd.25.2019.05.23.08.08.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 May 2019 08:08:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ww2LSp6bczaair+HE3835uyxzaqJh3az+j6QKvIto98=; b=zANyOXl868k1DZ2O2uw27Zc+Ij5525RFDlxmgzWpoaQyraKh2FMJKjBYjcd1AtCWhV aEYdYaWntos3m5VseeFCeiatLTymiEoYaczJWghufdZrZvGihK1OGCQP2doidjLFJFmn bCOrpZy349QfP+ep6P/n0AuJZez+sHHDby90Uh2kc7BP4Nv0c4l3ti1kl/PTfhDbi7Sp udQJQXiWU/mEfa5W0VGVqHsKc8EKdz27zoteHp5xBtMTVd1ffejQ6QYWRo2SEj7QtXy4 3Oq5Ca5yTzsl5KrFp7q9iCAiaCXMYjCYzzgPsQ+4xPvr7duZd/Q9ej7bfx7o126jNvRO tp6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Ww2LSp6bczaair+HE3835uyxzaqJh3az+j6QKvIto98=; b=Jx5gTrKIdfq+qTBTOrIXMsBvhAw/jEq+9uZifvBnO/48URiNYTSUWk5cMJ22fsYgvE jsBdRq3vqP/ntia+x1Kijol0MePj04Yd878/Hc0Vz6o/vYPKS9ksLEMbf+SiihPYlxek L6vzfhCFutsCiLSH2Ko8a1wRI+YU/9LhMMBk3+1DA6o6RPiqswuTLwsw8sdxcILKG/xa q2n0sAR4Ij8KMHZ3xWM5jirK6veBbdXL+x685wXKJ5iblRv4fEtbl55cosSSeKx/Td86 G9cX3xZignD53e2k7b+n07ADORehwpiJbCuHqrjYpjlmsmwVatxz40sCXgpFfDs0138d bt6g== X-Gm-Message-State: APjAAAVdSj4FSEUIMz6WXJeM0v2Rwry6FC/HOyyfBN51+sDY/+nXEHhw a2rm/eNVpcQoY5h4nF8yb0yHulWkFTI= X-Google-Smtp-Source: APXvYqwkEQObKS7sJQO6zxIML2xyzIK5J0zAG6KzWH+yYwoTod0hZze4s/DtGdb683gloYP/639d2g== X-Received: by 2002:a9f:376e:: with SMTP id a43mr8798178uae.57.1558624093591; Thu, 23 May 2019 08:08:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 23 May 2019 11:08:02 -0400 Message-Id: <20190523150803.31504-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190523150803.31504-1-richard.henderson@linaro.org> References: <20190523150803.31504-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::942 Subject: [Qemu-devel] [PATCH 5/6] target/rx: Collect all bytes during disassembly 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: ysato@users.sourceforge.jp Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Collected, to be used in the next patch. Signed-off-by: Richard Henderson Reviewed-by: Yoshinori Sato --- 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.17.1