From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 40676 invoked by alias); 8 Aug 2018 23:20:32 -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 40529 invoked by uid 89); 8 Aug 2018 23:20:31 -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=lend, 0x0c X-HELO: gateway33.websitewelcome.com Received: from gateway33.websitewelcome.com (HELO gateway33.websitewelcome.com) (192.185.145.4) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 08 Aug 2018 23:20:29 +0000 Received: from cm15.websitewelcome.com (cm15.websitewelcome.com [100.42.49.9]) by gateway33.websitewelcome.com (Postfix) with ESMTP id 622293DFF5 for ; Wed, 8 Aug 2018 18:20:26 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id nXkbfQDB0bXuJnXkdfp5E5; Wed, 08 Aug 2018 18:20:25 -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=GkvvvAxxPAnWjhfKNRSnFeDwyNRZSfg4T/oIrSDPJ2c=; b=rjHkmJKsozAoOJZTlX02N/tnJ3 alPYjOimG+aXZ8WBeQqj4tdNet3HmP9XgLsvMVQRepsIdJJXm+BUq4vwPWo4ZqqSPnQ1y3Pa7tqyy 6fD3VwxkbyRJoY08LHvqDHf8m; 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 1fnXka-0023IS-Pc; Wed, 08 Aug 2018 18:20:20 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 6/7] Avoid -Wnarrowing warnings in gdbserver Date: Wed, 08 Aug 2018 23:20:00 -0000 Message-Id: <20180808232016.12777-7-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/msg00187.txt.bz2 This avoids -Wnarrowing warnings in gdbserver, by introducing some casts to unsigned char. gdb/gdbserver/ChangeLog 2018-08-08 Tom Tromey * linux-s390-low.c (s390_emit_ext, s390_emit_litpool) (s390_emit_const, s390_emit_reg, s390_emit_zero_ext) (s390_emit_stack_adjust, s390_emit_set_r2, s390x_emit_ext) (s390x_emit_const, s390x_emit_reg, s390x_emit_zero_ext) (s390x_emit_stack_adjust): Add casts to unsigned char. --- gdb/gdbserver/ChangeLog | 8 ++++++ gdb/gdbserver/linux-s390-low.c | 56 ++++++++++++++++++++++++++++-------------- 2 files changed, 45 insertions(+), 19 deletions(-) diff --git a/gdb/gdbserver/linux-s390-low.c b/gdb/gdbserver/linux-s390-low.c index fff839bdd7..042a0f82d9 100644 --- a/gdb/gdbserver/linux-s390-low.c +++ b/gdb/gdbserver/linux-s390-low.c @@ -1605,8 +1605,8 @@ static void s390_emit_ext (int arg) { unsigned char buf[] = { - 0x8d, 0x20, 0x00, 64 - arg, /* sldl %r2, <64-arg> */ - 0x8e, 0x20, 0x00, 64 - arg, /* srda %r2, <64-arg> */ + 0x8d, 0x20, 0x00, (unsigned char) (64 - arg), /* sldl %r2, <64-arg> */ + 0x8e, 0x20, 0x00, (unsigned char) (64 - arg), /* srda %r2, <64-arg> */ }; add_insns (buf, sizeof buf); } @@ -1837,7 +1837,8 @@ s390_emit_litpool (int size) 0x07, 0x07, }; unsigned char buf[] = { - 0xa7, 0x15, 0x00, (size + 4) / 2, /* bras %r1, .Lend+size */ + 0xa7, 0x15, 0x00, + (unsigned char) ((size + 4) / 2), /* bras %r1, .Lend+size */ /* .Lend: */ }; if (size == 4) @@ -1861,8 +1862,11 @@ s390_emit_const (LONGEST num) { unsigned long long n = num; unsigned char buf_s[] = { - 0xa7, 0x38, num >> 8, num, /* lhi %r3, */ - 0x17, 0x22, /* xr %r2, %r2 */ + /* lhi %r3, */ + 0xa7, 0x38, + (unsigned char) (num >> 8), (unsigned char) num, + /* xr %r2, %r2 */ + 0x17, 0x22, }; static const unsigned char buf_l[] = { 0x98, 0x23, 0x10, 0x00, /* lm %r2, %r3, 0(%r1) */ @@ -1902,8 +1906,10 @@ static void s390_emit_reg (int reg) { unsigned char bufpre[] = { - 0x18, 0x29, /* lr %r2, %r9 */ - 0xa7, 0x38, reg >> 8, reg, /* lhi %r3, */ + /* lr %r2, %r9 */ + 0x18, 0x29, + /* lhi %r3, */ + 0xa7, 0x38, (unsigned char) (reg >> 8), (unsigned char) reg, }; add_insns (bufpre, sizeof bufpre); s390_emit_call (get_raw_reg_func_addr ()); @@ -1939,8 +1945,8 @@ static void s390_emit_zero_ext (int arg) { unsigned char buf[] = { - 0x8d, 0x20, 0x00, 64 - arg, /* sldl %r2, <64-arg> */ - 0x8c, 0x20, 0x00, 64 - arg, /* srdl %r2, <64-arg> */ + 0x8d, 0x20, 0x00, (unsigned char) (64 - arg), /* sldl %r2, <64-arg> */ + 0x8c, 0x20, 0x00, (unsigned char) (64 - arg), /* srdl %r2, <64-arg> */ }; add_insns (buf, sizeof buf); } @@ -1965,7 +1971,9 @@ static void s390_emit_stack_adjust (int n) { unsigned char buf[] = { - 0xa7, 0xfa, n * 8 >> 8, n * 8, /* ahi %r15, 8*n */ + /* ahi %r15, 8*n */ + 0xa7, 0xfa, + (unsigned char ) (n * 8 >> 8), (unsigned char) (n * 8), }; add_insns (buf, sizeof buf); } @@ -1976,7 +1984,8 @@ static void s390_emit_set_r2 (int arg1) { unsigned char buf_s[] = { - 0xa7, 0x28, arg1 >> 8, arg1, /* lhi %r2, */ + /* lhi %r2, */ + 0xa7, 0x28, (unsigned char) (arg1 >> 8), (unsigned char) arg1, }; static const unsigned char buf_l[] = { 0x58, 0x20, 0x10, 0x00, /* l %r2, 0(%r1) */ @@ -2330,8 +2339,10 @@ static void s390x_emit_ext (int arg) { unsigned char buf[] = { - 0xeb, 0x22, 0x00, 64 - arg, 0x00, 0x0d, /* sllg %r2, %r2, <64-arg> */ - 0xeb, 0x22, 0x00, 64 - arg, 0x00, 0x0a, /* srag %r2, %r2, <64-arg> */ + /* sllg %r2, %r2, <64-arg> */ + 0xeb, 0x22, 0x00, (unsigned char) (64 - arg), 0x00, 0x0d, + /* srag %r2, %r2, <64-arg> */ + 0xeb, 0x22, 0x00, (unsigned char) (64 - arg), 0x00, 0x0a, }; add_insns (buf, sizeof buf); } @@ -2499,7 +2510,8 @@ s390x_emit_const (LONGEST num) { unsigned long long n = num; unsigned char buf_s[] = { - 0xa7, 0x29, num >> 8, num, /* lghi %r2, */ + /* lghi %r2, */ + 0xa7, 0x29, (unsigned char) (num >> 8), (unsigned char) num, }; static const unsigned char buf_l[] = { 0xe3, 0x20, 0x10, 0x00, 0x00, 0x04, /* lg %r2, 0(%r1) */ @@ -2539,8 +2551,10 @@ static void s390x_emit_reg (int reg) { unsigned char buf[] = { - 0xb9, 0x04, 0x00, 0x29, /* lgr %r2, %r9 */ - 0xa7, 0x39, reg >> 8, reg, /* lghi %r3, */ + /* lgr %r2, %r9 */ + 0xb9, 0x04, 0x00, 0x29, + /* lghi %r3, */ + 0xa7, 0x39, (unsigned char) (reg >> 8), (unsigned char) reg, }; add_insns (buf, sizeof buf); s390x_emit_call (get_raw_reg_func_addr ()); @@ -2576,8 +2590,10 @@ static void s390x_emit_zero_ext (int arg) { unsigned char buf[] = { - 0xeb, 0x22, 0x00, 64 - arg, 0x00, 0x0d, /* sllg %r2, %r2, <64-arg> */ - 0xeb, 0x22, 0x00, 64 - arg, 0x00, 0x0c, /* srlg %r2, %r2, <64-arg> */ + /* sllg %r2, %r2, <64-arg> */ + 0xeb, 0x22, 0x00, (unsigned char) (64 - arg), 0x00, 0x0d, + /* srlg %r2, %r2, <64-arg> */ + 0xeb, 0x22, 0x00, (unsigned char) (64 - arg), 0x00, 0x0c, }; add_insns (buf, sizeof buf); } @@ -2601,7 +2617,9 @@ static void s390x_emit_stack_adjust (int n) { unsigned char buf[] = { - 0xa7, 0xfb, n * 8 >> 8, n * 8, /* aghi %r15, 8*n */ + /* aghi %r15, 8*n */ + 0xa7, 0xfb, + (unsigned char) (n * 8 >> 8), (unsigned char) (n * 8), }; add_insns (buf, sizeof buf); } -- 2.13.6