From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from xry111.site (xry111.site [89.208.246.23]) by sourceware.org (Postfix) with ESMTPS id 7522A3857B82 for ; Mon, 4 Jul 2022 06:20:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7522A3857B82 Received: from localhost.localdomain (xry111.site [IPv6:2001:470:683e::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) (Authenticated sender: xry111@xry111.site) by xry111.site (Postfix) with ESMTPSA id BA17366AD5; Mon, 4 Jul 2022 02:20:02 -0400 (EDT) Message-ID: <95fc996abd9583348184a81cdd9bc5760fba17e1.camel@xry111.site> Subject: [PATCH v2] gdb: LoongArch: add orig_a0 into register set From: Xi Ruoyao To: Tiezhu Yang , gdb-patches@sourceware.org Date: Mon, 04 Jul 2022 14:20:00 +0800 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.44.3 MIME-Version: 1.0 X-Spam-Status: No, score=-8.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FROM_SUSPICIOUS_NTLD, GIT_PATCH_0, LIKELY_SPAM_FROM, SPF_HELO_PASS, SPF_PASS, TXREP, T_PDS_OTHER_BAD_TLD, T_SCC_BODY_TEXT_LINE 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: , X-List-Received-Date: Mon, 04 Jul 2022 06:20:06 -0000 Hi Tiezhu, Thanks for the review. On Mon, 2022-07-04 at 10:50 +0800, Tiezhu Yang wrote: > The related code in gdb/loongarch-linux-nat.c also need to be > modified. Done in v2. > Additionally, we know that the LoongArch upstream Linux kernel can not > actually be used before efistub, irqchip and pci are merged [0]. >=20 > [0] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/co= mmit/?id=3Dc6f2f3e2c80e >=20 > So I think we can modify the patch subject and the commit message like > this: Done in v2, with some modification. Patch v2 follows here: -- >8 -- The basic support for LoongArch has been merged into the upstream Linux kernel since 5.19-rc1 on June 5, 2022. This commit adds orig_a0 which is added into struct user_pt_regs [1] to match the upstream kernel, and then the upstream GDB will work with the upstream kernel. Note that orig_a0 was added into struct user_pt_regs in the development cycle for merging LoongArch port into the upstream Linux kernel, so earlier kernels (notably, the product kernel with version 4.19 used in distros like UOS and Loongnix) don't have it. Inspect arch/loongarch/include/uapi/asm/ptrace.h in the kernel tree to make sure. To build upstream GDB for a kernel lacking orig_a0, it's necessary to revert this commit locally. [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tre= e/arch/loongarch/include/uapi/asm/ptrace.h#n24 Signed-off-by: Xi Ruoyao --- gdb/features/loongarch/base32.c | 1 + gdb/features/loongarch/base32.xml | 1 + gdb/features/loongarch/base64.c | 1 + gdb/features/loongarch/base64.xml | 1 + gdb/loongarch-linux-nat.c | 2 ++ gdb/loongarch-linux-tdep.c | 8 ++++++++ gdb/loongarch-tdep.c | 1 + gdb/loongarch-tdep.h | 7 ++++--- 8 files changed, 19 insertions(+), 3 deletions(-) diff --git a/gdb/features/loongarch/base32.c b/gdb/features/loongarch/base3= 2.c index 7105c152aed..3fb35ef2d05 100644 --- a/gdb/features/loongarch/base32.c +++ b/gdb/features/loongarch/base32.c @@ -41,6 +41,7 @@ create_feature_loongarch_base32 (struct target_desc *resu= lt, long regnum) tdesc_create_reg (feature, "r29", regnum++, 1, "general", 32, "uint32"); tdesc_create_reg (feature, "r30", regnum++, 1, "general", 32, "uint32"); tdesc_create_reg (feature, "r31", regnum++, 1, "general", 32, "uint32"); + tdesc_create_reg (feature, "orig_a0", regnum++, 1, "general", 32, "uint3= 2"); tdesc_create_reg (feature, "pc", regnum++, 1, "general", 32, "code_ptr")= ; tdesc_create_reg (feature, "badv", regnum++, 1, "general", 32, "code_ptr= "); return regnum; diff --git a/gdb/features/loongarch/base32.xml b/gdb/features/loongarch/bas= e32.xml index 5b00f8a8d37..af47bbd3da4 100644 --- a/gdb/features/loongarch/base32.xml +++ b/gdb/features/loongarch/base32.xml @@ -39,6 +39,7 @@ + diff --git a/gdb/features/loongarch/base64.c b/gdb/features/loongarch/base6= 4.c index 63eee024554..d84d4256294 100644 --- a/gdb/features/loongarch/base64.c +++ b/gdb/features/loongarch/base64.c @@ -41,6 +41,7 @@ create_feature_loongarch_base64 (struct target_desc *resu= lt, long regnum) tdesc_create_reg (feature, "r29", regnum++, 1, "general", 64, "uint64"); tdesc_create_reg (feature, "r30", regnum++, 1, "general", 64, "uint64"); tdesc_create_reg (feature, "r31", regnum++, 1, "general", 64, "uint64"); + tdesc_create_reg (feature, "orig_a0", regnum++, 1, "general", 64, "uint6= 4"); tdesc_create_reg (feature, "pc", regnum++, 1, "general", 64, "code_ptr")= ; tdesc_create_reg (feature, "badv", regnum++, 1, "general", 64, "code_ptr= "); return regnum; diff --git a/gdb/features/loongarch/base64.xml b/gdb/features/loongarch/bas= e64.xml index bef91e50dd7..2d8a1f6b734 100644 --- a/gdb/features/loongarch/base64.xml +++ b/gdb/features/loongarch/base64.xml @@ -39,6 +39,7 @@ + diff --git a/gdb/loongarch-linux-nat.c b/gdb/loongarch-linux-nat.c index c341e7199e3..1fd1af6c99f 100644 --- a/gdb/loongarch-linux-nat.c +++ b/gdb/loongarch-linux-nat.c @@ -53,6 +53,7 @@ fetch_gregs_from_thread (struct regcache *regcache, int r= egnum, pid_t tid) elf_gregset_t regset; =20 if (regnum =3D=3D -1 || (regnum >=3D 0 && regnum < 32) + || regnum =3D=3D LOONGARCH_ORIG_A0_REGNUM || regnum =3D=3D LOONGARCH_PC_REGNUM || regnum =3D=3D LOONGARCH_BADV_REGNUM) { @@ -78,6 +79,7 @@ store_gregs_to_thread (struct regcache *regcache, int reg= num, pid_t tid) elf_gregset_t regset; =20 if (regnum =3D=3D -1 || (regnum >=3D 0 && regnum < 32) + || regnum =3D=3D LOONGARCH_ORIG_A0_REGNUM || regnum =3D=3D LOONGARCH_PC_REGNUM || regnum =3D=3D LOONGARCH_BADV_REGNUM) { diff --git a/gdb/loongarch-linux-tdep.c b/gdb/loongarch-linux-tdep.c index 21fc67f9323..1076e935997 100644 --- a/gdb/loongarch-linux-tdep.c +++ b/gdb/loongarch-linux-tdep.c @@ -48,6 +48,9 @@ loongarch_supply_gregset (const struct regset *regset, regcache->raw_supply (i, (const void *) buf); } =20 + buf =3D (const gdb_byte*) gprs + regsize * LOONGARCH_ORIG_A0_REGNUM; + regcache->raw_supply (LOONGARCH_ORIG_A0_REGNUM, (const void *) buf); + buf =3D (const gdb_byte*) gprs + regsize * LOONGARCH_PC_REGNUM; regcache->raw_supply (LOONGARCH_PC_REGNUM, (const void *) buf); =20 @@ -57,6 +60,7 @@ loongarch_supply_gregset (const struct regset *regset, else if (regnum =3D=3D 0) regcache->raw_supply_zeroed (0); else if ((regnum > 0 && regnum < 32) + || regnum =3D=3D LOONGARCH_ORIG_A0_REGNUM || regnum =3D=3D LOONGARCH_PC_REGNUM || regnum =3D=3D LOONGARCH_BADV_REGNUM) { @@ -83,6 +87,9 @@ loongarch_fill_gregset (const struct regset *regset, regcache->raw_collect (i, (void *) buf); } =20 + buf =3D (gdb_byte *) gprs + regsize * LOONGARCH_ORIG_A0_REGNUM; + regcache->raw_collect (LOONGARCH_ORIG_A0_REGNUM, (void *) buf); + buf =3D (gdb_byte *) gprs + regsize * LOONGARCH_PC_REGNUM; regcache->raw_collect (LOONGARCH_PC_REGNUM, (void *) buf); =20 @@ -90,6 +97,7 @@ loongarch_fill_gregset (const struct regset *regset, regcache->raw_collect (LOONGARCH_BADV_REGNUM, (void *) buf); } else if ((regnum >=3D 0 && regnum < 32) + || regnum =3D=3D LOONGARCH_ORIG_A0_REGNUM || regnum =3D=3D LOONGARCH_PC_REGNUM || regnum =3D=3D LOONGARCH_BADV_REGNUM) { diff --git a/gdb/loongarch-tdep.c b/gdb/loongarch-tdep.c index f2f4e3be909..76480ce6c94 100644 --- a/gdb/loongarch-tdep.c +++ b/gdb/loongarch-tdep.c @@ -576,6 +576,7 @@ loongarch_gdbarch_init (struct gdbarch_info info, struc= t gdbarch_list *arches) for (int i =3D 0; i < 32; i++) valid_p &=3D tdesc_numbered_register (feature_cpu, tdesc_data.get (), = regnum++, loongarch_r_normal_name[i] + 1); + valid_p &=3D tdesc_numbered_register (feature_cpu, tdesc_data.get (), re= gnum++, "orig_a0"); valid_p &=3D tdesc_numbered_register (feature_cpu, tdesc_data.get (), re= gnum++, "pc"); valid_p &=3D tdesc_numbered_register (feature_cpu, tdesc_data.get (), re= gnum++, "badv"); if (!valid_p) diff --git a/gdb/loongarch-tdep.h b/gdb/loongarch-tdep.h index 54b34af1d66..acf0191fd65 100644 --- a/gdb/loongarch-tdep.h +++ b/gdb/loongarch-tdep.h @@ -35,9 +35,10 @@ enum LOONGARCH_A0_REGNUM =3D 4, /* First Argument/Return Value. */ LOONGARCH_A7_REGNUM =3D 11, /* Seventh Argument/Syscall Number. */ LOONGARCH_FP_REGNUM =3D 22, /* Frame Pointer. */ - LOONGARCH_PC_REGNUM =3D 32, /* Program Counter. */ - LOONGARCH_BADV_REGNUM =3D 33, /* Bad Vaddr for Addressing Exception. *= / - LOONGARCH_LINUX_NUM_GREGSET =3D 45, /* 32 GPR, PC, BADV, RESERVED 11. *= / + LOONGARCH_ORIG_A0_REGNUM =3D 32, /* Syscall's original arg0. */ + LOONGARCH_PC_REGNUM =3D 33, /* Program Counter. */ + LOONGARCH_BADV_REGNUM =3D 34, /* Bad Vaddr for Addressing Exception. *= / + LOONGARCH_LINUX_NUM_GREGSET =3D 45, /* 32 GPR, ORIG_A0, PC, BADV, RESERV= ED 10. */ }; =20 /* Register set definitions. */ --=20 2.37.0