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 D0D2DC04AB3 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 A5719208CA for ; Mon, 27 May 2019 15:43:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A5719208CA 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]:47355 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVHmq-0003lY-QX for qemu-devel@archiver.kernel.org; Mon, 27 May 2019 11:43:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56086) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVHin-0000ZB-1d for qemu-devel@nongnu.org; Mon, 27 May 2019 11:39:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVHil-0007Nj-LE for qemu-devel@nongnu.org; Mon, 27 May 2019 11:39:32 -0400 Received: from mail02.asahi-net.or.jp ([202.224.55.14]:58411) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVHil-0007Do-9G 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 mail02.asahi-net.or.jp (Postfix) with ESMTPA id 3CFE23E7B8; Tue, 28 May 2019 00:39:28 +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 1141F240085; Tue, 28 May 2019 00:39:28 +0900 (JST) Date: Tue, 28 May 2019 00:31:52 +0900 Message-ID: <87y32r6hhz.wl-ysato@users.sourceforge.jp> From: Yoshinori Sato To: Richard Henderson In-Reply-To: <20190523150803.31504-6-richard.henderson@linaro.org> References: <20190523150803.31504-1-richard.henderson@linaro.org> <20190523150803.31504-6-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.14 Subject: Re: [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: 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:08:02 +0900, Richard Henderson wrote: > > 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; > > > 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 = ctx->addr; > + > + g_assert(ctx->len == i); > + g_assert(n <= ARRAY_SIZE(ctx->bytes)); > + > while (++i <= n) { > - ctx->dis->read_memory_func(ctx->addr++, &buf, 1, ctx->dis); > - insn |= buf << (32 - i * 8); > + ctx->dis->read_memory_func(addr++, &ctx->bytes[i - 1], 1, ctx->dis); > + insn |= ctx->bytes[i - 1] << (32 - i * 8); > } > + ctx->addr = addr; > + ctx->len = n; > + > return insn; > } > > static int32_t li(DisasContext *ctx, int sz) > { > - int32_t addr; > - bfd_byte buf[4]; > - addr = ctx->addr; > + uint32_t addr = ctx->addr; > + uintptr_t len = ctx->len; > > switch (sz) { > case 1: > + g_assert(len + 1 <= ARRAY_SIZE(ctx->bytes)); > ctx->addr += 1; > - ctx->dis->read_memory_func(addr, buf, 1, ctx->dis); > - return (int8_t)buf[0]; > + ctx->len += 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 <= ARRAY_SIZE(ctx->bytes)); > ctx->addr += 2; > - ctx->dis->read_memory_func(addr, buf, 2, ctx->dis); > - return ldsw_le_p(buf); > + ctx->len += 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 <= ARRAY_SIZE(ctx->bytes)); > ctx->addr += 3; > - ctx->dis->read_memory_func(addr, buf, 3, ctx->dis); > - return (int8_t)buf[2] << 16 | lduw_le_p(buf); > + ctx->len += 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 <= ARRAY_SIZE(ctx->bytes)); > ctx->addr += 4; > - ctx->dis->read_memory_func(addr, buf, 4, ctx->dis); > - return ldl_le_p(buf); > + ctx->len += 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[] = { > static void rx_index_addr(DisasContext *ctx, char out[8], int ld, int mi) > { > uint32_t addr = ctx->addr; > - uint8_t buf[2]; > + uintptr_t len = ctx->len; > uint16_t dsp; > > switch (ld) { > @@ -119,14 +135,18 @@ static void rx_index_addr(DisasContext *ctx, char out[8], int ld, int mi) > out[0] = '\0'; > return; > case 1: > + g_assert(len + 1 <= ARRAY_SIZE(ctx->bytes)); > ctx->addr += 1; > - ctx->dis->read_memory_func(addr, buf, 1, ctx->dis); > - dsp = buf[0]; > + ctx->len += 1; > + ctx->dis->read_memory_func(addr, ctx->bytes + len, 1, ctx->dis); > + dsp = ctx->bytes[len]; > break; > case 2: > + g_assert(len + 2 <= ARRAY_SIZE(ctx->bytes)); > ctx->addr += 2; > - ctx->dis->read_memory_func(addr, buf, 2, ctx->dis); > - dsp = lduw_le_p(buf); > + ctx->len += 2; > + ctx->dis->read_memory_func(addr, ctx->bytes + len, 2, ctx->dis); > + dsp = 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 *dis) > DisasContext ctx; > uint32_t insn; > int i; > + > ctx.dis = dis; > ctx.pc = ctx.addr = addr; > + ctx.len = 0; > > insn = decode_load(&ctx); > if (!decode(&ctx, insn)) { > -- > 2.17.1 >