Index: sys/arch/aarch64/aarch64/exec_machdep.c =================================================================== RCS file: /home/netbsd/src/sys/arch/aarch64/aarch64/exec_machdep.c,v retrieving revision 1.4 diff -p -u -r1.4 exec_machdep.c --- sys/arch/aarch64/aarch64/exec_machdep.c 28 Nov 2018 08:12:15 -0000 1.4 +++ sys/arch/aarch64/aarch64/exec_machdep.c 22 Nov 2019 09:35:30 -0000 @@ -83,6 +83,13 @@ aarch64_netbsd_elf32_probe(struct lwp *l ID_AA64PFR0_EL1_EL0_64_32) return ENOEXEC; + /* + * Copy (if any) the machine_arch of the executable to the proc. + */ + if (epp->ep_machine_arch[0] != 0) + strlcpy(l->l_proc->p_md.md_march32, epp->ep_machine_arch, + sizeof(l->l_proc->p_md.md_march32)); + return 0; } #endif Index: sys/arch/aarch64/aarch64/netbsd32_machdep.c =================================================================== RCS file: /home/netbsd/src/sys/arch/aarch64/aarch64/netbsd32_machdep.c,v retrieving revision 1.8 diff -p -u -r1.8 netbsd32_machdep.c --- sys/arch/aarch64/aarch64/netbsd32_machdep.c 20 Nov 2019 19:37:51 -0000 1.8 +++ sys/arch/aarch64/aarch64/netbsd32_machdep.c 22 Nov 2019 09:35:30 -0000 @@ -55,11 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mac #include const char machine32[] = MACHINE; -#ifdef __AARCH64EB__ -const char machine_arch32[] = "earmv7hfeb"; -#else -const char machine_arch32[] = "earmv7hf"; -#endif +const char machine_arch32[] = MACHINE32_ARCH; void netbsd32_setregs(struct lwp *l, struct exec_package *pack, vaddr_t stack) Index: sys/arch/aarch64/aarch64/trap.c =================================================================== RCS file: /home/netbsd/src/sys/arch/aarch64/aarch64/trap.c,v retrieving revision 1.20 diff -p -u -r1.20 trap.c --- sys/arch/aarch64/aarch64/trap.c 21 Nov 2019 19:23:58 -0000 1.20 +++ sys/arch/aarch64/aarch64/trap.c 22 Nov 2019 09:35:30 -0000 @@ -321,6 +321,67 @@ interrupt(struct trapframe *tf) cpu_dosoftints(); } +#ifdef COMPAT_NETBSD32 +static int +fetch_arm32_insn(struct trapframe *tf, uint32_t *p) +{ + + /* THUMB? */ + if (tf->tf_spsr & SPSR_A32_T) { + uint16_t *pc = (uint16_t *)(tf->tf_pc & ~1UL); + uint16_t hi, lo; + + hi = *pc; + if (ufetch_16(pc + 1, &lo)) + return 1; + + *p = ((uint32_t)hi << 16) | lo; + return 0; + } else { + *p = *(uint32_t *)tf->tf_pc; + return 0; + } +} + +static int +emul_arm32_insn(struct trapframe *tf) +{ + uint32_t insn; + + if (fetch_arm32_insn(tf, &insn)) + return 1; /* XXX SEGV */ + + /* + * Emulate ARMv6 instructions with cache operations + * register (c7), that can be used in user mode. + */ + switch ((insn & 0x0fff0fff)) { + /* + * mcr p15, 0, , c7, c5, 4 (flush prefetch buffer) + */ + case 0x0e070f95: + __asm __volatile("isb sy" ::: "memory"); + break; + /* + * mcr p15, 0, , c7, c10, 4 (data synchronization barrier) + */ + case 0x0e070f9a: + __asm __volatile("dsb sy" ::: "memory"); + break; + /* + * mcr p15, 0, , c7, c10, 5 (data memory barrier) + */ + case 0x0e070fba: + __asm __volatile("dmb sy" ::: "memory"); + break; + default: + return 1; + } + tf->tf_pc += sizeof(insn); + return 0; +} +#endif /* COMPAT_NETBSD32 */ + void trap_el0_32sync(struct trapframe *tf) { @@ -371,11 +432,18 @@ trap_el0_32sync(struct trapframe *tf) userret(l); break; + case ESR_EC_UNKNOWN: + if (emul_arm32_insn(tf)) + goto unknown; + userret(l); + break; + case ESR_EC_CP15_RT: case ESR_EC_CP15_RRT: case ESR_EC_CP14_RT: case ESR_EC_CP14_DT: case ESR_EC_CP14_RRT: +unknown: #endif /* COMPAT_NETBSD32 */ default: #ifdef DDB Index: sys/arch/aarch64/include/netbsd32_machdep.h =================================================================== RCS file: /home/netbsd/src/sys/arch/aarch64/include/netbsd32_machdep.h,v retrieving revision 1.2 diff -p -u -r1.2 netbsd32_machdep.h --- sys/arch/aarch64/include/netbsd32_machdep.h 12 Oct 2018 01:28:58 -0000 1.2 +++ sys/arch/aarch64/include/netbsd32_machdep.h 22 Nov 2019 09:35:30 -0000 @@ -107,4 +107,7 @@ struct netbsd32_arm_sync_icache_args { netbsd32_size_t len; /* Region size */ }; +/* Support varying ABI names for netbsd32 */ +#define PROC_MACHINE_ARCH32(P) ((P)->p_md.md_march32) + #endif /* _MACHINE_NETBSD32_H_ */ Index: sys/arch/aarch64/include/param.h =================================================================== RCS file: /home/netbsd/src/sys/arch/aarch64/include/param.h,v retrieving revision 1.12 diff -p -u -r1.12 param.h --- sys/arch/aarch64/include/param.h 19 Oct 2019 18:04:26 -0000 1.12 +++ sys/arch/aarch64/include/param.h 22 Nov 2019 09:35:30 -0000 @@ -59,9 +59,13 @@ # ifdef __AARCH64EB__ # define _MACHINE_ARCH aarch64eb # define MACHINE_ARCH "aarch64eb" +# define _MACHINE32_ARCH earmv7hfeb +# define MACHINE32_ARCH "earmv7hfeb" # else # define _MACHINE_ARCH aarch64 # define MACHINE_ARCH "aarch64" +# define _MACHINE32_ARCH earmv7hf +# define MACHINE32_ARCH "earmv7hf" # endif /* __AARCH64EB__ */ # endif /* MACHINE_ARCH */ #else @@ -69,14 +73,20 @@ # undef MACHINE # undef _MACHINE_ARCH # undef MACHINE_ARCH +# undef _MACHINE32_ARCH +# undef MACHINE32_ARCH # define _MACHINE aarch64 # define MACHINE "aarch64" # ifdef __AARCH64EB__ # define _MACHINE_ARCH aarch64eb # define MACHINE_ARCH "aarch64eb" +# define _MACHINE32_ARCH earmv7hfeb +# define MACHINE32_ARCH "earmv7hfeb" # else # define _MACHINE_ARCH aarch64 # define MACHINE_ARCH "aarch64" +# define _MACHINE32_ARCH earmv7hf +# define MACHINE32_ARCH "earmv7hf" # endif /* __AARCH64EB__ */ #endif /* !_KERNEL */ Index: sys/arch/aarch64/include/proc.h =================================================================== RCS file: /home/netbsd/src/sys/arch/aarch64/include/proc.h,v retrieving revision 1.3 diff -p -u -r1.3 proc.h --- sys/arch/aarch64/include/proc.h 27 Dec 2018 09:55:27 -0000 1.3 +++ sys/arch/aarch64/include/proc.h 22 Nov 2019 09:35:30 -0000 @@ -34,6 +34,10 @@ #ifdef __aarch64__ +#ifdef _KERNEL_OPT +#include "opt_compat_netbsd32.h" +#endif + struct mdlwp { void *md_onfault; struct trapframe *md_utf; @@ -43,8 +47,15 @@ struct mdlwp { struct mdproc { void (*md_syscall)(struct trapframe *); +#ifdef COMPAT_NETBSD32 + char md_march32[12]; /* machine arch of executable */ +#endif }; +#ifdef COMPAT_NETBSD32 +#define PROC0_MD_INITIALIZERS .p_md = { .md_march32 = MACHINE32_ARCH }, +#endif + #elif defined(__arm__) #include