From patchwork Mon Feb 3 20:55:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rogerio Alves X-Patchwork-Id: 37662 Received: (qmail 51233 invoked by alias); 3 Feb 2020 20:59:11 -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 51225 invoked by uid 89); 3 Feb 2020 20:59:10 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.1 spammy=3666, 6610 X-HELO: mx0a-001b2d01.pphosted.com Received: from mx0a-001b2d01.pphosted.com (HELO mx0a-001b2d01.pphosted.com) (148.163.156.1) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 03 Feb 2020 20:59:09 +0000 Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 013Kx7GA098590 for ; Mon, 3 Feb 2020 15:59:08 -0500 Received: from ppma04dal.us.ibm.com (7a.29.35a9.ip4.static.sl-reverse.com [169.53.41.122]) by mx0a-001b2d01.pphosted.com with ESMTP id 2xxkdcgqqq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 03 Feb 2020 15:59:07 -0500 Received: from pps.filterd (ppma04dal.us.ibm.com [127.0.0.1]) by ppma04dal.us.ibm.com (8.16.0.27/8.16.0.27) with SMTP id 013Kjbsx015280 for ; Mon, 3 Feb 2020 20:55:07 GMT Received: from b01cxnp22036.gho.pok.ibm.com (b01cxnp22036.gho.pok.ibm.com [9.57.198.26]) by ppma04dal.us.ibm.com with ESMTP id 2xw0y6rsv7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 03 Feb 2020 20:55:07 +0000 Received: from b01ledav004.gho.pok.ibm.com (b01ledav004.gho.pok.ibm.com [9.57.199.109]) by b01cxnp22036.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 013Kt5tJ36569402 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 3 Feb 2020 20:55:05 GMT Received: from b01ledav004.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 43A48112061; Mon, 3 Feb 2020 20:55:05 +0000 (GMT) Received: from b01ledav004.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 866A8112065; Mon, 3 Feb 2020 20:55:04 +0000 (GMT) Received: from localhost.localdomain (unknown [9.85.175.194]) by b01ledav004.gho.pok.ibm.com (Postfix) with ESMTP; Mon, 3 Feb 2020 20:55:04 +0000 (GMT) To: gdb-patches@sourceware.org, uweigand@de.ibm.com, pedromfc@linux.ibm.com From: Rogerio Alves Subject: [PATCH][PowerPC] Fix powerpc tests Message-ID: <2f87e7da-d040-cb9a-eddd-f87d703a1f7d@linux.ibm.com> Date: Mon, 3 Feb 2020 17:55:03 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 MIME-Version: 1.0 X-IsSubscribed: yes This patch fixes test failures power8 and power9 caused by changes on opcodes: The dissasembler does not emit whitespace for instructions anymore (c2b1c2754526acff8aae2fe8f5a56c2dd11d0b7f) The dissasembler generates extended mnemonics for some instructions instead (aae9718e4d4e8d01dcee22684e82b000203d3e52) The ldmx instruction was removed. This instruction was never implemented (6fbc939cfdbdf02f205c20925583738b0f835e62) gdb/testsuite/ChangeLog: 2020-02-03 Rogerio A. Cardoso * gdb.arch/powerpc-power8.exp: Delete trailing whitespace of tbegin., tend. instructions. Replace bctar-, bctar+, bctarl-, bctarl+ extended mnemonics when avaliable by bgttar, bnstarl, blttar, bnetarl. * gdb.arch/powerpc-power8.s: Fix comments. Fix instructions binary for blttar, bnetarl. * gdb.arch/powerpc-power9.exp: Delete trailing whitespace of wait instruction. Delete ldmx test. * gdb.arch/powerpc-power9.s: Delete ldmx instruction. --- gdb/testsuite/gdb.arch/powerpc-power8.exp | 18 +++++++++--------- gdb/testsuite/gdb.arch/powerpc-power8.s | 8 ++++---- gdb/testsuite/gdb.arch/powerpc-power9.exp | 6 ++---- gdb/testsuite/gdb.arch/powerpc-power9.s | 2 -- 4 files changed, 15 insertions(+), 19 deletions(-) diff --git a/gdb/testsuite/gdb.arch/powerpc-power8.exp b/gdb/testsuite/gdb.arch/powerpc-power8.exp index 109a5cbb64..d0da3e4f09 100644 --- a/gdb/testsuite/gdb.arch/powerpc-power8.exp +++ b/gdb/testsuite/gdb.arch/powerpc-power8.exp @@ -66,10 +66,10 @@ func_check "tabortwc. 7,r8,r16" func_check "tabortdc. 20,r11,r10" func_check "tabortwci. 17,r10,-13" func_check "tabortdci. 29,r3,-5" -func_check "tbegin. " +func_check "tbegin." func_check "tcheck cr7" -func_check "tend. " -func_check "tend. " +func_check "tend." +func_check "tend." func_check "tendall." func_check "tendall." func_check "treclaim. r24" @@ -82,12 +82,12 @@ func_check "ori r2,r2,0" func_check "nop" func_check "ori r2,r2,0" func_check "rfebb 0" -func_check "rfebb " -func_check "rfebb " -func_check "bctar- 12,4*cr5+gt" -func_check "bctarl- 4,4*cr1+so" -func_check "bctar+ 12,4*cr3+lt" -func_check "bctarl+ 4,eq" +func_check "rfebb" +func_check "rfebb" +func_check "bgttar cr5" +func_check "bnstarl cr1" +func_check "blttar+ cr3" +func_check "bnetarl+" func_check "bctar 4,4*cr2+lt,1" func_check "bctarl 4,4*cr1+so,2" func_check "waitasec" diff --git a/gdb/testsuite/gdb.arch/powerpc-power8.s b/gdb/testsuite/gdb.arch/powerpc-power8.s index 3e466a06e8..0cc3f84b3d 100644 --- a/gdb/testsuite/gdb.arch/powerpc-power8.s +++ b/gdb/testsuite/gdb.arch/powerpc-power8.s @@ -41,10 +41,10 @@ func: .long 0x4c000124 /* rfebb 0 */ .long 0x4c000924 /* rfebb */ .long 0x4c000924 /* rfebb */ - .long 0x4d950460 /* bctar- 12,4*cr5+gt */ - .long 0x4c870461 /* bctarl- 4,4*cr1+so */ - .long 0x4dac0460 /* bctar+ 12,4*cr3+lt */ - .long 0x4ca20461 /* bctarl+ 4,eq */ + .long 0x4d950460 /* bgttar cr5 */ + .long 0x4c870461 /* bnstarl cr1 */ + .long 0x4dec0460 /* blttar+ cr3 */ + .long 0x4ce20461 /* bnetarl+ */ .long 0x4c880c60 /* bctar 4,4*cr2+lt,1 */ .long 0x4c871461 /* bctarl 4,4*cr1+so,2 */ .long 0x7c00003c /* waitasec */ diff --git a/gdb/testsuite/gdb.arch/powerpc-power9.exp b/gdb/testsuite/gdb.arch/powerpc-power9.exp index d3ab9af15e..c92b2008d9 100644 --- a/gdb/testsuite/gdb.arch/powerpc-power9.exp +++ b/gdb/testsuite/gdb.arch/powerpc-power9.exp @@ -409,11 +409,9 @@ func_check "stwat r23,0,0" func_check "stwat r23,r13,28" func_check "urfid" func_check "rmieg r30" -func_check "ldmx r10,0,r15" -func_check "ldmx r10,r3,r15" func_check "stop" -func_check "wait " -func_check "wait " +func_check "wait" +func_check "wait" func_check "darn r3,0" func_check "darn r3,1" func_check "darn r3,2" diff --git a/gdb/testsuite/gdb.arch/powerpc-power9.s b/gdb/testsuite/gdb.arch/powerpc-power9.s index e47809caae..b3dc6ea83a 100644 --- a/gdb/testsuite/gdb.arch/powerpc-power9.s +++ b/gdb/testsuite/gdb.arch/powerpc-power9.s @@ -366,8 +366,6 @@ func: .long 0x7eede58c /* stwat r23,r13,28 */ .long 0x4c000264 /* urfid */ .long 0x7c00f6e4 /* rmieg r30 */ - .long 0x7d407a6a /* ldmx r10,0,r15 */ - .long 0x7d437a6a /* ldmx r10,r3,r15 */ .long 0x4c0002e4 /* stop */ .long 0x7c00003c /* wait */ .long 0x7c00003c /* wait */