From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 67321 invoked by alias); 30 Mar 2016 01:08:18 -0000 Mailing-List: contact binutils-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sourceware.org Received: (qmail 67228 invoked by uid 89); 30 Mar 2016 01:08:17 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 spammy=lda, xxx X-HELO: paperclip.tbsaunde.org Received: from tbsaunde.org (HELO paperclip.tbsaunde.org) (66.228.47.254) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 30 Mar 2016 01:08:09 +0000 Received: from keg.corp.tor1.mozilla.com (unknown [66.207.193.21]) by paperclip.tbsaunde.org (Postfix) with ESMTPSA id B2187C13F; Wed, 30 Mar 2016 01:07:59 +0000 (UTC) From: tbsaunde+binutils@tbsaunde.org To: binutils@sourceware.org Cc: Trevor Saunders Subject: [PATCH 5/7] tc-i960.c: add some casts when assigning literals to args[i] Date: Wed, 30 Mar 2016 01:08:00 -0000 Message-Id: <1459300381-19313-6-git-send-email-tbsaunde+binutils@tbsaunde.org> In-Reply-To: <1459300381-19313-1-git-send-email-tbsaunde+binutils@tbsaunde.org> References: <1459300381-19313-1-git-send-email-tbsaunde+binutils@tbsaunde.org> X-IsSubscribed: yes X-SW-Source: 2016-03/txt/msg00401.txt.bz2 From: Trevor Saunders parse_ldconst () takes a char ** as a in / out argument, and sometimes points args[0] to a constant string. Then in some cases after parse_ldconst () returns md_assemble () twiddles the contents of arg[0]. So it seems like it would take some work to avoid these casts, and its not really clear that work is worth it. gas/ChangeLog: 2016-03-29 Trevor Saunders * config/tc-i960.c (parse_ldconst): Cast to char * when assigning to args[0]. --- gas/config/tc-i960.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gas/config/tc-i960.c b/gas/config/tc-i960.c index 45e8a44..667ab4c 100644 --- a/gas/config/tc-i960.c +++ b/gas/config/tc-i960.c @@ -1246,7 +1246,7 @@ parse_ldconst (char *arg[]) /* See above. */ { default: /* We're dependent on one or more symbols -- use "lda". */ - arg[0] = "lda"; + arg[0] = (char *) "lda"; break; case O_constant: @@ -1263,26 +1263,26 @@ parse_ldconst (char *arg[]) /* See above. */ lda xxx,. */ n = offs (e); if ((0 <= n) && (n <= 31)) - arg[0] = "mov"; + arg[0] = (char *) "mov"; else if ((-31 <= n) && (n <= -1)) { - arg[0] = "subo"; + arg[0] = (char *) "subo"; arg[3] = arg[2]; sprintf (buf, "%d", -n); arg[1] = buf; - arg[2] = "0"; + arg[2] = (char *) "0"; } else if ((32 <= n) && (n <= 62)) { - arg[0] = "addo"; + arg[0] = (char *) "addo"; arg[3] = arg[2]; - arg[1] = "31"; + arg[1] = (char *) "31"; sprintf (buf, "%d", n - 31); arg[2] = buf; } else if ((shift = shift_ok (n)) != 0) { - arg[0] = "shlo"; + arg[0] = (char *) "shlo"; arg[3] = arg[2]; sprintf (buf, "%d", shift); arg[1] = buf; @@ -1290,7 +1290,7 @@ parse_ldconst (char *arg[]) /* See above. */ arg[2] = buf2; } else - arg[0] = "lda"; + arg[0] = (char *) "lda"; break; case O_illegal: -- 2.1.4