From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 40008 invoked by alias); 8 Aug 2018 23:20:28 -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 39917 invoked by uid 89); 8 Aug 2018 23:20:27 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.5 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=Hx-languages-length:4466 X-HELO: gateway20.websitewelcome.com Received: from gateway20.websitewelcome.com (HELO gateway20.websitewelcome.com) (192.185.4.169) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 08 Aug 2018 23:20:26 +0000 Received: from cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway20.websitewelcome.com (Postfix) with ESMTP id 71580400C8032 for ; Wed, 8 Aug 2018 18:20:24 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id nXkZf3WHYaSeynXkcfbQ9E; Wed, 08 Aug 2018 18:20:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=XOVEFRwuF4p/CD5MVervUkjR39dBbfxb0EBFT7c4fEE=; b=FTHY4x32GJFzTCvsTFfH8dLQZM rPOqbIiQ8QCX0wEG4B8LuRluYzdgbigFDBFTBXQi+2Dr3xXU9G/Iq3Q9BF5j81y0t2Al2G6IaG+2X nQxzSNUiCE0EzR83OAPQ8O2iC; Received: from 75-166-85-72.hlrn.qwest.net ([75.166.85.72]:57736 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1fnXkZ-0023IS-Dz; Wed, 08 Aug 2018 18:20:19 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 2/7] Use CORE_ADDR_MAX in various "breaks" arrays Date: Wed, 08 Aug 2018 23:20:00 -0000 Message-Id: <20180808232016.12777-3-tom@tromey.com> In-Reply-To: <20180808232016.12777-1-tom@tromey.com> References: <20180808232016.12777-1-tom@tromey.com> X-SW-Source: 2018-08/txt/msg00190.txt.bz2 Code like this: CORE_ADDR breaks[2] = {-1, -1}; ... gives a warning with -Wnarrowing. This patch changes all instances of this to use CORE_ADDR_MAX instead. gdb/ChangeLog 2018-08-08 Tom Tromey * rs6000-tdep.c (ppc_deal_with_atomic_sequence): Use CORE_ADDR_MAX. * mips-tdep.c (mips_deal_with_atomic_sequence) (micromips_deal_with_atomic_sequence): Use CORE_ADDR_MAX. * arch/arm-get-next-pcs.c (thumb_deal_with_atomic_sequence_raw) (arm_deal_with_atomic_sequence_raw): Use CORE_ADDR_MAX. * alpha-tdep.c (alpha_deal_with_atomic_sequence): Use CORE_ADDR_MAX. * aarch64-tdep.c (aarch64_software_single_step): Use CORE_ADDR_MAX. --- gdb/ChangeLog | 13 +++++++++++++ gdb/aarch64-tdep.c | 2 +- gdb/alpha-tdep.c | 2 +- gdb/arch/arm-get-next-pcs.c | 4 ++-- gdb/mips-tdep.c | 4 ++-- gdb/rs6000-tdep.c | 2 +- 6 files changed, 20 insertions(+), 7 deletions(-) diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c index 5c6eb98545..62f680e15c 100644 --- a/gdb/aarch64-tdep.c +++ b/gdb/aarch64-tdep.c @@ -2472,7 +2472,7 @@ aarch64_software_single_step (struct regcache *regcache) const int insn_size = 4; const int atomic_sequence_length = 16; /* Instruction sequence length. */ CORE_ADDR pc = regcache_read_pc (regcache); - CORE_ADDR breaks[2] = { -1, -1 }; + CORE_ADDR breaks[2] = { CORE_ADDR_MAX, CORE_ADDR_MAX }; CORE_ADDR loc = pc; CORE_ADDR closing_insn = 0; uint32_t insn = read_memory_unsigned_integer (loc, insn_size, diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c index 53943e1d77..e649bd2102 100644 --- a/gdb/alpha-tdep.c +++ b/gdb/alpha-tdep.c @@ -767,7 +767,7 @@ static const int stq_c_opcode = 0x2f; static std::vector alpha_deal_with_atomic_sequence (struct gdbarch *gdbarch, CORE_ADDR pc) { - CORE_ADDR breaks[2] = {-1, -1}; + CORE_ADDR breaks[2] = {CORE_ADDR_MAX, CORE_ADDR_MAX}; CORE_ADDR loc = pc; CORE_ADDR closing_insn; /* Instruction that closes the atomic sequence. */ unsigned int insn = alpha_read_insn (gdbarch, loc); diff --git a/gdb/arch/arm-get-next-pcs.c b/gdb/arch/arm-get-next-pcs.c index 1e63267038..3178bf311c 100644 --- a/gdb/arch/arm-get-next-pcs.c +++ b/gdb/arch/arm-get-next-pcs.c @@ -49,7 +49,7 @@ static std::vector thumb_deal_with_atomic_sequence_raw (struct arm_get_next_pcs *self) { int byte_order_for_code = self->byte_order_for_code; - CORE_ADDR breaks[2] = {-1, -1}; + CORE_ADDR breaks[2] = {CORE_ADDR_MAX, CORE_ADDR_MAX}; CORE_ADDR pc = regcache_read_pc (self->regcache); CORE_ADDR loc = pc; unsigned short insn1, insn2; @@ -187,7 +187,7 @@ static std::vector arm_deal_with_atomic_sequence_raw (struct arm_get_next_pcs *self) { int byte_order_for_code = self->byte_order_for_code; - CORE_ADDR breaks[2] = {-1, -1}; + CORE_ADDR breaks[2] = {CORE_ADDR_MAX, CORE_ADDR_MAX}; CORE_ADDR pc = regcache_read_pc (self->regcache); CORE_ADDR loc = pc; unsigned int insn; diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index 37a12a9f55..5e0a60625b 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -3910,7 +3910,7 @@ mips_addr_bits_remove (struct gdbarch *gdbarch, CORE_ADDR addr) static std::vector mips_deal_with_atomic_sequence (struct gdbarch *gdbarch, CORE_ADDR pc) { - CORE_ADDR breaks[2] = {-1, -1}; + CORE_ADDR breaks[2] = {CORE_ADDR_MAX, CORE_ADDR_MAX}; CORE_ADDR loc = pc; CORE_ADDR branch_bp; /* Breakpoint at branch instruction's destination. */ ULONGEST insn; @@ -4013,7 +4013,7 @@ micromips_deal_with_atomic_sequence (struct gdbarch *gdbarch, { const int atomic_sequence_length = 16; /* Instruction sequence length. */ int last_breakpoint = 0; /* Defaults to 0 (no breakpoints placed). */ - CORE_ADDR breaks[2] = {-1, -1}; + CORE_ADDR breaks[2] = {CORE_ADDR_MAX, CORE_ADDR_MAX}; CORE_ADDR branch_bp = 0; /* Breakpoint at branch instruction's destination. */ CORE_ADDR loc = pc; diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index e78de49b2e..5a3e65f211 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -989,7 +989,7 @@ ppc_deal_with_atomic_sequence (struct regcache *regcache) struct gdbarch *gdbarch = regcache->arch (); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); CORE_ADDR pc = regcache_read_pc (regcache); - CORE_ADDR breaks[2] = {-1, -1}; + CORE_ADDR breaks[2] = {CORE_ADDR_MAX, CORE_ADDR_MAX}; CORE_ADDR loc = pc; CORE_ADDR closing_insn; /* Instruction that closes the atomic sequence. */ int insn = read_memory_integer (loc, PPC_INSN_SIZE, byte_order); -- 2.13.6