Fri Jan 1 13:04:08 2021 UTC ()

Pull up following revision(s) (requested by rin in ticket #1173):

	sys/kern/core_elf32.c: revision 1.65 (patch)

Use correct note types for register storage in 32-bit core files for
architecture on which 64- and 32-bit ABIs use different values for
PT_GET{,FP}REGS, i.e., aarch64{,eb}.

Now, 32-bit GDB works fine for core files generated by aarch64{,eb}
kernel.

Should be no functional changes for ports other than aarch64{,eb}.


(martin)

diff -r1.58 -r1.58.4.1 src/sys/kern/core_elf32.c

--- src/sys/kern/core_elf32.c 2019/01/22 03:44:44	1.58
+++ src/sys/kern/core_elf32.c 2021/01/01 13:04:08	1.58.4.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: core_elf32.c,v 1.58 2019/01/22 03:44:44 kamil Exp $	*/
+/*	$NetBSD: core_elf32.c,v 1.58.4.1 2021/01/01 13:04:08 martin Exp $	*/
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -30,53 +30,57 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * core_elf32.c/core_elf64.c: Support for the Elf32/Elf64 core file format.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: core_elf32.c,v 1.58 2019/01/22 03:44:44 kamil Exp $");
+__KERNEL_RCSID(1, "$NetBSD: core_elf32.c,v 1.58.4.1 2021/01/01 13:04:08 martin Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_coredump.h"
 #include "opt_compat_netbsd32.h"
 #endif
 #ifndef ELFSIZE
 #define	ELFSIZE		32
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/exec.h>
 #include <sys/exec_elf.h>
 #include <sys/ptrace.h>
 #include <sys/kmem.h>
 #include <sys/kauth.h>
 #include <machine/reg.h>
 #include <uvm/uvm_extern.h>
 #ifdef COREDUMP
 #ifdef COMPAT_NETBSD32
 #include <machine/netbsd32_machdep.h>
 #endif
 struct writesegs_state {
 	Elf_Phdr *psections;
 	proc_t   *p;
 	off_t	 secoff;
 	size_t   npsections;
 };
 /*
  * We need to know how big the 'notes' are before we write the main header.
  * To avoid problems with double-processing we save the data.
  */
 struct note_buf {
 	struct note_buf  *nb_next;
 @@ -479,36 +483,47 @@ ELFNAMEEND(coredump_note)(struct lwp *l,
 	elf_reg intreg;
 #ifdef PT_GETFPREGS
 	elf_fpreg freg;
 	size_t freglen;
 #endif
 	snprintf(name, sizeof(name), "%s@%d",
 	    ELF_NOTE_NETBSD_CORE_NAME, l->l_lid);
 	error = elf_process_read_regs(l, &intreg);
 	if (error)
 		return (error);
-	ELFNAMEEND(coredump_savenote)(ns, PT_GETREGS, name, &intreg,
+	ELFNAMEEND(coredump_savenote)(ns,
-	    sizeof(intreg));
+#if ELFSIZE == 32 && defined(PT32_GETREGS)
 	    PT32_GETREGS,
 #else
 	    PT_GETREGS,
 #endif
 	    name, &intreg, sizeof(intreg));
 #ifdef PT_GETFPREGS
 	freglen = sizeof(freg);
 	error = elf_process_read_fpregs(l, &freg, &freglen);
 	if (error)
 		return (error);
-	ELFNAMEEND(coredump_savenote)(ns, PT_GETFPREGS, name, &freg, freglen);
+	ELFNAMEEND(coredump_savenote)(ns,
 #  if ELFSIZE == 32 && defined(PT32_GETFPREGS)
 	    PT32_GETFPREGS,
 #  else
 	    PT_GETFPREGS,
 #  endif
 	    name, &freg, freglen);
 #endif
 	/* XXX Add hook for machdep per-LWP notes. */
 	return (0);
+}
 static void
 save_note_bytes(struct note_state *ns, const void *data, size_t len)
+{
 	struct note_buf *nb = ns->ns_last;
 	size_t copylen;
 	unsigned char *wp;
 	/*