d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gcore: Add aarch64 32-bit core support

Browse Source 
Summary: Add trivial 32-bit arm cores on aarch64 support for gcore.  This
doesn't handle fpregs.

Reviewed by:	#arm, andrew
Sponsored by:	Juniper Networks, Inc
Differential Revision:	https://reviews.freebsd.org/D21947
This commit is contained in:
Justin Hibbits 2019-10-11 14:15:50 +00:00
parent 14601230a1
commit 26517dcf60
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arm64/include/elf.h
View File

@ -64,7 +64,11 @@ typedef struct { /* Auxiliary vector entry on initial stack */
__ElfType(Auxinfo);
#ifdef _MACHINE_ELF_WANT_32BIT
#define ELF_ARCH EM_ARM
#else
#define ELF_ARCH EM_AARCH64
#endif
#define ELF_MACHINE_OK(x) ((x) == (ELF_ARCH))

2
usr.bin/gcore/Makefile
View File

@ -5,7 +5,7 @@ PROG= gcore
SRCS= elfcore.c gcore.c
LIBADD= sbuf util
.if ${MACHINE_ARCH} == "amd64"
.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64"
SRCS+= elf32core.c
.endif

12
usr.bin/gcore/elf32core.c
View File

@ -32,7 +32,15 @@ elf_convert_gregset(elfcore_gregset_t *rd, struct reg *rs)
rd->r_eflags = rs->r_rflags;
rd->r_esp = rs->r_rsp;
rd->r_ss = rs->r_ss;
#else
#elif defined(__aarch64__)
int i;
for (i = 0; i < 13; i++)
rd->r[i] = rs->x[i];
rd->r_sp = rs->x[13];
rd->r_lr = rs->x[14];
rd->r_pc = rs->elr;
rd->r_cpsr = rs->spsr;
#error Unsupported architecture
#endif
}
@ -43,6 +51,8 @@ elf_convert_fpregset(elfcore_fpregset_t *rd, struct fpreg *rs)
#ifdef __amd64__
/* XXX this is wrong... */
memcpy(rd, rs, sizeof(*rd));
#elif defined(__aarch64__)
/* ARM64TODO */
#else
#error Unsupported architecture
#endif