From patchwork Wed Mar 26 01:12:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sandra Loosemore X-Patchwork-Id: 287 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx22.g.dreamhost.com (caibbdcaabij.dreamhost.com [208.113.200.189]) by wilcox.dreamhost.com (Postfix) with ESMTP id 83E8A3600E8 for ; Tue, 25 Mar 2014 18:12:43 -0700 (PDT) Received: by homiemail-mx22.g.dreamhost.com (Postfix, from userid 14314964) id 32A694F9E99B; Tue, 25 Mar 2014 18:12:43 -0700 (PDT) X-Original-To: gdb@patchwork.siddhesh.in Delivered-To: x14314964@homiemail-mx22.g.dreamhost.com Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by homiemail-mx22.g.dreamhost.com (Postfix) with ESMTPS id 06A2E4F9E98A for ; Tue, 25 Mar 2014 18:12:42 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:date:from:mime-version:to:subject :content-type; q=dns; s=default; b=jTx60HoPm/i89lFgmdr5VtHPM8Ns8 Sy/lf+0vX9Vf2rEYikHjiWJw9Piu9eBuVhmHjRD5xEwOGPrG0PsKFRJjCr0fkRIm h2MarJoUqsgdXMpv1XW5Ee0T79RQbF/+awm9HgyYF+EaWHnNy6ITLSL2dbEQqehT DVMZLKJbaqJfH8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:date:from:mime-version:to:subject :content-type; s=default; bh=fKYahq5/W0Sq2GyGlvB9pYgEKPE=; b=Jsy gWIZ+D9K9uG9V0SS6fjnnJaQNCXSF1XAGRKyzofJw9ebFel7Z2Tbeyu9UDTjEsdh Q/7cxMoGU+5ibp/hr+MxXq6xM5BKQCffky3WEv2d4MA/kMfQd7Pnq70XwBprsQay YVAo1bKDTGr2ymF6DNSsm6ncPzk4vmjg6RTCFVB0= Received: (qmail 16142 invoked by alias); 26 Mar 2014 01:12:40 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 16112 invoked by uid 89); 26 Mar 2014 01:12:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.4 required=5.0 tests=AWL, BAYES_00, UNWANTED_LANGUAGE_BODY autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 26 Mar 2014 01:12:38 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1WScOR-0000Z5-44 from Sandra_Loosemore@mentor.com for gdb-patches@sourceware.org; Tue, 25 Mar 2014 18:12:35 -0700 Received: from SVR-ORW-FEM-06.mgc.mentorg.com ([147.34.97.120]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Tue, 25 Mar 2014 18:12:35 -0700 Received: from [IPv6:::1] (147.34.91.1) by SVR-ORW-FEM-06.mgc.mentorg.com (147.34.97.120) with Microsoft SMTP Server id 14.2.247.3; Tue, 25 Mar 2014 18:12:34 -0700 Message-ID: <53322976.1040804@codesourcery.com> Date: Tue, 25 Mar 2014 19:12:22 -0600 From: Sandra Loosemore User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130329 Thunderbird/17.0.5 MIME-Version: 1.0 To: , Yao Qi Subject: [patch, nios2] fix type of "fp" and other registers X-DH-Original-To: gdb@patchwork.siddhesh.in I noticed that the test "gdb.base/pc-fp.exp: info register pc fp" was failing on Nios II targets because fp prints in decimal format while the test is expecting hex. The attached patch fixes that by giving register "fp" type "data_ptr" rather than "uint32". While I was at it, I've made similar corrections to "gp", "ea", and "ra" (respectively, the global pointer, exception address, and return address registers). OK for mainline? -Sandra diff --git a/gdb/features/nios2-cpu.xml b/gdb/features/nios2-cpu.xml index 7f0d449..8fb5246 100644 --- a/gdb/features/nios2-cpu.xml +++ b/gdb/features/nios2-cpu.xml @@ -33,12 +33,12 @@ - + - - + + - + diff --git a/gdb/features/nios2-linux.c b/gdb/features/nios2-linux.c index ea61cf8..3288f79 100644 --- a/gdb/features/nios2-linux.c +++ b/gdb/features/nios2-linux.c @@ -43,12 +43,12 @@ initialize_tdesc_nios2_linux (void) tdesc_create_reg (feature, "r23", 23, 1, NULL, 32, "uint32"); tdesc_create_reg (feature, "et", 24, 1, NULL, 32, "uint32"); tdesc_create_reg (feature, "bt", 25, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "gp", 26, 1, NULL, 32, "uint32"); + tdesc_create_reg (feature, "gp", 26, 1, NULL, 32, "data_ptr"); tdesc_create_reg (feature, "sp", 27, 1, NULL, 32, "data_ptr"); - tdesc_create_reg (feature, "fp", 28, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "ea", 29, 1, NULL, 32, "uint32"); + tdesc_create_reg (feature, "fp", 28, 1, NULL, 32, "data_ptr"); + tdesc_create_reg (feature, "ea", 29, 1, NULL, 32, "code_ptr"); tdesc_create_reg (feature, "sstatus", 30, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "ra", 31, 1, NULL, 32, "uint32"); + tdesc_create_reg (feature, "ra", 31, 1, NULL, 32, "code_ptr"); tdesc_create_reg (feature, "pc", 32, 1, NULL, 32, "code_ptr"); tdesc_create_reg (feature, "status", 33, 1, NULL, 32, "uint32"); tdesc_create_reg (feature, "estatus", 34, 1, NULL, 32, "uint32"); diff --git a/gdb/features/nios2.c b/gdb/features/nios2.c index 8e0049d..0cedc12 100644 --- a/gdb/features/nios2.c +++ b/gdb/features/nios2.c @@ -41,12 +41,12 @@ initialize_tdesc_nios2 (void) tdesc_create_reg (feature, "r23", 23, 1, NULL, 32, "uint32"); tdesc_create_reg (feature, "et", 24, 1, NULL, 32, "uint32"); tdesc_create_reg (feature, "bt", 25, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "gp", 26, 1, NULL, 32, "uint32"); + tdesc_create_reg (feature, "gp", 26, 1, NULL, 32, "data_ptr"); tdesc_create_reg (feature, "sp", 27, 1, NULL, 32, "data_ptr"); - tdesc_create_reg (feature, "fp", 28, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "ea", 29, 1, NULL, 32, "uint32"); + tdesc_create_reg (feature, "fp", 28, 1, NULL, 32, "data_ptr"); + tdesc_create_reg (feature, "ea", 29, 1, NULL, 32, "code_ptr"); tdesc_create_reg (feature, "sstatus", 30, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "ra", 31, 1, NULL, 32, "uint32"); + tdesc_create_reg (feature, "ra", 31, 1, NULL, 32, "code_ptr"); tdesc_create_reg (feature, "pc", 32, 1, NULL, 32, "code_ptr"); tdesc_create_reg (feature, "status", 33, 1, NULL, 32, "uint32"); tdesc_create_reg (feature, "estatus", 34, 1, NULL, 32, "uint32");