From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 127205 invoked by alias); 23 Nov 2016 22:11:25 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 120114 invoked by uid 89); 23 Nov 2016 22:11:16 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 spammy=H*RU:74.125.83.66, Hx-spam-relays-external:74.125.83.66, 8377, 7847 X-HELO: mail-pg0-f66.google.com Received: from mail-pg0-f66.google.com (HELO mail-pg0-f66.google.com) (74.125.83.66) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 23 Nov 2016 22:11:12 +0000 Received: by mail-pg0-f66.google.com with SMTP id 3so1928601pgd.0 for ; Wed, 23 Nov 2016 14:11:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zudAMNe7wx2kxC04BnMTabnuIpl2oUpzgAsngzPHmqo=; b=TM/T8yRuSRmkgQGtcvpjC7aJyYrnoLbvu4hmVE6747xRQKV25E2syECN4OJjQx7bwX QQmRQtYlF+YSqcYzA0q6NLFNYu/+mIzDtrZP3R5HuGRhIwgbKyJfuszS7ZegSiiiQzfg +VrEb6louYt+ciwA5Y0f+HSBOMIHktS10pCPjgXIQJnkiYFa6R57ld2uYQLk7P61CD+z NlyXELgHxoLdW9gRbZiad0LtPDBIe34eOvZNs33pGO+v0jM6kPOgnhdmxaPaW08LLpqt zjcOl/jP/t3GgqGwBV+CkVAa0wiM06+mNYK7as3Hvree0BBJvahOH6pGp6gW1VOxS8pf OSWw== X-Gm-Message-State: AKaTC00WkC31EQUsZ4yamD6tkZuNhliENHsEcP1jM11hP/Yrxl4zSYerwMBhSZipHABhlA== X-Received: by 10.84.143.162 with SMTP id 31mr11331660plz.2.1479939071090; Wed, 23 Nov 2016 14:11:11 -0800 (PST) Received: from lianli.shorne-pla.net (z14.124-44-185.ppp.wakwak.ne.jp. [124.44.185.14]) by smtp.gmail.com with ESMTPSA id z9sm37060201pge.44.2016.11.23.14.11.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Nov 2016 14:11:10 -0800 (PST) Received: from lianli.shorne-pla.net (localhost [127.0.0.1]) by lianli.shorne-pla.net (8.15.2/8.15.2) with ESMTPS id uANMB7ek001450 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 24 Nov 2016 07:11:07 +0900 Received: (from shorne@localhost) by lianli.shorne-pla.net (8.15.2/8.15.2/Submit) id uANMB7g9001449; Thu, 24 Nov 2016 07:11:07 +0900 From: Stafford Horne To: gdb-patches@sourceware.org Cc: openrisc@lists.librecores.org, Franck Jullien Subject: [PATCH 06/18] gdb: or1k: set gdbarch num regs to gpr + spr regs Date: Wed, 23 Nov 2016 22:14:00 -0000 Message-Id: <1479939044-1341-7-git-send-email-shorne@gmail.com> In-Reply-To: <1479939044-1341-1-git-send-email-shorne@gmail.com> References: <1479939044-1341-1-git-send-email-shorne@gmail.com> X-IsSubscribed: yes X-SW-Source: 2016-11/txt/msg00712.txt.bz2 From: Franck Jullien Add a definition for SPR maximum number (OR1K_MAX_SPR_REGS). This value is set to 64K (32 groups of 2048 registers). gdb/ChangeLog: * or1k-tdep.c: use OR1K_MAX_SPR_REGS * or1k-tdep.h: add OR1K_MAX_SPR_REGS --- gdb/or1k-tdep.c | 6 +++--- gdb/or1k-tdep.h | 14 ++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gdb/or1k-tdep.c b/gdb/or1k-tdep.c index d660a39..1a3c16b 100644 --- a/gdb/or1k-tdep.c +++ b/gdb/or1k-tdep.c @@ -684,7 +684,7 @@ static const char * or1k_register_name (struct gdbarch *gdbarch, int regnum) { - static char *or1k_gdb_reg_names[OR1K_TOTAL_NUM_REGS] = + static char *or1k_gdb_reg_names[OR1K_NUM_REGS_CACHED] = { /* general purpose registers */ "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", @@ -784,7 +784,7 @@ or1k_registers_info (struct gdbarch *gdbarch, if (-1 == regnum) { /* Do all (valid) registers */ - unsigned int lim = all ? OR1K_NUM_REGS : OR1K_MAX_GPR_REGS; + unsigned int lim = all ? OR1K_NUM_REGS_CACHED : OR1K_MAX_GPR_REGS; for (regnum = 0; regnum < lim; regnum++) { if ('\0' != *(or1k_register_name (gdbarch, regnum))) @@ -837,7 +837,7 @@ or1k_register_reggroup_p (struct gdbarch *gdbarch, if (group == all_reggroup) { return ((regnum >= 0) && - (regnum < OR1K_TOTAL_NUM_REGS) && + (regnum < OR1K_NUM_REGS_CACHED) && (or1k_register_name (gdbarch, regnum)[0] != '\0')); } diff --git a/gdb/or1k-tdep.h b/gdb/or1k-tdep.h index 3179537..f0afc8f 100644 --- a/gdb/or1k-tdep.h +++ b/gdb/or1k-tdep.h @@ -317,19 +317,21 @@ #define OR1K_SPR_DCFGR_WPCI 0x00000008 /* Watchpoint ctrs implemented */ /* Properties of the architecture. GDB mapping of registers is all the GPRs - followed by the PPC, NPC and SR at the end. Red zone is the area past the - end of the stack reserved for exception handlers etc. */ -#define OR1K_MAX_GPR_REGS 32 + and SPRs followed by the PPC, NPC and SR at the end. Red zone is the area + past the end of the stack reserved for exception handlers etc. */ +#define OR1K_MAX_GPR_REGS 32 +#define OR1K_MAX_SPR_REGS (32 * 2048) #define OR1K_NUM_PSEUDO_REGS 0 -#define OR1K_NUM_REGS (OR1K_MAX_GPR_REGS + 3) +#define OR1K_NUM_REGS_CACHED (OR1K_MAX_GPR_REGS + 3) +#define OR1K_NUM_REGS (OR1K_NUM_REGS_CACHED + OR1K_MAX_SPR_REGS) #define OR1K_TOTAL_NUM_REGS (OR1K_NUM_REGS + OR1K_NUM_PSEUDO_REGS) #define OR1K_MAX_MATCHPOINTS 8 #define OR1K_MAX_HW_WATCHES OR1K_MAX_MATCHPOINTS #define OR1K_STACK_ALIGN 4 #define OR1K_INSTLEN 4 -#define OR1K_INSTBITLEN (OR1K_INSTLEN * 8) +#define OR1K_INSTBITLEN (OR1K_INSTLEN * 8) #define OR1K_NUM_TAP_RECORDS 8 -#define OR1K_FRAME_RED_ZONE_SIZE 2536 +#define OR1K_FRAME_RED_ZONE_SIZE 2536 /* OR1K exception vectors */ -- 2.7.4