From patchwork Mon Jun 22 00:44:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amitay Isaacs X-Patchwork-Id: 1314030 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49qrL56zy4z9sRN for ; Mon, 22 Jun 2020 10:45:33 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=ozlabs.org header.i=@ozlabs.org header.a=rsa-sha256 header.s=201707 header.b=UnAA1PpX; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 49qrL53xzBzDqbf for ; Mon, 22 Jun 2020 10:45:33 +1000 (AEST) X-Original-To: pdbg@lists.ozlabs.org Delivered-To: pdbg@lists.ozlabs.org Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 49qrKh4hX6zDqbf for ; Mon, 22 Jun 2020 10:45:12 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=ozlabs.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=ozlabs.org header.i=@ozlabs.org header.a=rsa-sha256 header.s=201707 header.b=UnAA1PpX; dkim-atps=neutral Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 49qrKh2pkfz9sSd; Mon, 22 Jun 2020 10:45:12 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ozlabs.org; s=201707; t=1592786712; bh=tYAQVLS/f9RqMNlVjOD0ww5Uk125X3pyR8vqTg8nI2M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UnAA1PpXIVZ4oggnWxZhcOoNkCAv7xa12ZV4fAMJZ+T0UpFJVp0tl/RfnaE9tueU3 RFPXQGdZTxTDyNCy/ZAz8ORs/8JbpKiDFOy33QwbnNqT11eVUv8L6r0pLJW6EWZkGi md4UBQMFz+aXABO1eDhZ3zWrgGVLiOTR1ORR0C+vEBTpjmMTInu2QNyMjTbPrmAYoW QIrX7Y5Za5kfAXp3X9wUuHXctcXtYKKN2yHKxr3Dpuj1Fr5LNg2dxX8KCxZUp+cAn7 vD6SvCg66IKH/MktA1XAS60L51ojgwMP9bg1KsYey6oqKgzWZw3cHXHbhOQ4DxSzy7 Z9A7a4GQLQwcw== From: Amitay Isaacs To: pdbg@lists.ozlabs.org Date: Mon, 22 Jun 2020 10:44:57 +1000 Message-Id: <20200622004501.12889-6-amitay@ozlabs.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200622004501.12889-1-amitay@ozlabs.org> References: <20200622004501.12889-1-amitay@ozlabs.org> MIME-Version: 1.0 Subject: [Pdbg] [PATCH 5/9] libpdbg: Use SPR definitions instead of hard-coded values X-BeenThere: pdbg@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "mailing list for https://github.com/open-power/pdbg development" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Amitay Isaacs Errors-To: pdbg-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Pdbg" Signed-off-by: Amitay Isaacs --- libpdbg/chip.c | 59 ++++++++++++++++++++++++------------------------ libpdbg/p8chip.c | 4 +--- libpdbg/p9chip.c | 5 ++-- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/libpdbg/chip.c b/libpdbg/chip.c index f0dd6bf..58eedeb 100644 --- a/libpdbg/chip.c +++ b/libpdbg/chip.c @@ -25,6 +25,7 @@ #include "operations.h" #include "bitutils.h" #include "debug.h" +#include "sprs.h" uint64_t mfspr(uint64_t reg, uint64_t spr) { @@ -559,16 +560,16 @@ int thread_getregs(struct pdbg_target *target, struct thread_regs *regs) thread_getnia(target, ®s->nia); printf("NIA : 0x%016" PRIx64 "\n", regs->nia); - thread_getspr(target, 28, ®s->cfar); + thread_getspr(target, SPR_CFAR, ®s->cfar); printf("CFAR : 0x%016" PRIx64 "\n", regs->cfar); thread_getmsr(target, ®s->msr); printf("MSR : 0x%016" PRIx64 "\n", regs->msr); - thread_getspr(target, 8, ®s->lr); + thread_getspr(target, SPR_LR, ®s->lr); printf("LR : 0x%016" PRIx64 "\n", regs->lr); - thread_getspr(target, 9, ®s->ctr); + thread_getspr(target, SPR_CTR, ®s->ctr); printf("CTR : 0x%016" PRIx64 "\n", regs->ctr); thread_getspr(target, 815, ®s->tar); @@ -588,85 +589,85 @@ int thread_getregs(struct pdbg_target *target, struct thread_regs *regs) printf("\n"); } - thread_getspr(target, 318, ®s->lpcr); + thread_getspr(target, SPR_LPCR, ®s->lpcr); printf("LPCR : 0x%016" PRIx64 "\n", regs->lpcr); - thread_getspr(target, 464, ®s->ptcr); + thread_getspr(target, SPR_PTCR, ®s->ptcr); printf("PTCR : 0x%016" PRIx64 "\n", regs->ptcr); - thread_getspr(target, 319, ®s->lpidr); + thread_getspr(target, SPR_LPIDR, ®s->lpidr); printf("LPIDR : 0x%016" PRIx64 "\n", regs->lpidr); - thread_getspr(target, 48, ®s->pidr); + thread_getspr(target, SPR_PIDR, ®s->pidr); printf("PIDR : 0x%016" PRIx64 "\n", regs->pidr); - thread_getspr(target, 190, ®s->hfscr); + thread_getspr(target, SPR_HFSCR, ®s->hfscr); printf("HFSCR : 0x%016" PRIx64 "\n", regs->hfscr); - thread_getspr(target, 306, &value); + thread_getspr(target, SPR_HDSISR, &value); regs->hdsisr = value; printf("HDSISR: 0x%08" PRIx32 "\n", regs->hdsisr); - thread_getspr(target, 307, ®s->hdar); + thread_getspr(target, SPR_HDAR, ®s->hdar); printf("HDAR : 0x%016" PRIx64 "\n", regs->hdar); - thread_getspr(target, 339, &value); + thread_getspr(target, SPR_HEIR, &value); regs->heir = value; printf("HEIR : 0x%016" PRIx32 "\n", regs->heir); - thread_getspr(target, 1008, ®s->hid); + thread_getspr(target, SPR_HID, ®s->hid); printf("HID0 : 0x%016" PRIx64 "\n", regs->hid); - thread_getspr(target, 314, ®s->hsrr0); + thread_getspr(target, SPR_HSRR0, ®s->hsrr0); printf("HSRR0 : 0x%016" PRIx64 "\n", regs->hsrr0); - thread_getspr(target, 315, ®s->hsrr1); + thread_getspr(target, SPR_HSRR1, ®s->hsrr1); printf("HSRR1 : 0x%016" PRIx64 "\n", regs->hsrr1); - thread_getspr(target, 310, ®s->hdec); + thread_getspr(target, SPR_HDEC, ®s->hdec); printf("HDEC : 0x%016" PRIx64 "\n", regs->hdec); - thread_getspr(target, 304, ®s->hsprg0); + thread_getspr(target, SPR_HSPRG0, ®s->hsprg0); printf("HSPRG0: 0x%016" PRIx64 "\n", regs->hsprg0); - thread_getspr(target, 305, ®s->hsprg1); + thread_getspr(target, SPR_HSPRG1, ®s->hsprg1); printf("HSPRG1: 0x%016" PRIx64 "\n", regs->hsprg1); - thread_getspr(target, 153, ®s->fscr); + thread_getspr(target, SPR_FSCR, ®s->fscr); printf("FSCR : 0x%016" PRIx64 "\n", regs->fscr); - thread_getspr(target, 18, &value); + thread_getspr(target, SPR_DSISR, &value); regs->dsisr = value; printf("DSISR : 0x%08" PRIx32 "\n", regs->dsisr); - thread_getspr(target, 19, ®s->dar); + thread_getspr(target, SPR_DAR, ®s->dar); printf("DAR : 0x%016" PRIx64 "\n", regs->dar); - thread_getspr(target, 26, ®s->srr0); + thread_getspr(target, SPR_SRR0, ®s->srr0); printf("SRR0 : 0x%016" PRIx64 "\n", regs->srr0); - thread_getspr(target, 27, ®s->srr1); + thread_getspr(target, SPR_SRR1, ®s->srr1); printf("SRR1 : 0x%016" PRIx64 "\n", regs->srr1); - thread_getspr(target, 22, ®s->dec); + thread_getspr(target, SPR_DEC, ®s->dec); printf("DEC : 0x%016" PRIx64 "\n", regs->dec); - thread_getspr(target, 268, ®s->tb); + thread_getspr(target, SPR_TB, ®s->tb); printf("TB : 0x%016" PRIx64 "\n", regs->tb); - thread_getspr(target, 272, ®s->sprg0); + thread_getspr(target, SPR_SPRG0, ®s->sprg0); printf("SPRG0 : 0x%016" PRIx64 "\n", regs->sprg0); - thread_getspr(target, 273, ®s->sprg1); + thread_getspr(target, SPR_SPRG1, ®s->sprg1); printf("SPRG1 : 0x%016" PRIx64 "\n", regs->sprg1); - thread_getspr(target, 274, ®s->sprg2); + thread_getspr(target, SPR_SPRG2, ®s->sprg2); printf("SPRG2 : 0x%016" PRIx64 "\n", regs->sprg2); - thread_getspr(target, 275, ®s->sprg3); + thread_getspr(target, SPR_SPRG3, ®s->sprg3); printf("SPRG3 : 0x%016" PRIx64 "\n", regs->sprg3); - thread_getspr(target, 896, ®s->ppr); + thread_getspr(target, SPR_PPR, ®s->ppr); printf("PPR : 0x%016" PRIx64 "\n", regs->ppr); CHECK_ERR(thread->ram_destroy(thread)); diff --git a/libpdbg/p8chip.c b/libpdbg/p8chip.c index 4a2061a..50ab143 100644 --- a/libpdbg/p8chip.c +++ b/libpdbg/p8chip.c @@ -25,6 +25,7 @@ #include "operations.h" #include "bitutils.h" #include "debug.h" +#include "sprs.h" #define RAS_STATUS_TIMEOUT 100 @@ -509,9 +510,6 @@ static int p8_ram_putxer(struct thread *thread, uint64_t value) return 0; } -#define SPR_SRR0 0x01a -#define SPR_SRR1 0x01b - #define HID0_HILE PPC_BIT(19) #define MSR_HV PPC_BIT(3) /* Hypervisor mode */ diff --git a/libpdbg/p9chip.c b/libpdbg/p9chip.c index 811bca6..abd2ab2 100644 --- a/libpdbg/p9chip.c +++ b/libpdbg/p9chip.c @@ -24,6 +24,7 @@ #include "operations.h" #include "bitutils.h" #include "debug.h" +#include "sprs.h" /* * NOTE! @@ -406,14 +407,14 @@ static int p9_ram_destroy(struct thread *thread) static int p9_ram_getxer(struct thread *thread, uint64_t *value) { - CHECK_ERR(thread_getspr(&thread->target, 1, value)); + CHECK_ERR(thread_getspr(&thread->target, SPR_XER, value)); return 0; } static int p9_ram_putxer(struct thread *thread, uint64_t value) { - CHECK_ERR(thread_putspr(&thread->target, 1, value)); + CHECK_ERR(thread_putspr(&thread->target, SPR_XER, value)); return 0;