From patchwork Wed Oct 12 18:02:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dragan Mladjenovic X-Patchwork-Id: 58722 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 94D2F385116B for ; Wed, 12 Oct 2022 18:02:32 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60090.outbound.protection.outlook.com [40.107.6.90]) by sourceware.org (Postfix) with ESMTPS id 94EDC3858D38 for ; Wed, 12 Oct 2022 18:02:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 94EDC3858D38 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=syrmia.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=syrmia.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RFHailMX5yoS3vz5C4unWL4JVbdQmwToI4dSg3k1CZmIIhTIGw5i2HsU4ifbJSKrAeWMhLH6G6BJJ38cGtt5ZWhjCqnaKpzWuWy7or5qlyyx8Um5zXoLlQ7C+i4b43eyp8/KTZepMlzfkJ0EljdFpD3z3abhEc1SY5SHd7EvzmqgSvm1iwKyh+NI6pYvW3V1cbsA5e7e0hymp/T8ROMznn59uszh/ZoNUq3+p/RZIPmyxel6zW6FXer+sgNIRlOXsroBVbimZ2HD/dsO2YxeqBWRaXD0rYxLaxeJ5XeosTr3Uv56B30I/RGEkmPp+KMGGvoYAy6NrqGw2Tw9AylsdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=DG759iIV7HzQ8nDXyWWKx8Q0Rw7jLfLq7ZMiirxHfCw=; b=lSIJPkhxxj+xB05G+tyrY87PLVrT5Mj4z3VmO1eh7QJ7bWCo/0Hju+wnDKISGiyogKyvOGFmFkQEFFzO7RfaAtL3l+2E7ayeXpAPh8DE2v5HWh4N3w5I6IjBSiQfLp4iZv2eo+cju0Z2FU9qvUvyEBOhLKvfbOzGusKfgl40ayJ5VN0BZqrG+27dSe9wJOq0Bxi2fn+cMgm94nqo/AaMl+8owS3z8dEFkKwmpBRizGfNwS0VJ3IM8g3fGIQSefpatKsd6mX4y3OXNdqAo8vsssN7sW0nIibXFDFc2GrTjqrsdbx+GJXqRvpEIzHdYk/5rp0hOD6YY1DvDZ2V5GbPqQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=syrmia.com; dmarc=pass action=none header.from=syrmia.com; dkim=pass header.d=syrmia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=syrmia.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DG759iIV7HzQ8nDXyWWKx8Q0Rw7jLfLq7ZMiirxHfCw=; b=bv5V2evZhF/Lwh4Th8IIPJlCTuXCFfzYetA2F7nNB8fDv6aXAHaRkLeGhWUCv7CpIyZIeL6OyGzZEtgS8mwp0RTW4MwCtacqMGHwGcmt82rkPM7V8iMDnbsBBGDC6SSeMiUpDF2VujOqX6KnL5ygwdOWN7qmTksz6k+24iqBL9Y= Received: from VI1PR03MB4208.eurprd03.prod.outlook.com (2603:10a6:803:51::25) by AS8PR03MB7586.eurprd03.prod.outlook.com (2603:10a6:20b:34c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Wed, 12 Oct 2022 18:02:13 +0000 Received: from VI1PR03MB4208.eurprd03.prod.outlook.com ([fe80::7f1f:271d:e598:d7b9]) by VI1PR03MB4208.eurprd03.prod.outlook.com ([fe80::7f1f:271d:e598:d7b9%5]) with mapi id 15.20.5709.019; Wed, 12 Oct 2022 18:02:13 +0000 From: Dragan Mladjenovic To: "gdb-patches@sourceware.org" Subject: [PATCH^2] gdb: mips: Add MIPSR6 support Thread-Topic: [PATCH^2] gdb: mips: Add MIPSR6 support Thread-Index: AQHY3mPpjVhBhlUM40uCnyG+XXjXUA== Date: Wed, 12 Oct 2022 18:02:12 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=syrmia.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: VI1PR03MB4208:EE_|AS8PR03MB7586:EE_ x-ms-office365-filtering-correlation-id: 96ea699b-0f6b-40a3-b95b-08daac7be3dc x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ctvVuUTgsr7tU//X7hcMqUm04JccWdNynuuZUVAeH6vimTphp9uL0JSzIaY0/8bMQPa1aieNN/aXhBDxr1HaccP90lyLWOj/NdLpBa6wP0M/t1sbQP9WjxY5+02yQPNSDYSKM758Q6XblQbfP9TGtNanROXf/yrztUGoa1PY5od2WwvVYTnN8mUa6jXINP4EbM0DRew0CLsmbNl91Ms2XMhmbTKGUMpm1LsD5qQxG4aCm/5euSSfgd0WFx4dXi4rW4YBvFjGeezIboJXMhZgwy4v57bMCgeynCgsCcPIBnfQDLRh4GMm4tu0J12OP1XQyy40busEbjvjgjZq1K7ecqgk+d8eB4nUhTd+GA6tTNGnvi6/SKbLOxfhFOu9yWgUgVrKJULKUryHLpxZpGUPSTz0m98uCKCg6NV6isancUxXVh/SpfdjCzT5jAkgtrL7Fuwo4C+8luXlzm+sOMkVDCn7UY46uqg39zz+LCGnPqUVOq+d+wzm1IZz6CBgQW9ZvZMwIKeKeQ454RJG0Rqh9AkveUJLDe/9269ZVrhlcanw32jHvZ6hk1/xh2IbhiGby7e3lIjHPPYm/nuQn4Y2ftjha3DAe7/mVyc9IafpoA7GFBN/MAAJ3U0/dm6mFhH2Qmuo0rCcbYncTviM7Kka0xV7YkEYqsxY4i1x/YXGkHAyp9z2g7uesZzZVhaA4s5/OISZ53lP5Y+zcwI9QaTxSZO81zdpb2+HZyAqrXWuOuyFgqDr0EP24PZP58DE95Y/vq93VH9Jrr3m0WRchFbM2bGP7AHKAKrfJwod8A/OEhs5ROTY4CoLbJ3r490yAPy5 x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR03MB4208.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(366004)(376002)(346002)(136003)(39830400003)(396003)(451199015)(2906002)(4001150100001)(66899015)(316002)(91956017)(8676002)(4326008)(64756008)(66446008)(66476007)(66556008)(66946007)(76116006)(71200400001)(54906003)(6916009)(41300700001)(52536014)(5660300002)(30864003)(966005)(478600001)(33656002)(8936002)(26005)(83380400001)(186003)(122000001)(7696005)(6506007)(9686003)(86362001)(38100700002)(38070700005)(55016003)(81973001)(559001)(579004); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?C/5i6RKdr4bAFS85zZ86k9s?= =?iso-8859-1?q?yQ94sMM/WAEYOMHvWCLuv6Fh7Twep7TJu9F/NsR0M3gVKX9M+zK+MVuRg/ng?= =?iso-8859-1?q?Psj6DzOjJfCat156/lDyBG4xjvFzImSL1C+vfudBNp94XYAJ2FKtJxqpDUIm?= =?iso-8859-1?q?haSHrM/WSSnGpYXM1409xML3latl15GK2cJjdB+dVsedLLxh5mR5e9R3Gelm?= =?iso-8859-1?q?eVDwwpfQ4mEgfFGz5Nmg/u/xWJvhAgyPZc8SdGn2+1w86Edl7taUscG0quVF?= =?iso-8859-1?q?hxlJcXf0k99vlhZV8qrFWAGLxMLEU68WtPSoSKzHMXdm9D5v0RGH4TbTmCLo?= =?iso-8859-1?q?oMCfQImpRwKzEH6c9mXersrPXN/yU5Rj4nFjxbDrsQMl9inmaFsWibnujdGa?= =?iso-8859-1?q?QoEumnB2B1CjWau8fhlos+j0neAcZmhX58pZKNGJqw20wAPrWFhTrAmVRrI0?= =?iso-8859-1?q?zotWwp7xfxwbHd/o3NIT3D73caeT2Ei0nPKaLM84gsKXvdyEVrmurmbZFDhG?= =?iso-8859-1?q?0sm/pvU8X4l4FxtTSnfi2gmXfsfO/QFPRndehfH/rr5HXq0yubRGayibTI5U?= =?iso-8859-1?q?g3thSMBlWzz7jhvvn5iAF0TFicBii7m1E2gbiR9wEqHDkh8ePgOvK5kRg9Hy?= =?iso-8859-1?q?EVLZ4z91gSg85+Ob3eRDCNDHqdd3zFINc/9cqwy5N88RBypZkBNwNkRlq7Tl?= =?iso-8859-1?q?p5AZ3hz4Cdg7AkAnEE+WBUdxJmm1Mk+XZcYxoATw1hVucRiStqasWOnzo3/V?= =?iso-8859-1?q?Ygqud4VA+Qn06wToX0L545+0yBz5qehGZ/f2le+y+OsxgAhq4KeduMXXTDzr?= =?iso-8859-1?q?dYIwOSUstUY3PiEFNByvg1VotWY44VWiiwsqDBYaN9uG4KBmy7Pq1O6ZU6fz?= =?iso-8859-1?q?Ila3LWTuET9usw+3XzP9t0NKIHEGZToSGH++nOY3FRVCWrn9og7+FsaNwuy4?= =?iso-8859-1?q?DgfhS2wnM5Sh12cAYnvAQdjcTB7ybv1oDuw2TjIO8WN6/eOug7y8njv/6t6y?= =?iso-8859-1?q?DeC1AK38ejangcPkrKZj+Jj4BUmR3vQT19Iv/qHx5eus8Z8BxJ9Y47UhGOZk?= =?iso-8859-1?q?bs65gIihtXsJVYsAsAnoF587m8iZdZmN24oyHky5R/Zsr0d54wirWSr7diN3?= =?iso-8859-1?q?HcxdP6NuR/E3Yji4WQ7y5qmrexRr0YTA+qyW7wjeNfl/H2+tdgiYPxIdC76W?= =?iso-8859-1?q?SbHUJeSr5gtXaQUMItnMX2WdWBZxGTVZdC8zKs8aTgkfURgi6e2ktl1bBBLJ?= =?iso-8859-1?q?SRjtMz+RZ14RcYQcAZnbshYp1fJZfwJrwI1mpd6g/Stgb4XEY+UvGGB59n+q?= =?iso-8859-1?q?XqZ/jv9Wzg1dS3V+aKxEGOLPJiT1LtwXEbNQlz7nwTCQ2RqEJA4dorJKI26n?= =?iso-8859-1?q?Sr9RF5vprADQ7iHiwnT7kdiSaAP4ukcj4GYZNr0VwR3fSvgaz7IHa7yox/MX?= =?iso-8859-1?q?RJ34MXuO0xqOct+mOgztDF9yatdOHCVQUa0o1J5IHdItCFmrU+6jPQjSNE1I?= =?iso-8859-1?q?armD3myzES7c9KIslJsgL5C1RFBY3kEv09OfP8PPHoyu5ZC9GBL0n+Xct/yJ?= =?iso-8859-1?q?Y0g/jJjiV0SbVnxX1SnKbHxvHL7WWWo1BK+mJ8euiWswWU0lCIMLBDz1F6nQ?= =?iso-8859-1?q?A2HSXjPWFvdwxEl2n7cbfdsYQiyw5r3sdt5uKNQ=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: syrmia.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: VI1PR03MB4208.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 96ea699b-0f6b-40a3-b95b-08daac7be3dc X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Oct 2022 18:02:12.9569 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 19214a73-c1ab-4e19-8f59-14bdcb09a66e X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: nTyDFrAo4ALg1GIfKrUJ0goehupbtiPjNkt5c2OpDGK4JGpJeYX8a9WozbfLt8tc1GujQlCU/pPyebYwOZVSaIgnMu/OaYJeIMj7Q5Uj+mA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB7586 X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Chao-ying Fu , "Maciej W . Rozycki" Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Introduce new instruction encodings from Release 6 of the MIPS architecture [1]. Support breakpoints and single stepping with compact branches, forbidden slots, new branch instruction and new atomic load-store instruction encodings. [1] "MIPS64 Architecture for Programmers Volume II-A: The MIPS64 Instruction Set Reference Manual", Document Number: MD00087, Revision 6.06, December 15, 2016, Section 3 "The MIPS64 Instruction Set", pp. 42-530 https://s3-eu-west-1.amazonaws.com/downloads-mips/documents/MD00087-2B-MIPS64BIS-AFP-6.06.pdf 2022-10-12 Andrew Bennett Matthew Fortune Faraz Shahbazker gdb/ChangeLog: * mips-tdep.c (is_mipsr6_isa): New. (b0s21_imm): New define. (mips32_relative_offset21, mips32_relative_offset26): New. (is_add32bit_overflow, is_add64bit_overflow): New. (mips32_next_pc): Handle r6 compact and fpu coprocessor branches. Move handling of BLEZ, BGTZ opcode into ... (mips32_blez_pc): New. (mips32_instruction_is_compact_branch): New. (mips32_insn_at_pc_has_forbidden_slot): New. (mips32_scan_prologue): Ignore pre-r6 addi encoding on r6. Stop at compact branch also. (LLSC_R6_OPCODE,LL_R6_FUNCT,LLE_FUNCT, LLD_R6_FUNCT,SC_R6_FUNCT,SCE_FUNCT, SCD_R6_FUNCT: New defines. (is_ll_insn, is_sc_insn): New. (mips_deal_with_atomic_sequence): Use is_ll_insn/is_sc_insn. Handle compact branches. (mips_about_to_return): Handle jrc and macro jr. (mips32_stack_frame_destroyed_p): Likewise. (mips32_instruction_has_delay_slot): Don't handle JALX on r6. Handle compact branches and coprocessor branches. (mips_adjust_breakpoint_address): Skip forbidden slot for compact branches. --- gdb/mips-tdep.c | 498 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 457 insertions(+), 41 deletions(-) diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index a5c39ce224f..556eb141f86 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -76,6 +76,9 @@ static int mips16_insn_at_pc_has_delay_slot (struct gdbarch *gdbarch, static void mips_print_float_info (struct gdbarch *, struct ui_file *, frame_info_ptr , const char *); +static void mips_read_fp_register_single (frame_info_ptr, int, + gdb_byte *); + /* A useful bit in the CP0 status register (MIPS_PS_REGNUM). */ /* This bit is set if we are emulating 32-bit FPRs on a 64-bit chip. */ #define ST0_FR (1 << 26) @@ -1497,6 +1500,17 @@ mips_fetch_instruction (struct gdbarch *gdbarch, return extract_unsigned_integer (buf, instlen, byte_order); } +/* Return true if the gdbarch is based on MIPS Release 6. */ + +static bool +is_mipsr6_isa (struct gdbarch *gdbarch) +{ + const struct bfd_arch_info *info = gdbarch_bfd_arch_info (gdbarch); + + return (info->mach == bfd_mach_mipsisa32r6 + || info->mach == bfd_mach_mipsisa64r6); +} + /* These are the fields of 32 bit mips instructions. */ #define mips32_op(x) (x >> 26) #define itype_op(x) (x >> 26) @@ -1539,6 +1553,7 @@ mips_fetch_instruction (struct gdbarch *gdbarch, #define b0s11_op(x) ((x) & 0x7ff) #define b0s12_imm(x) ((x) & 0xfff) #define b0s16_imm(x) ((x) & 0xffff) +#define b0s21_imm(x) ((x) & 0x1fffff) #define b0s26_imm(x) ((x) & 0x3ffffff) #define b6s10_ext(x) (((x) >> 6) & 0x3ff) #define b11s5_reg(x) (((x) >> 11) & 0x1f) @@ -1575,6 +1590,18 @@ mips32_relative_offset (ULONGEST inst) return ((itype_immediate (inst) ^ 0x8000) - 0x8000) << 2; } +static LONGEST +mips32_relative_offset21 (ULONGEST insn) +{ + return ((b0s21_imm (insn) ^ 0x100000) - 0x100000) << 2; +} + +static LONGEST +mips32_relative_offset26 (ULONGEST insn) +{ + return ((b0s26_imm (insn) ^ 0x2000000) - 0x2000000) << 2; +} + /* Determine the address of the next instruction executed after the INST floating condition branch instruction at PC. COUNT specifies the number of the floating condition bits tested by the branch. */ @@ -1633,6 +1660,70 @@ is_octeon_bbit_op (int op, struct gdbarch *gdbarch) return 0; } +/* Return true if addition produces 32-bit overflow. */ + +static bool +is_add32bit_overflow (int32_t a, int32_t b) +{ + int32_t r = (uint32_t) a + (uint32_t) b; + return (a < 0 && b < 0 && r >= 0) || (a >= 0 && b >= 0 && r < 0); +} + +/* Return true if addition produces 32-bit overflow or + one of the inputs is not sign-extended 32-bit value. */ + +static bool +is_add64bit_overflow (int64_t a, int64_t b) +{ + if (a != (int32_t) a) + return 1; + if (b != (int32_t) b) + return 1; + return is_add32bit_overflow ((int32_t) a, (int32_t) b); +} + +/* Calculate address of next instruction after BLEZ-like or + BGTZ-like (invert == true) instruction at pc. */ + +static CORE_ADDR +mips32_blez_pc (struct gdbarch *gdbarch, struct regcache *regcache, + ULONGEST inst, CORE_ADDR pc, bool invert) +{ + int rs = itype_rs (inst); + int rt = itype_rt (inst); + LONGEST val_rs = regcache_raw_get_signed (regcache, rs); + LONGEST val_rt = regcache_raw_get_signed (regcache, rt); + ULONGEST uval_rs = regcache_raw_get_unsigned (regcache, rs); + ULONGEST uval_rt = regcache_raw_get_unsigned (regcache, rt); + bool taken = false; + + /* BLEZ, BLEZL, BGTZ, BGTZL */ + if (rt == 0) + taken = (val_rs <= 0); + else if (is_mipsr6_isa (gdbarch)) + { + /* BLEZALC, BGTZALC */ + if (rs == 0 && rt != 0) + taken = (val_rt <= 0); + /* BGEZALC, BLTZALC */ + else if (rs == rt && rt != 0) + taken = (val_rt >= 0); + /* BGEUC, BLTUC */ + else if (rs != rt && rs != 0 && rt != 0) + taken = (uval_rs >= uval_rt); + } + + if (invert) + taken = !taken; + + /* Calculate branch target. */ + if (taken) + pc += mips32_relative_offset (inst) + 4; + else + pc += 8; + + return pc; +} /* Determine where to set a single step breakpoint while considering branch prediction. */ @@ -1643,13 +1734,15 @@ mips32_next_pc (struct regcache *regcache, CORE_ADDR pc) struct gdbarch *gdbarch = regcache->arch (); unsigned long inst; int op; + bool mips64bitreg = mips_isa_regsize (gdbarch) == 8; + inst = mips_fetch_instruction (gdbarch, ISA_MIPS, pc, NULL); op = itype_op (inst); if ((inst & 0xe0000000) != 0) /* Not a special, jump or branch instruction. */ { - if (op >> 2 == 5) - /* BEQL, BNEL, BLEZL, BGTZL: bits 0101xx */ + /* BEQL, BNEL, BLEZL, BGTZL: bits 0101xx */ + if (op >> 2 == 5 && ((op & 0x02) == 0 || itype_rt (inst) == 0)) { switch (op & 0x03) { @@ -1658,7 +1751,7 @@ mips32_next_pc (struct regcache *regcache, CORE_ADDR pc) case 1: /* BNEL */ goto neq_branch; case 2: /* BLEZL */ - goto less_branch; + goto lez_branch; case 3: /* BGTZL */ goto greater_branch; default: @@ -1668,15 +1761,19 @@ mips32_next_pc (struct regcache *regcache, CORE_ADDR pc) else if (op == 17 && itype_rs (inst) == 8) /* BC1F, BC1FL, BC1T, BC1TL: 010001 01000 */ pc = mips32_bc1_pc (gdbarch, regcache, inst, pc + 4, 1); - else if (op == 17 && itype_rs (inst) == 9 + else if (!is_mipsr6_isa (gdbarch) + && op == 17 + && itype_rs (inst) == 9 && (itype_rt (inst) & 2) == 0) /* BC1ANY2F, BC1ANY2T: 010001 01001 xxx0x */ pc = mips32_bc1_pc (gdbarch, regcache, inst, pc + 4, 2); - else if (op == 17 && itype_rs (inst) == 10 + else if (!is_mipsr6_isa (gdbarch) + && op == 17 + && itype_rs (inst) == 10 && (itype_rt (inst) & 2) == 0) /* BC1ANY4F, BC1ANY4T: 010001 01010 xxx0x */ pc = mips32_bc1_pc (gdbarch, regcache, inst, pc + 4, 4); - else if (op == 29) + else if (!is_mipsr6_isa (gdbarch) && op == 29) /* JALX: 011101 */ /* The new PC will be alternate mode. */ { @@ -1704,7 +1801,119 @@ mips32_next_pc (struct regcache *regcache, CORE_ADDR pc) else pc += 8; /* After the delay slot. */ } + else if (is_mipsr6_isa (gdbarch)) + { + /* BOVC, BEQZALC, BEQC and BNVC, BNEZALC, BNEC */ + if (op == 8 || op == 24) + { + int rs = rtype_rs (inst); + int rt = rtype_rt (inst); + LONGEST val_rs = regcache_raw_get_signed (regcache, rs); + LONGEST val_rt = regcache_raw_get_signed (regcache, rt); + bool taken = false; + /* BOVC (BNVC) */ + if (rs >= rt) + { + if (mips64bitreg) + taken = is_add64bit_overflow (val_rs, val_rt); + else + taken = is_add32bit_overflow (val_rs, val_rt); + } + else if (rs < rt && rs == 0) + /* BEQZALC (BNEZALC) */ + taken = (val_rt == 0); + else + /* BEQC (BNEC) */ + taken = (val_rs == val_rt); + + /* BNVC, BNEZALC, BNEC */ + if (op == 24) + taken = !taken; + if (taken) + pc += mips32_relative_offset (inst) + 4; + else + /* Step through the forbidden slot. */ + pc += 8; + } + else if (op == 17 && (itype_rs (inst) == 9 || itype_rs (inst) == 13)) + /* BC1EQZ, BC1NEZ */ + { + gdb_byte status; + gdb_byte true_val = 0; + unsigned int fp = (gdbarch_num_regs (gdbarch) + + mips_regnum (gdbarch)->fp0 + + itype_rt (inst)); + frame_info_ptr frame = get_current_frame (); + gdb_byte raw_buffer[4]; + mips_read_fp_register_single (frame, fp, raw_buffer); + + if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG) + status = *(raw_buffer + 3); + else + status = *(raw_buffer); + + if (itype_rs (inst) == 13) + true_val = 1; + + if ((status & 0x1) == true_val) + pc += mips32_relative_offset (inst) + 4; + else + pc += 8; + } + else if (op == 22 || op == 23) + /* BLEZC, BGEZC, BGEC, BGTZC, BLTZC, BLTC */ + { + int rs = rtype_rs (inst); + int rt = rtype_rt (inst); + LONGEST val_rs = regcache_raw_get_signed (regcache, rs); + LONGEST val_rt = regcache_raw_get_signed (regcache, rt); + bool taken = false; + /* The R5 rt == 0 case is handled above so we treat it as + an unknown instruction here for future ISA usage. */ + if (rs == 0 && rt != 0) + taken = (val_rt <= 0); + else if (rs == rt && rt != 0) + taken = (val_rt >= 0); + else if (rs != rt && rs != 0 && rt != 0) + taken = (val_rs >= val_rt); + + if (op == 23) + taken = !taken; + + if (taken) + pc += mips32_relative_offset (inst) + 4; + else + /* Step through the forbidden slot. */ + pc += 8; + } + else if (op == 50 || op == 58) + /* BC, BALC */ + pc += mips32_relative_offset26 (inst) + 4; + else if ((op == 54 || op == 62) + && rtype_rs (inst) == 0) + /* JIC, JIALC */ + { + pc = regcache_raw_get_signed (regcache, itype_rt (inst)); + pc += (itype_immediate (inst) ^ 0x8000) - 0x8000; + } + else if (op == 54 || op == 62) + /* BEQZC, BNEZC */ + { + int rs = itype_rs (inst); + LONGEST rs_val = regcache_raw_get_signed (regcache, rs); + bool taken = (rs_val == 0); + if (op == 62) + taken = !taken; + if (taken) + pc += mips32_relative_offset21 (inst) + 4; + else + /* Step through the forbidden slot. */ + pc += 8; + } + else + pc += 4; /* Not a branch, next instruction is easy. */ + } else pc += 4; /* Not a branch, next instruction is easy. */ } @@ -1748,7 +1957,6 @@ mips32_next_pc (struct regcache *regcache, CORE_ADDR pc) case 2: /* BLTZL */ case 16: /* BLTZAL */ case 18: /* BLTZALL */ - less_branch: if (regcache_raw_get_signed (regcache, itype_rs (inst)) < 0) pc += mips32_relative_offset (inst) + 4; else @@ -1764,6 +1972,7 @@ mips32_next_pc (struct regcache *regcache, CORE_ADDR pc) pc += 8; /* after the delay slot */ break; case 0x1c: /* BPOSGE32 */ + case 0x1d: /* BPOSGE32C */ case 0x1e: /* BPOSGE64 */ pc += 4; if (itype_rs (inst) == 0) @@ -1775,6 +1984,13 @@ mips32_next_pc (struct regcache *regcache, CORE_ADDR pc) /* No way to handle; it'll most likely trap anyway. */ break; + /* BPOSGE32C */ + if (op == 0x1d) + { + if (!is_mipsr6_isa (gdbarch)) + break; + } + if ((regcache_raw_get_unsigned (regcache, dspctl) & 0x7f) >= pos) pc += mips32_relative_offset (inst); @@ -1813,19 +2029,14 @@ mips32_next_pc (struct regcache *regcache, CORE_ADDR pc) else pc += 8; break; - case 6: /* BLEZ, BLEZL */ - if (regcache_raw_get_signed (regcache, itype_rs (inst)) <= 0) - pc += mips32_relative_offset (inst) + 4; - else - pc += 8; + case 6: /* BLEZ, BLEZL, BLEZALC, BGEZALC, BGEUC */ + lez_branch: + pc = mips32_blez_pc (gdbarch, regcache, inst, pc, /*invert*/ false); break; case 7: default: - greater_branch: /* BGTZ, BGTZL */ - if (regcache_raw_get_signed (regcache, itype_rs (inst)) > 0) - pc += mips32_relative_offset (inst) + 4; - else - pc += 8; + greater_branch: /* BGTZ, BGTZL, BGTZALC, BLTZALC, BLTUC */ + pc = mips32_blez_pc (gdbarch, regcache, inst, pc, /*invert*/ true); break; } /* switch */ } /* else */ @@ -2448,6 +2659,72 @@ micromips_instruction_is_compact_branch (unsigned short insn) } } +/* Return non-zero if the MIPS instruction INSN is a compact branch + or jump. A value of 1 indicates an unconditional compact branch + and a value of 2 indicates a conditional compact branch. */ + +static int +mips32_instruction_is_compact_branch (struct gdbarch *gdbarch, ULONGEST insn) +{ + switch (itype_op (insn)) + { + /* BC */ + case 50: + /* BALC */ + case 58: + if (is_mipsr6_isa (gdbarch)) + return 1; + break; + /* BOVC, BEQZALC, BEQC */ + case 8: + /* BNVC, BNEZALC, BNEC */ + case 24: + if (is_mipsr6_isa (gdbarch)) + return 2; + break; + /* BEQZC, JIC */ + case 54: + /* BNEZC, JIALC */ + case 62: + if (is_mipsr6_isa (gdbarch)) + /* JIC, JIALC are unconditional */ + return (itype_rs (insn) == 0) ? 1 : 2; + break; + /* BLEZC, BGEZC, BGEC */ + case 22: + /* BGTZC, BLTZC, BLTC */ + case 23: + /* BLEZALC, BGEZALC, BGEUC */ + case 6: + /* BGTZALC, BLTZALC, BLTUC */ + case 7: + if (is_mipsr6_isa (gdbarch) + && itype_rt (insn) != 0) + return 2; + break; + /* BPOSGE32C */ + case 1: + if (is_mipsr6_isa (gdbarch) + && itype_rt (insn) == 0x1d && itype_rs (insn) == 0) + return 2; + } + return 0; +} + +/* Return true if a standard MIPS instruction at ADDR has a branch + forbidden slot (i.e. it is a conditional compact branch instruction). */ + +static bool +mips32_insn_at_pc_has_forbidden_slot (struct gdbarch *gdbarch, CORE_ADDR addr) +{ + int status; + ULONGEST insn = mips_fetch_instruction (gdbarch, ISA_MIPS, addr, &status); + if (status) + return false; + + return mips32_instruction_is_compact_branch (gdbarch, insn) == 2; +} + struct mips_frame_cache { CORE_ADDR base; @@ -3491,7 +3768,8 @@ mips32_scan_prologue (struct gdbarch *gdbarch, reg = high_word & 0x1f; if (high_word == 0x27bd /* addiu $sp,$sp,-i */ - || high_word == 0x23bd /* addi $sp,$sp,-i */ + || (high_word == 0x23bd /* addi $sp,$sp,-i */ + && !is_mipsr6_isa (gdbarch)) || high_word == 0x67bd) /* daddiu $sp,$sp,-i */ { if (offset < 0) /* Negative stack adjustment? */ @@ -3629,7 +3907,9 @@ mips32_scan_prologue (struct gdbarch *gdbarch, /* A jump or branch, or enough non-prologue insns seen? If so, then we must have reached the end of the prologue by now. */ - if (prev_delay_slot || non_prologue_insns > 1) + if (prev_delay_slot + || non_prologue_insns > 1 + || mips32_instruction_is_compact_branch (gdbarch, inst)) break; prev_non_prologue_insn = this_non_prologue_insn; @@ -3935,6 +4215,59 @@ mips_addr_bits_remove (struct gdbarch *gdbarch, CORE_ADDR addr) #define LLD_OPCODE 0x34 #define SC_OPCODE 0x38 #define SCD_OPCODE 0x3c +#define LLSC_R6_OPCODE 0x1f +#define LL_R6_FUNCT 0x36 +#define LLE_FUNCT 0x2e +#define LLD_R6_FUNCT 0x37 +#define SC_R6_FUNCT 0x26 +#define SCE_FUNCT 0x1e +#define SCD_R6_FUNCT 0x27 + +static bool +is_ll_insn (struct gdbarch *gdbarch, ULONGEST insn) +{ + if (itype_op (insn) == LL_OPCODE + || itype_op (insn) == LLD_OPCODE) + return true; + + if (rtype_op (insn) == LLSC_R6_OPCODE + && rtype_funct (insn) == LLE_FUNCT + && (insn & 0x40) == 0) + return true; + + /* Handle LL and LLP varieties. */ + if (is_mipsr6_isa (gdbarch) + && rtype_op (insn) == LLSC_R6_OPCODE + && (rtype_funct (insn) == LL_R6_FUNCT + || rtype_funct (insn) == LLD_R6_FUNCT + || rtype_funct (insn) == LLE_FUNCT)) + return true; + + return false; +} + +static bool +is_sc_insn (struct gdbarch *gdbarch, ULONGEST insn) +{ + if (itype_op (insn) == SC_OPCODE + || itype_op (insn) == SCD_OPCODE) + return true; + + if (rtype_op (insn) == LLSC_R6_OPCODE + && rtype_funct (insn) == SCE_FUNCT + && (insn & 0x40) == 0) + return true; + + /* Handle SC and SCP varieties. */ + if (is_mipsr6_isa (gdbarch) + && rtype_op (insn) == LLSC_R6_OPCODE + && (rtype_funct (insn) == SC_R6_FUNCT + || rtype_funct (insn) == SCD_R6_FUNCT + || rtype_funct (insn) == SCE_FUNCT)) + return true; + + return false; +} static std::vector mips_deal_with_atomic_sequence (struct gdbarch *gdbarch, CORE_ADDR pc) @@ -3947,10 +4280,11 @@ mips_deal_with_atomic_sequence (struct gdbarch *gdbarch, CORE_ADDR pc) int index; int last_breakpoint = 0; /* Defaults to 0 (no breakpoints placed). */ const int atomic_sequence_length = 16; /* Instruction sequence length. */ + bool is_mipsr6 = is_mipsr6_isa (gdbarch); insn = mips_fetch_instruction (gdbarch, ISA_MIPS, loc, NULL); /* Assume all atomic sequences start with a ll/lld instruction. */ - if (itype_op (insn) != LL_OPCODE && itype_op (insn) != LLD_OPCODE) + if (!is_ll_insn (gdbarch, insn)) return {}; /* Assume that no atomic sequence is longer than "atomic_sequence_length" @@ -3980,28 +4314,72 @@ mips_deal_with_atomic_sequence (struct gdbarch *gdbarch, CORE_ADDR pc) return {}; /* fallback to the standard single-step code. */ case 4: /* BEQ */ case 5: /* BNE */ - case 6: /* BLEZ */ - case 7: /* BGTZ */ case 20: /* BEQL */ case 21: /* BNEL */ - case 22: /* BLEZL */ - case 23: /* BGTTL */ + case 22: /* BLEZL (BLEZC, BGEZC, BGEC) */ + case 23: /* BGTZL (BGTZC, BLTZC, BLTC) */ is_branch = 1; break; + case 6: /* BLEZ (BLEZALC, BGEZALC, BGEUC) */ + case 7: /* BGTZ (BGTZALC, BLTZALC, BLTUC) */ + if (is_mipsr6) + { + /* BLEZALC, BGTZALC */ + if (itype_rs (insn) == 0 && itype_rt (insn) != 0) + return {}; /* fallback to the standard single-step code. */ + /* BGEZALC, BLTZALC */ + else if (itype_rs (insn) == itype_rt (insn) + && itype_rt (insn) != 0) + return {}; /* fallback to the standard single-step code. */ + } + is_branch = 1; + break; + case 8: /* BOVC, BEQZALC, BEQC */ + case 24: /* BNVC, BNEZALC, BNEC */ + if (is_mipsr6) + is_branch = 1; + break; + case 50: /* BC */ + case 58: /* BALC */ + if (is_mipsr6) + return {}; /* fallback to the standard single-step code. */ + break; + case 54: /* BEQZC, JIC */ + case 62: /* BNEZC, JIALC */ + if (is_mipsr6) + { + if (itype_rs (insn) == 0) /* JIC, JIALC */ + return {}; /* fallback to the standard single-step code. */ + else + is_branch = 2; /* Marker for branches with a 21-bit offset. */ + } + break; case 17: /* COP1 */ - is_branch = ((itype_rs (insn) == 9 || itype_rs (insn) == 10) - && (itype_rt (insn) & 0x2) == 0); - if (is_branch) /* BC1ANY2F, BC1ANY2T, BC1ANY4F, BC1ANY4T */ + is_branch = ((!is_mipsr6 + /* BC1ANY2F, BC1ANY2T, BC1ANY4F, BC1ANY4T */ + && (itype_rs (insn) == 9 || itype_rs (insn) == 10) + && (itype_rt (insn) & 0x2) == 0) + /* BZ.df: 010001 110xx */ + || (itype_rs (insn) & 0x18) == 0x18); + if (is_branch) break; /* Fall through. */ case 18: /* COP2 */ case 19: /* COP3 */ - is_branch = (itype_rs (insn) == 8); /* BCzF, BCzFL, BCzT, BCzTL */ + /* BCzF, BCzFL, BCzT, BCzTL, BC*EQZ, BC*NEZ */ + is_branch = ((itype_rs (insn) == 8) + || (is_mipsr6 + && (itype_rs (insn) == 9 + || itype_rs (insn) == 13))); break; } if (is_branch) { - branch_bp = loc + mips32_relative_offset (insn) + 4; + /* Is this a special PC21_S2 branch? */ + if (is_branch == 2) + branch_bp = loc + mips32_relative_offset21 (insn) + 4; + else + branch_bp = loc + mips32_relative_offset (insn) + 4; if (last_breakpoint >= 1) return {}; /* More than one branch found, fallback to the standard single-step code. */ @@ -4009,12 +4387,12 @@ mips_deal_with_atomic_sequence (struct gdbarch *gdbarch, CORE_ADDR pc) last_breakpoint++; } - if (itype_op (insn) == SC_OPCODE || itype_op (insn) == SCD_OPCODE) + if (is_sc_insn (gdbarch, insn)) break; } /* Assume that the atomic sequence ends with a sc/scd instruction. */ - if (itype_op (insn) != SC_OPCODE && itype_op (insn) != SCD_OPCODE) + if (!is_sc_insn (gdbarch, insn)) return {}; loc += MIPS_INSN32_SIZE; @@ -4239,8 +4617,14 @@ mips_about_to_return (struct gdbarch *gdbarch, CORE_ADDR pc) gdb_assert (mips_pc_is_mips (pc)); insn = mips_fetch_instruction (gdbarch, ISA_MIPS, pc, NULL); - hint = 0x7c0; - return (insn & ~hint) == 0x3e00008; /* jr(.hb) $ra */ + /* Mask the hint and the jalr/jr bit. */ + hint = 0x7c1; + + if (is_mipsr6_isa (gdbarch) && insn == 0xd81f0000) /* jrc $31 */ + return 1; + + /* jr(.hb) $ra and "jalr(.hb) $ra" */ + return ((insn & ~hint) == 0x3e00008); } @@ -6758,7 +7142,9 @@ mips32_stack_frame_destroyed_p (struct gdbarch *gdbarch, CORE_ADDR pc) if (high_word != 0x27bd /* addiu $sp,$sp,offset */ && high_word != 0x67bd /* daddiu $sp,$sp,offset */ - && inst != 0x03e00008 /* jr $ra */ + && (inst & ~0x1) != 0x03e00008 /* jr $31 or jalr $0, $31 */ + && (!is_mipsr6_isa (gdbarch) + || inst != 0xd81f0000) /* jrc $31 */ && inst != 0x00000000) /* nop */ return 0; } @@ -7136,22 +7522,31 @@ mips32_instruction_has_delay_slot (struct gdbarch *gdbarch, ULONGEST inst) int op; int rs; int rt; + bool is_mipsr6 = is_mipsr6_isa (gdbarch); op = itype_op (inst); if ((inst & 0xe0000000) != 0) { rs = itype_rs (inst); rt = itype_rt (inst); - return (is_octeon_bbit_op (op, gdbarch) - || op >> 2 == 5 /* BEQL, BNEL, BLEZL, BGTZL: bits 0101xx */ - || op == 29 /* JALX: bits 011101 */ + return (is_octeon_bbit_op (op, gdbarch) + || (op >> 1 == 10) /* BEQL, BNEL: bits 01010x */ + || (op >> 1 == 11 && rt == 0) /* BLEZL, BGTZL: bits 01011x */ + || (!is_mipsr6 && op == 29) /* JALX: bits 011101 */ || (op == 17 && (rs == 8 /* BC1F, BC1FL, BC1T, BC1TL: 010001 01000 */ - || (rs == 9 && (rt & 0x2) == 0) + || (!is_mipsr6 && rs == 9 && (rt & 0x2) == 0) /* BC1ANY2F, BC1ANY2T: bits 010001 01001 */ - || (rs == 10 && (rt & 0x2) == 0)))); + || (!is_mipsr6 && rs == 10 && (rt & 0x2) == 0))) /* BC1ANY4F, BC1ANY4T: bits 010001 01010 */ + || (is_mipsr6 + && ((op == 17 + && (rs == 9 /* BC1EQZ: 010001 01001 */ + || rs == 13)) /* BC1NEZ: 010001 01101 */ + || (op == 18 + && (rs == 9 /* BC2EQZ: 010010 01001 */ + || rs == 13))))); /* BC2NEZ: 010010 01101 */ } else switch (op & 0x07) /* extract bits 28,27,26 */ @@ -7170,7 +7565,11 @@ mips32_instruction_has_delay_slot (struct gdbarch *gdbarch, ULONGEST inst) || ((rt & 0x1e) == 0x1c && rs == 0)); /* BPOSGE32, BPOSGE64: bits 1110x */ break; /* end REGIMM */ - default: /* J, JAL, BEQ, BNE, BLEZ, BGTZ */ + case 6: /* BLEZ */ + case 7: /* BGTZ */ + return (itype_rt (inst) == 0); + break; + default: /* J, JAL, BEQ, BNE */ return 1; break; } @@ -7382,7 +7781,18 @@ mips_adjust_breakpoint_address (struct gdbarch *gdbarch, CORE_ADDR bpaddr) So, we'll use the second solution. To do this we need to know if the instruction we're trying to set the breakpoint on is in the - branch delay slot. */ + branch delay slot. + + A similar problem occurs for breakpoints on forbidden slots where + the trap will be reported for the branch with the BD bit set. + In this case it would be ideal to recover using solution 1 from + above as there is no problem with the branch being skipped + (since the forbidden slot only exists on not-taken branches). + However, the BD bit is not available in all scenarios currently + so instead we move the breakpoint on to the next instruction. + This means that it is not possible to stop on an instruction + that can be in a forbidden slot even if that instruction is + jumped to directly. */ boundary = mips_segment_boundary (bpaddr); @@ -7404,6 +7814,12 @@ mips_adjust_breakpoint_address (struct gdbarch *gdbarch, CORE_ADDR bpaddr) prev_addr = bpaddr - 4; if (mips32_insn_at_pc_has_delay_slot (gdbarch, prev_addr)) bpaddr = prev_addr; + /* If the previous instruction has a forbidden slot, we have to + move the breakpoint to the following instruction to prevent + breakpoints in forbidden slots being reported as unknown + traps. */ + else if (mips32_insn_at_pc_has_forbidden_slot (gdbarch, prev_addr)) + bpaddr += 4; } else {