From patchwork Fri May 31 13:43:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 165542 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp800628ili; Fri, 31 May 2019 07:06:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqxGVBGURvRJ/eTY1/emTRsTIhCuvrP1i/ufiV/q7wkjr3WSroBidlq4d9v5Jfos1jy+jZsk X-Received: by 2002:a0c:98d9:: with SMTP id g25mr8913401qvd.227.1559311610382; Fri, 31 May 2019 07:06:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559311610; cv=none; d=google.com; s=arc-20160816; b=0J5zqTL0LMgd2X8eaebdGjmgeLsG1ix3t5FMtftQibAf05KM/LOoU5kh+SMhvSykSC ahfnT0ZcWdowpEU87tW238i+EjF2dr5lJqmwoOCPCupQEbxdih1YDAlCv24z6J07O7MN 8I+jWNUxA5Wc0O1yyQ9NlgP3Ef+Umkl/zXYQaltAbOOdk2gFQ355pU4imxTim3oKdSU2 oc/cSsVp4VXorYbUbRyqFZ9AfkaMmvP+89xAY9m1kLxajaGkJV31pGeJ1MVKpp+uab9g jJ+rtOi+qCCq+JlXdKa4UewlSNx+Pd1+nzLbDEkh3s1fRtXtHxLIQgakWG5xszQXqxC1 dthA== 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:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=PpQi8m0GZI0Rzy/CPFH3P+XfVLz124wPRty/co7AxNU=; b=r/kphdH0gu7ueaceZqwm4MNjhZv3d1QjK9RW+beUxjPd8l+SG17vfki4oozuOhSmYG ztTzODG11PRTd0YrtZKtAwT79FHTN9Ntp+L/GumnYA2XhgXpy5akfvvWurMEr+ULQmOp kKQ7erkUvvyRInjZNBw9F2vi/Zdubn2+u1s2pQZE98TlvwW4b5x1oT00iiWo/3pYnoAY En2/u79PnpwcJq5Vv8IG0HSbPLhzMTquUD0rAjFsSuaB96y8vDasWCjAmr+9y1BYnGFc 0PRfFq8M5dgFQK986IZrhK3tbIMJIT9gka4XPe+8+W25eLdlVm0daczxlQmxkqhc9C/r ZfQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XBTODAWN; 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=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w13si200870qtw.231.2019.05.31.07.06.50 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 31 May 2019 07:06:50 -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=@linaro.org header.s=google header.b=XBTODAWN; 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=linaro.org Received: from localhost ([127.0.0.1]:44149 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWiBF-0008JZ-UV for patch@linaro.org; Fri, 31 May 2019 10:06:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34659) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWhp2-0007i3-6B for qemu-devel@nongnu.org; Fri, 31 May 2019 09:43:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWhp0-0000hY-TW for qemu-devel@nongnu.org; Fri, 31 May 2019 09:43:52 -0400 Received: from mail-ot1-x341.google.com ([2607:f8b0:4864:20::341]:41522) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWhp0-0000fL-Mk for qemu-devel@nongnu.org; Fri, 31 May 2019 09:43:50 -0400 Received: by mail-ot1-x341.google.com with SMTP id 107so3390922otj.8 for ; Fri, 31 May 2019 06:43:50 -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=PpQi8m0GZI0Rzy/CPFH3P+XfVLz124wPRty/co7AxNU=; b=XBTODAWNWjTtKZRhBdP6Wpb9GjHtF/WCHnoaabY8IIkyecepwIY5Pck1sHgdjBCsvY pVQqZnTM5C39Z7etum0+KzvAOod1WLwfdJ4dF6wvaNw2fxZ9Gy2/XEVG1KssHUFRHYEb kOF7XEevpxI2rwoMvcGS04Zs0giCKTTjKq+2+lib6yS3G/ynJ8ehQrNql3HWj9xd1AFy bU5Vxpu3mN+n9SEbVtY2awqVseDcrJKlW19/AvWPVNnyv/KckaiAMCL9wcf/jp4uscTH mFowUiMn3QVS4J+uc5Vu0/4LT5UzWmxeZi5DAVV9D2aOB7mQrsUafBg3hvv+57OvU+8b bnEQ== 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=PpQi8m0GZI0Rzy/CPFH3P+XfVLz124wPRty/co7AxNU=; b=ghymGSCOp+yybHw6JVeBrJp1Crf3xAu7lNalDPiE+uLE3c4EjH4nOl3mwtWqNRT/5r TjnwGhOyRrN1vy9BOCMb4vBZ4hkZqdpjVIufRJEcwkwtPRqCsYulIvH39z6S0OAeGr5+ 8LCEqKC1Fm7BoaedYnfKuUcxCSE7/pPsRGbOG96kW3Hd7j/+Wa9BCtXGVUbykegGuLdQ NmaAGde/pSHIvUWSaRw/VLrAH0yb1qMLqYFY0II6Z4H7uQf7o8Op2mCOE7L1Wz+nsGyf T3WqZI5bzN9D+bpXew7W1Vuu6pNfdy593BXk7AktPsi7OEl+rqVUqa61yMVUgA2gWvrt zGmg== X-Gm-Message-State: APjAAAUfVm+6cFlqzuALM8OCmVXlxqc+oy1P796yBYqTC+f12uB3pcmH PoicGUkML4SCXtd+z2cNijC3/6VHoBFawQ== X-Received: by 2002:a9d:27e5:: with SMTP id c92mr1986036otb.318.1559310229886; Fri, 31 May 2019 06:43:49 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id r23sm2391176otg.49.2019.05.31.06.43.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 May 2019 06:43:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 31 May 2019 08:43:14 -0500 Message-Id: <20190531134315.4109-23-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190531134315.4109-1-richard.henderson@linaro.org> References: <20190531134315.4109-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::341 Subject: [Qemu-devel] [PATCH v16 22/23] 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: philmd@redhat.com, ysato@users.sourceforge.jp Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Collected, to be used in the next patch. Reviewed-by: Yoshinori Sato Signed-off-by: Richard Henderson --- target/rx/disas.c | 62 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 20 deletions(-) -- 2.17.1 Reviewed-by: Philippe Mathieu-Daudé 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)) {