From patchwork Tue Nov 24 23:16:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rashmica Gupta X-Patchwork-Id: 548337 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 29A4F1402A3 for ; Wed, 25 Nov 2015 10:18:09 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=selPBHA2; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id E67071A02EB for ; Wed, 25 Nov 2015 10:18:08 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=selPBHA2; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pa0-x22a.google.com (mail-pa0-x22a.google.com [IPv6:2607:f8b0:400e:c03::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 44B941A0045 for ; Wed, 25 Nov 2015 10:16:50 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=selPBHA2; dkim-atps=neutral Received: by pacej9 with SMTP id ej9so36307155pac.2 for ; Tue, 24 Nov 2015 15:16:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=m1ZHRB5egc0aS5Qc1pPhbD57TdJs7fn722fsjX0miDk=; b=selPBHA24K1PL9q98dJ4vVlBGjEwjvQsWOioAdkr15JkD2M66miMG/kSQgaaW4L2Wv ZKCC8cuiPkMWPDF6WORqhNbO3BI+6MxhB69dvGzEArXbCgWUyKnzP0R7GFW6epYFUaih xjlxCI7yvAc96LKKDJEosYUJs1xN43kl1IWaGvx2YbPQyVAML/kG26Krm0YqJgK+mP0h bLXgHwC5FLfH1gRDoZA4j8ZvYg67sc7Q7hL0rBIomzDP4F8xc/9g89q02BknwJTS3RJz UM44d2VpQHZu7sCoEWTbR1RDH6Jt4J6LWmyKSK7Cx61jCAn/jk/1lnlI1mDlDhtdZVX4 /5AQ== X-Received: by 10.66.148.67 with SMTP id tq3mr47029689pab.124.1448407008322; Tue, 24 Nov 2015 15:16:48 -0800 (PST) Received: from circle.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id a23sm16513661pfj.46.2015.11.24.15.16.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Nov 2015 15:16:47 -0800 (PST) From: Rashmica Gupta To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH] powerpc: Fix xmon ml command to work with 64 bit values. Date: Wed, 25 Nov 2015 10:16:33 +1100 Message-Id: <1448406993-7888-1-git-send-email-rashmicy@gmail.com> X-Mailer: git-send-email 2.5.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jwboyer@linux.vnet.ibm.com MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The ml command in xmon currently only works for 32-bit values and so fails to find 64-bit values on a ppc64 machine. So change to work for 64-bit values. This is based off a patch by Josh Boyer. Signed-off-by: Rashmica Gupta --- Based off this patch: http://patchwork.ozlabs.org/patch/90309/ arch/powerpc/xmon/xmon.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index 786bf01691c9..df05bd2fca07 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c @@ -184,6 +184,12 @@ extern void xmon_leave(void); #define GETWORD(v) (((v)[0] << 24) + ((v)[1] << 16) + ((v)[2] << 8) + (v)[3]) #endif +#if BITS_PER_LONG == 64 +#define GETLONG(v) (((unsigned long) GETWORD(v)) << 32 | GETWORD(v+4)) +#else +#define GETLONG(v) GETWORD(v) +#endif + static char *help_string = "\ Commands:\n\ b show breakpoints\n\ @@ -2447,14 +2453,15 @@ memdiffs(unsigned char *p1, unsigned char *p2, unsigned nb, unsigned maxpr) printf("Total of %d differences\n", prt); } -static unsigned mend; -static unsigned mask; +static unsigned long mend; +static unsigned long mask; static void memlocate(void) { - unsigned a, n; - unsigned char val[4]; + unsigned long a, n; + int size = sizeof(unsigned long); + unsigned char val[size]; last_cmd = "ml"; scanhex((void *)&mdest); @@ -2470,10 +2477,10 @@ memlocate(void) } } n = 0; - for (a = mdest; a < mend; a += 4) { - if (mread(a, val, 4) == 4 - && ((GETWORD(val) ^ mval) & mask) == 0) { - printf("%.16x: %.16x\n", a, GETWORD(val)); + for (a = mdest; a < mend; a += size) { + if (mread(a, val, size) == size + && ((GETLONG(val) ^ mval) & mask) == 0){ + printf("%.16lx: %.16lx\n", a, GETLONG(val)); if (++n >= 10) break; }