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=-9.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 E071AC4BA0B for ; Wed, 26 Feb 2020 04:30:38 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 90BBA222C2 for ; Wed, 26 Feb 2020 04:30:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="p31kqs2X" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 90BBA222C2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 48S2sl6klSzDqlQ for ; Wed, 26 Feb 2020 15:30:35 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::1041; helo=mail-pj1-x1041.google.com; envelope-from=jniethe5@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=p31kqs2X; dkim-atps=neutral Received: from mail-pj1-x1041.google.com (mail-pj1-x1041.google.com [IPv6:2607:f8b0:4864:20::1041]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 48S2NY0S0QzDqML for ; Wed, 26 Feb 2020 15:08:44 +1100 (AEDT) Received: by mail-pj1-x1041.google.com with SMTP id e9so702580pjr.4 for ; Tue, 25 Feb 2020 20:08:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jvldIg9ukp/2Y7zI/KLEZznacWyhfTDJLdK7YEaLLXI=; b=p31kqs2XsnfXt3o1gpQApNriF4o9ZI379rslX6FouaUD37HB0Cxbf+r6thpvs1V/nv sDKxWklILdYIBfheTnuniSFPAjjt8NWUKNruml6xXIVKfKlhWGuKvZnoLl9cRaD2QN/9 bVCU+GEYSPjlTUM8/1LhDK+SMZXKyMuCSplkgiWWo7ccnm8e1MYINbSBW/BJ+NGWw5Tf +Wk31Uv2JWAeCxMjWFbTBis/16v/PmY/6xiRyHV02fqpaxfiuI/Ypq0kMYK2csIdYTma 2B8lqfAqqlOea7Z9FwjPU9p0EPHP0Nk+/kJR3nDKYCvj1xnJHrVtHhs/qq4PZjb5nQYC 4D2w== 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=jvldIg9ukp/2Y7zI/KLEZznacWyhfTDJLdK7YEaLLXI=; b=iAr+NqUUy1oQf/3TU30KhbMhgLA9YNo9uwnDqqghj6vw1tqFEt8nFLDSf9mC2GQ/SI fiigj0yjZKmUMEW6Jden6SBBdR1qFPyv7ufukUDv6OXt7+/4329ny85tSneIIt3TSD9K q0U/mLsfXR0bFUr9hYca7gb/EmmtiRL9VWR3mcSW2ZcYiS5DXPlGMqiJhp2TtA6rqe/l R6izjQOo7l3lgOSo5gnUhWLSN3hm0KJAiRyeF+IKXAfJ3GtwB2vpbwoQVDL1M8qcfnhj DQ+oU0vt+QIRcpvr1Nv/CuYzOtQ+EgV7H72ypD/SV9EVzE3jlv11CyGGwII95UYfBYp2 03eg== X-Gm-Message-State: APjAAAWmTI4Ukd78rfr35qj9NJWE9qDrc1frro2E3S/jQN2M+EVO7gTz loyK4SsSsagrZQvDSFyguaynzKEdy9w= X-Google-Smtp-Source: APXvYqwF4uUYUxWwh9YOo/FG223R7ZGSPhVciM86GC9yFrvJB7oHHAWg2yRhln9IGby16/ca3j65zw== X-Received: by 2002:a17:902:b110:: with SMTP id q16mr1913007plr.289.1582690122204; Tue, 25 Feb 2020 20:08:42 -0800 (PST) Received: from tee480.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id d4sm604681pjg.19.2020.02.25.20.08.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 20:08:41 -0800 (PST) From: Jordan Niethe To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH v3 10/14] powerpc/xmon: Dump prefixed instructions Date: Wed, 26 Feb 2020 15:07:12 +1100 Message-Id: <20200226040716.32395-11-jniethe5@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200226040716.32395-1-jniethe5@gmail.com> References: <20200226040716.32395-1-jniethe5@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair@popple.id.au, bala24@linux.ibm.com, Jordan Niethe , dja@axtens.net Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Currently when xmon is dumping instructions it reads a word at a time and then prints that instruction (either as a hex number or by disassembling it). For prefixed instructions it would be nice to show its prefix and suffix as together. Use read_instr() so that if a prefix is encountered its suffix is loaded too. Then print these in the form: prefix:suffix Xmon uses the disassembly routines from GNU binutils. These currently do not support prefixed instructions so we will not disassemble the prefixed instructions yet. Signed-off-by: Jordan Niethe --- v2: Rename sufx to suffix v3: Simplify generic_inst_dump() --- arch/powerpc/xmon/xmon.c | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index a73a35aa4a75..bf304189e33a 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c @@ -2900,6 +2900,21 @@ prdump(unsigned long adrs, long ndump) } } +static bool instrs_are_equal(unsigned long insta, unsigned long suffixa, + unsigned long instb, unsigned long suffixb) +{ + if (insta != instb) + return false; + + if (!IS_PREFIX(insta) && !IS_PREFIX(instb)) + return true; + + if (IS_PREFIX(insta) && IS_PREFIX(instb)) + return suffixa == suffixb; + + return false; +} + typedef int (*instruction_dump_func)(unsigned long inst, unsigned long addr); static int @@ -2908,12 +2923,11 @@ generic_inst_dump(unsigned long adr, long count, int praddr, { int nr, dotted; unsigned long first_adr; - unsigned int inst, last_inst = 0; - unsigned char val[4]; + unsigned int inst, suffix, last_inst = 0, last_suffix = 0; dotted = 0; - for (first_adr = adr; count > 0; --count, adr += 4) { - nr = mread(adr, val, 4); + for (first_adr = adr; count > 0; --count, adr += nr) { + nr = mread_instr(adr, &inst, &suffix); if (nr == 0) { if (praddr) { const char *x = fault_chars[fault_type]; @@ -2921,8 +2935,9 @@ generic_inst_dump(unsigned long adr, long count, int praddr, } break; } - inst = GETWORD(val); - if (adr > first_adr && inst == last_inst) { + if (adr > first_adr && instrs_are_equal(inst, suffix, + last_inst, + last_suffix)) { if (!dotted) { printf(" ...\n"); dotted = 1; @@ -2931,10 +2946,17 @@ generic_inst_dump(unsigned long adr, long count, int praddr, } dotted = 0; last_inst = inst; - if (praddr) + last_suffix = suffix; + if (praddr) { printf(REG" %.8x", adr, inst); + if (IS_PREFIX(inst)) + printf(":%.8x", suffix); + } printf("\t"); - dump_func(inst, adr); + if (IS_PREFIX(inst)) + printf("%.8x:%.8x", inst, suffix); + else + dump_func(inst, adr); printf("\n"); } return adr - first_adr; -- 2.17.1