From patchwork Thu Sep 22 14:26:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Edjunior Barbosa Machado X-Patchwork-Id: 15925 Received: (qmail 64855 invoked by alias); 22 Sep 2016 14:27:44 -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 64831 invoked by uid 89); 22 Sep 2016 14:27:43 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.6 required=5.0 tests=BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_LOW autolearn=no version=3.3.2 spammy=ppc_rb, PPC_RB, disturbance, notified X-HELO: mx0a-001b2d01.pphosted.com Received: from mx0b-001b2d01.pphosted.com (HELO mx0a-001b2d01.pphosted.com) (148.163.158.5) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 22 Sep 2016 14:27:41 +0000 Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u8MEIMNu114028 for ; Thu, 22 Sep 2016 10:27:40 -0400 Received: from e24smtp02.br.ibm.com (e24smtp02.br.ibm.com [32.104.18.86]) by mx0a-001b2d01.pphosted.com with ESMTP id 25me2gvpwe-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 22 Sep 2016 10:27:40 -0400 Received: from localhost by e24smtp02.br.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 22 Sep 2016 11:27:36 -0300 Received: from d24dlp01.br.ibm.com (9.18.248.204) by e24smtp02.br.ibm.com (10.172.0.142) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 22 Sep 2016 11:27:35 -0300 Received: from d24relay01.br.ibm.com (d24relay01.br.ibm.com [9.8.31.16]) by d24dlp01.br.ibm.com (Postfix) with ESMTP id A31C33520068 for ; Thu, 22 Sep 2016 10:27:10 -0400 (EDT) Received: from d24av05.br.ibm.com (d24av05.br.ibm.com [9.18.232.44]) by d24relay01.br.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u8MERYUN4858026 for ; Thu, 22 Sep 2016 11:27:34 -0300 Received: from d24av05.br.ibm.com (localhost [127.0.0.1]) by d24av05.br.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u8MERYhX014990 for ; Thu, 22 Sep 2016 11:27:34 -0300 Received: from dawn.ibm.com ([9.78.145.200]) by d24av05.br.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u8MERXGH014975; Thu, 22 Sep 2016 11:27:33 -0300 From: Edjunior Barbosa Machado To: gdb-patches@sourceware.org Cc: Edjunior Barbosa Machado , Ulrich Weigand Subject: [PATCH] Fix build breakage from commit 6ec2b2 Date: Thu, 22 Sep 2016 11:26:41 -0300 In-Reply-To: <1474473422-16301-1-git-send-email-emachado@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16092214-0020-0000-0000-00000246A57E X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16092214-0021-0000-0000-00003043D209 Message-Id: <1474554401-27177-1-git-send-email-emachado@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-09-22_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1609020000 definitions=main-1609220261 X-IsSubscribed: yes Hi, I was notified by buildbot that my patch (commit 6ec2b2) has broken the build on x86_64: ... g++ -m32 -I. -I../../binutils-gdb/gdb -I../../binutils-gdb/gdb/common -I../../binutils-gdb/gdb/config -DLOCALEDIR="\"/usr/local/share/locale\"" -DHAVE_CONFIG_H -I../../binutils-gdb/gdb/../include/opcode -I../../binutils-gdb/gdb/../opcodes/.. -I../../binutils-gdb/gdb/../readline/.. -I../../binutils-gdb/gdb/../zlib -I../bfd -I../../binutils-gdb/gdb/../bfd -I../../binutils-gdb/gdb/../include -I../libdecnumber -I../../binutils-gdb/gdb/../libdecnumber -I../../binutils-gdb/gdb/gnulib/import -Ibuild-gnulib/import -DTUI=1 -I/usr/include/python2.7 -I/usr/include/python2.7 -Wall -Wpointer-arith -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts -Wempty-body -Wunused-but-set-parameter -Wunused-but-set-variable -Wno-sign-compare -Wno-write-strings -Wno-narrowing -Wformat-nonliteral -Werror -c -o s390-linux-tdep.o -MT s390-linux-tdep.o -MMD -MP -MF .deps/s390-linux-tdep.Tpo ../../binutils-gdb/gdb/s390-linux-tdep.c ../../binutils-gdb/gdb/rs6000-tdep.c: In function int ppc_process_record_op31(gdbarch*, regcache*, CORE_ADDR, uint32_t): ../../binutils-gdb/gdb/rs6000-tdep.c:4705:50: error: cannot convert CORE_ADDR* {aka long unsigned int*} to ULONGEST* {aka long long unsigned int*} for argument 3 to register_status regcache_raw_read_unsigned(regcache*, int, ULONGEST*) tdep->ppc_gp0_regnum + PPC_RA (insn), &ea); ^ ../../binutils-gdb/gdb/rs6000-tdep.c:4718:50: error: cannot convert CORE_ADDR* {aka long unsigned int*} to ULONGEST* {aka long long unsigned int*} for argument 3 to register_status regcache_raw_read_unsigned(regcache*, int, ULONGEST*) tdep->ppc_gp0_regnum + PPC_RA (insn), &ea); ^ Makefile:1140: recipe for target 'rs6000-tdep.o' failed make[2]: *** [rs6000-tdep.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory '/home/gdb-buildbot-2/fedora-x86-64-2/fedora-i686/build/gdb' Makefile:8827: recipe for target 'all-gdb' failed make[1]: *** [all-gdb] Error 2 make[1]: Leaving directory '/home/gdb-buildbot-2/fedora-x86-64-2/fedora-i686/build' Makefile:850: recipe for target 'all' failed make: *** [all] Error 2 The patch below should fix it. Sorry for the disturbance. Thanks, --- Edjunior gdb/ChangeLog: 2016-09-22 Edjunior Barbosa Machado * rs6000-tdep.c (ppc_process_record_op31): Fix regcache_raw_read_unsigned call using the correct parameter type. --- gdb/rs6000-tdep.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index 1add498..ca4d668 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -4700,9 +4700,11 @@ ppc_process_record_op31 (struct gdbarch *gdbarch, struct regcache *regcache, case 397: /* Store VSX Vector with Length */ case 429: /* Store VSX Vector Left-justified with Length */ + ra = 0; if (PPC_RA (insn) != 0) regcache_raw_read_unsigned (regcache, - tdep->ppc_gp0_regnum + PPC_RA (insn), &ea); + tdep->ppc_gp0_regnum + PPC_RA (insn), &ra); + ea = ra; regcache_raw_read_unsigned (regcache, tdep->ppc_gp0_regnum + PPC_RB (insn), &rb); /* Store up to 16 bytes. */ @@ -4713,9 +4715,11 @@ ppc_process_record_op31 (struct gdbarch *gdbarch, struct regcache *regcache, case 710: /* Store Word Atomic */ case 742: /* Store Doubleword Atomic */ + ra = 0; if (PPC_RA (insn) != 0) regcache_raw_read_unsigned (regcache, - tdep->ppc_gp0_regnum + PPC_RA (insn), &ea); + tdep->ppc_gp0_regnum + PPC_RA (insn), &ra); + ea = ra; switch (ext) { case 710: /* Store Word Atomic */