From patchwork Fri Nov 3 17:05:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 24074 Received: (qmail 41851 invoked by alias); 3 Nov 2017 17:05:25 -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 41842 invoked by uid 89); 3 Nov 2017 17:05:24 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: gateway23.websitewelcome.com Received: from gateway23.websitewelcome.com (HELO gateway23.websitewelcome.com) (192.185.50.164) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 03 Nov 2017 17:05:21 +0000 Received: from cm10.websitewelcome.com (cm10.websitewelcome.com [100.42.49.4]) by gateway23.websitewelcome.com (Postfix) with ESMTP id 95C1116271 for ; Fri, 3 Nov 2017 12:05:20 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id AfPEeXxzVpOTvAfPEeJLht; Fri, 03 Nov 2017 12:05:20 -0500 Received: from 71-218-90-63.hlrn.qwest.net ([71.218.90.63]:35568 helo=bapiya) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1eAfPE-000tsR-CL; Fri, 03 Nov 2017 12:05:20 -0500 From: Tom Tromey To: Simon Marchi Cc: Tom Tromey , gdb-patches@sourceware.org Subject: Re: [RFA 07/13] Use gdb::def_vector in sparc64-tdep.c References: <20171102223612.3642-1-tom@tromey.com> <20171102223612.3642-8-tom@tromey.com> <1cdab7f9cb24473379526465f490770b@polymtl.ca> Date: Fri, 03 Nov 2017 11:05:19 -0600 In-Reply-To: <1cdab7f9cb24473379526465f490770b@polymtl.ca> (Simon Marchi's message of "Thu, 02 Nov 2017 21:25:34 -0400") Message-ID: <87a803uwc0.fsf@tromey.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.60 (gnu/linux) MIME-Version: 1.0 X-BWhitelist: no X-Source-L: No X-Exim-ID: 1eAfPE-000tsR-CL X-Source-Sender: 71-218-90-63.hlrn.qwest.net (bapiya) [71.218.90.63]:35568 X-Source-Auth: tom+tromey.com X-Email-Count: 2 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes >>>>> "Simon" == Simon Marchi writes: Simon> It seems to me like the code doesn't use this as text, but binary Simon> data. So it should probably have used gdb_byte in the first place. I Simon> would then suggest using gdb::byte_vector (if you agree that gdb_byte Simon> should be used here). For consistency I changed the callees as well. Tom commit 0cd1a0cc08838934771cb8c4aa556dde7ee66f01 Author: Tom Tromey Date: Wed Nov 1 16:37:27 2017 -0600 Use gdb::def_vector in sparc64-tdep.c This removes a cleanup from sparc64-tdep.c, replacing it with gdb::def_vector. gdb/ChangeLog 2017-11-03 Tom Tromey * sparc64-tdep.c (do_examine): Use gdb::def_vector. (adi_read_versions): Change "tags" to "gdb_byte *". (adi_print_versions): Likewise. diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 56b7e903bc..8f663938cb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2017-11-03 Tom Tromey + * sparc64-tdep.c (do_examine): Use gdb::def_vector. + (adi_read_versions): Change "tags" to "gdb_byte *". + (adi_print_versions): Likewise. + +2017-11-03 Tom Tromey + * breakpoint.c (scoped_rbreak_breakpoints::scoped_rbreak_breakpoints): Rename from start_rbreak_breakpoints. diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c index a756834cba..eade0461d5 100644 --- a/gdb/sparc64-tdep.c +++ b/gdb/sparc64-tdep.c @@ -341,7 +341,7 @@ adi_is_addr_mapped (CORE_ADDR vaddr, size_t cnt) for "SIZE" number of bytes. */ static int -adi_read_versions (CORE_ADDR vaddr, size_t size, unsigned char *tags) +adi_read_versions (CORE_ADDR vaddr, size_t size, gdb_byte *tags) { int fd = adi_tag_fd (); if (fd == -1) @@ -383,7 +383,7 @@ adi_write_versions (CORE_ADDR vaddr, size_t size, unsigned char *tags) at "VADDR" with number of "CNT". */ static void -adi_print_versions (CORE_ADDR vaddr, size_t cnt, unsigned char *tags) +adi_print_versions (CORE_ADDR vaddr, size_t cnt, gdb_byte *tags) { int v_idx = 0; const int maxelts = 8; /* # of elements per line */ @@ -415,21 +415,17 @@ static void do_examine (CORE_ADDR start, int bcnt) { CORE_ADDR vaddr = adi_normalize_address (start); - struct cleanup *cleanup; CORE_ADDR vstart = adi_align_address (vaddr); int cnt = adi_convert_byte_count (vaddr, bcnt, vstart); - unsigned char *buf = (unsigned char *) xmalloc (cnt); - cleanup = make_cleanup (xfree, buf); - int read_cnt = adi_read_versions (vstart, cnt, buf); + gdb::def_vector buf (cnt); + int read_cnt = adi_read_versions (vstart, cnt, buf.data ()); if (read_cnt == -1) error (_("No ADI information")); else if (read_cnt < cnt) error(_("No ADI information at %s"), paddress (target_gdbarch (), vaddr)); - adi_print_versions (vstart, cnt, buf); - - do_cleanups (cleanup); + adi_print_versions (vstart, cnt, buf.data ()); } static void