From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4903 invoked by alias); 10 Jan 2017 09:29:31 -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 4882 invoked by uid 89); 10 Jan 2017 09:29:30 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: =?ISO-8859-1?Q?No, score=-1.5 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM,SPF_PASS autolearn=no version=3.3.2 spammy=H*r:AES128-SHA, =e5=b0=a7, HTo:D*oracle.com, H*MI:sk:3f087b3?= X-HELO: mail-wm0-f68.google.com Received: from mail-wm0-f68.google.com (HELO mail-wm0-f68.google.com) (74.125.82.68) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 10 Jan 2017 09:29:20 +0000 Received: by mail-wm0-f68.google.com with SMTP id c85so28053225wmi.1 for ; Tue, 10 Jan 2017 01:29:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=ganko3FAOMrW2sDg4pV5ffwC0FbYt32jJbF1Bkkj+Hs=; b=eJhpYEiKZp6CXsCiPB5vO+8amoCLhSgrfyrA38TKzIKJMmlkTqQWRz/Ijbo7Q17pD0 N7dhTSK+SPN/zshVZYz6K4liSK9vG14sSNqX4djpWxwq5pZwDkVuk1ynJzUHKPUTrC2S //pW6dIAaRVfc/UUO1JBgQ7CYVb9N+Ru9w4gzH0CMlt4XX1W6FCzEq1r9+DHmgwmsQX1 RPCJbqrm8T3m1iFz9MRJp9mphwlPR/txipgPRwzTY03hyAA2YdQQxKbfAGWGAxrzdRZB tPnFsy0g3ITscGPmaKt1S3ydnlaBQbXTXqr+7AVy+jNeQjFvyxvgOCPY2rTkUNeD3+mB vjOw== X-Gm-Message-State: AIkVDXI/VvAh/V3RBAelFx/Dl4n2gV83sJYfM9sHXBXR7U6TovkpED+19jvnS559M2z3+A== X-Received: by 10.28.0.2 with SMTP id 2mr1337234wma.141.1484040557520; Tue, 10 Jan 2017 01:29:17 -0800 (PST) Received: from E107787-LIN (gcc1-power7.osuosl.org. [140.211.15.137]) by smtp.gmail.com with ESMTPSA id bf2sm2148640wjc.48.2017.01.10.01.29.15 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 10 Jan 2017 01:29:16 -0800 (PST) Date: Tue, 10 Jan 2017 09:29:00 -0000 From: Yao Qi To: Ivo Raisr Cc: gdb-patches@sourceware.org Subject: Re: [PATCH] Bug 20936 - provide sparc and sparcv9 target description XML files Message-ID: <20170110092907.GD9518@E107787-LIN> References: <46200a1e-29f7-8e20-c0b5-3f6f25c82d45@oracle.com> <20161206152616.GC28789@E107787-LIN> <83d4c58d-0834-4fc2-6194-72408510aa8a@oracle.com> <20161212125331.GB25542@E107787-LIN> <082f9ac8-3e46-42cd-198d-91866d83ebb8@oracle.com> <20170105143109.GA21293@E107787-LIN> <20170109173515.GC9518@E107787-LIN> <3f087b35-96e1-47fa-7b98-6c7fb2ba31d5@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <3f087b35-96e1-47fa-7b98-6c7fb2ba31d5@oracle.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes X-SW-Source: 2017-01/txt/msg00143.txt.bz2 On 17-01-09 22:18:22, Ivo Raisr wrote: > ChangeLog entry: > 2017-01-09 Ivo Raisr > > Split real and pseudo registers. > * sparc-tdep.h: Separate real and pseudo registers. We describe the changes in the ChangeLog, so the change can be described like this: * sparc-tdep.h (SPARC_CORE_REGISTERS): New macro. (sparc32_pseudo_regnum): New enum. > * sparc64-tdep.h: Separate real and pseudo registers. * sparc64-tdep.h (sparc64_pseudo_regnum): New enum. > * sparc-tdep.c (sparc32_pseudo_register_name): New function returning > pseudo register names on sparc 32-bit. "New function" should be enough to describe the change. > (sparc32_register_name): Use sparc32_pseudo_register_name(). > (sparc32_pseudo_register_type): New function returning pseudo register > types on sparc 32-bit. > (sparc32_register_type): Use sparc32_pseudo_register_type(). > (sparc32_pseudo_register_read, sparc32_pseudo_register_write): Pseudo > registers may have different numbers. > * sparc64-tdep.c (sparc64_pseudo_register_name): New function returning > pseudo register names on sparc 64-bit. > (sparc64_register_name): Use sparc64_pseudo_register_name(). > (sparc64_pseudo_register_type): New function returning pseudo register > types on sparc 64-bit. > (sparc64_register_type): Use sparc64_pseudo_register_type(). > (sparc64_pseudo_register_read, sparc64_pseudo_register_write): Pseudo > registers may have different numbers. > (sparc64_store_floating_fields, sparc64_extract_floating_fields, > sparc64_store_arguments): Pseudo registers may have different numbers; > deal with it. > --- a/gdb/sparc-tdep.c 2016-02-09 19:19:39.000000000 +0000 > +++ gdb-7.11/gdb/sparc-tdep.c 2017-01-09 13:11:30.421265402 +0000 > @@ -295,20 +295,23 @@ sparc_structure_or_union_p (const struct > } > > /* Register information. */ > +#define SPARC32_FPU_REGISTERS \ > + "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", \ > + "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", \ > + "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23", \ > + "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31" > +#define SPARC32_CP0_REGISTERS \ > + "y", "psr", "wim", "tbr", "pc", "npc", "fsr", "csr" > + > +static const char *sparc_core_register_names[] = { SPARC_CORE_REGISTERS }; > +static const char *sparc32_fpu_register_names[] = { SPARC32_FPU_REGISTERS }; > +static const char *sparc32_cp0_register_names[] = { SPARC32_CP0_REGISTERS }; They are not used in this patch at all. Should be moved to patch #2. > > static const char *sparc32_register_names[] = > { > - "g0", "g1", "g2", "g3", "g4", "g5", "g6", "g7", > - "o0", "o1", "o2", "o3", "o4", "o5", "sp", "o7", > - "l0", "l1", "l2", "l3", "l4", "l5", "l6", "l7", > - "i0", "i1", "i2", "i3", "i4", "i5", "fp", "i7", > - > - "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", > - "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", > - "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23", > - "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31", > - > - "y", "psr", "wim", "tbr", "pc", "npc", "fsr", "csr" > + SPARC_CORE_REGISTERS, > + SPARC32_FPU_REGISTERS, > + SPARC32_CP0_REGISTERS > }; > > /* Total number of registers. */ > @@ -327,17 +330,26 @@ static const char *sparc32_pseudo_regist > #define SPARC32_NUM_PSEUDO_REGS ARRAY_SIZE (sparc32_pseudo_register_names) > > /* Return the name of register REGNUM. */ > +static const char * > +sparc32_pseudo_register_name (struct gdbarch *gdbarch, int regnum) Don't insert the new function between sparc32_register_name and its comments. We also need comments to sparc32_pseudo_register_name. /* Return the name of pseudo register REGNUM. */ static const char * sparc32_pseudo_register_name (struct gdbarch *gdbarch, int regnum) .... /* Return the name of register REGNUM. */ static const char * sparc32_register_name (struct gdbarch *gdbarch, int regnum) > /* Return the GDB type object for the "standard" data type of data in > register REGNUM. */ > +static struct type * > +sparc32_pseudo_register_type (struct gdbarch *gdbarch, int regnum) Likewise, don't insert sparc32_pseudo_register_type between sparc32_register_type and its type. > --- a/gdb/sparc64-tdep.c 2016-02-09 19:19:39.000000000 +0000 > +++ gdb-7.11/gdb/sparc64-tdep.c 2017-01-09 13:11:51.858903807 +0000 > @@ -226,28 +226,29 @@ sparc64_fprs_type (struct gdbarch *gdbar > > > /* Register information. */ > +#define SPARC64_FPU_REGISTERS \ > + "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", \ > + "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", \ > + "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23", \ > + "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31", \ > + "f32", "f34", "f36", "f38", "f40", "f42", "f44", "f46", \ > + "f48", "f50", "f52", "f54", "f56", "f58", "f60", "f62" > +#define SPARC64_CP0_REGISTERS \ > + "pc", "npc", \ > + /* FIXME: Give "state" a name until we start using register groups. */ \ > + "state", \ > + "fsr", \ > + "fprs", \ > + "y" > + > +static const char *sparc64_fpu_register_names[] = { SPARC64_FPU_REGISTERS }; > +static const char *sparc64_cp0_register_names[] = { SPARC64_CP0_REGISTERS }; They are not used, should be moved to patch #2. > @@ -273,28 +274,57 @@ static const char *sparc64_pseudo_regist > #define SPARC64_NUM_PSEUDO_REGS ARRAY_SIZE (sparc64_pseudo_register_names) > > /* Return the name of register REGNUM. */ > +static const char * > +sparc64_pseudo_register_name (struct gdbarch *gdbarch, int regnum) sparc64_pseudo_register_name is added between sparc64_register_name and its comments. > +{ > + regnum -= gdbarch_num_regs (gdbarch); > + > + if (regnum < SPARC64_NUM_PSEUDO_REGS) > + return sparc64_pseudo_register_names[regnum]; > + > + internal_error (__FILE__, __LINE__, > + _("sparc64_pseudo_register_name: bad register number %d"), > + regnum); > +} > > static const char * > sparc64_register_name (struct gdbarch *gdbarch, int regnum) > { > - if (regnum >= 0 && regnum < SPARC64_NUM_REGS) > + if (regnum >= 0 && regnum < gdbarch_num_regs (gdbarch)) > return sparc64_register_names[regnum]; > > - if (regnum >= SPARC64_NUM_REGS > - && regnum < SPARC64_NUM_REGS + SPARC64_NUM_PSEUDO_REGS) > - return sparc64_pseudo_register_names[regnum - SPARC64_NUM_REGS]; > - > - return NULL; > + return sparc64_pseudo_register_name (gdbarch, regnum); > } > > /* Return the GDB type object for the "standard" data type of data in > register REGNUM. */ > +static struct type * > +sparc64_pseudo_register_type (struct gdbarch *gdbarch, int regnum) Likewise. > +{ > + regnum -= gdbarch_num_regs (gdbarch); > + > + if (regnum == SPARC64_CWP_REGNUM) > + return builtin_type (gdbarch)->builtin_int64; > + if (regnum == SPARC64_PSTATE_REGNUM) > + return sparc64_pstate_type (gdbarch); > + if (regnum == SPARC64_ASI_REGNUM) > + return builtin_type (gdbarch)->builtin_int64; > + if (regnum == SPARC64_CCR_REGNUM) > + return builtin_type (gdbarch)->builtin_int64; > + if (regnum >= SPARC64_D0_REGNUM && regnum <= SPARC64_D62_REGNUM) > + return builtin_type (gdbarch)->builtin_double; > + if (regnum >= SPARC64_Q0_REGNUM && regnum <= SPARC64_Q60_REGNUM) > + return builtin_type (gdbarch)->builtin_long_double; > + > + internal_error (__FILE__, __LINE__, > + _("sparc64_pseudo_register_type: bad register number %d"), > + regnum); > +} > -- Yao (齐尧)