Index: sys/arch/aarch64/aarch64/netbsd32_machdep.c =================================================================== RCS file: /home/netbsd/src/sys/arch/aarch64/aarch64/netbsd32_machdep.c,v retrieving revision 1.13 diff -p -u -r1.13 netbsd32_machdep.c --- sys/arch/aarch64/aarch64/netbsd32_machdep.c 23 May 2020 18:08:59 -0000 1.13 +++ sys/arch/aarch64/aarch64/netbsd32_machdep.c 1 Jun 2020 11:49:22 -0000 @@ -37,6 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mac #include #include #include +#include #include #include #include @@ -92,6 +93,30 @@ netbsd32_setregs(struct lwp *l, struct e tf->tf_spsr |= SPSR_A32_T; } +int +netbsd32_ptrace_translate_request(int req) +{ + + switch (req) { + case 0 ... PT_FIRSTMACH - 1: + return req; + case PT32_GETREGS: + return PT_GETREGS; + case PT32_SETREGS: + return PT_SETREGS; + case PT32_GETFPREGS: + return PT_GETFPREGS; + case PT32_SETFPREGS: + return PT_SETFPREGS; + /* not implemented for arm32 */ + case PT32_STEP: + case PT32_SETSTEP: + case PT32_CLEARSTEP: + default: + return -1; + } +} + /* aarch32 fpscr register is assigned to two registers fpsr/fpcr on aarch64 */ #define FPSR_BITS \ (FPSR_N32|FPSR_Z32|FPSR_C32|FPSR_V32|FPSR_QC| \ @@ -100,7 +125,7 @@ netbsd32_setregs(struct lwp *l, struct e (FPCR_AHP|FPCR_DN|FPCR_FZ|FPCR_RMODE|FPCR_STRIDE|FPCR_LEN| \ FPCR_IDE|FPCR_IXE|FPCR_UFE|FPCR_OFE|FPCR_DZE|FPCR_IOE) -static int +int netbsd32_process_read_regs(struct lwp *l, struct reg32 *regs) { struct proc * const p = l->l_proc; @@ -124,7 +149,7 @@ netbsd32_process_read_regs(struct lwp *l return 0; } -static int +int netbsd32_process_read_fpregs(struct lwp *l, struct fpreg32 *fpregs, size_t *lenp) { @@ -164,6 +189,72 @@ netbsd32_process_read_fpregs(struct lwp } int +netbsd32_process_write_regs(struct lwp *l, const struct reg32 *regs) +{ + struct proc * const p = l->l_proc; + struct trapframe *tf = l->l_md.md_utf; + int i; + + if ((p->p_flag & PK_32) == 0) + return EINVAL; + + /* + * XXX: Check for security violations. + */ + if ((regs->r_cpsr & ~(SPSR_NZCV | SPSR_A32_T)) != 0 || + regs->r_pc >= VM_MAXUSER_ADDRESS32 || + regs->r_sp >= VM_MAXUSER_ADDRESS32) + return EINVAL; + + for (i = 0; i < 13; i++) + tf->tf_reg[i] = regs->r[i]; /* r0-r12 */ + tf->tf_reg[13] = regs->r_sp; /* r13 = sp */ + tf->tf_reg[14] = regs->r_lr; /* r14 = lr */ + tf->tf_pc = regs->r_pc; /* r15 = pc */ + tf->tf_spsr &= ~(SPSR_NZCV | SPSR_A32_T); + tf->tf_spsr |= regs->r_cpsr; + + /* THUMB CODE? */ + if (regs->r_pc & 1) + tf->tf_spsr |= SPSR_A32_T; + + return 0; +} + +int +netbsd32_process_write_fpregs(struct lwp *l, const struct fpreg32 *fpregs, + size_t len) +{ + struct proc * const p = l->l_proc; + struct pcb * const pcb = lwp_getpcb(l); + int i; + + if ((p->p_flag & PK_32) == 0) + return EINVAL; + + KASSERT(len <= sizeof(*fpregs)); + fpu_discard(l, true); // set used flag + + pcb->pcb_fpregs.fpsr = fpregs->fpr_vfp.vfp_fpscr & FPSR_BITS; + pcb->pcb_fpregs.fpcr = fpregs->fpr_vfp.vfp_fpscr & FPCR_BITS; + + CTASSERT(__arraycount(fpregs->fpr_vfp.vfp_regs) == + __arraycount(pcb->pcb_fpregs.fp_reg) + 1); + for (i = 0; i < __arraycount(pcb->pcb_fpregs.fp_reg); i++) { +#ifdef __AARCH64EB__ + pcb->pcb_fpregs.fp_reg[i].u64[0] = 0; + pcb->pcb_fpregs.fp_reg[i].u64[1] = +#else + pcb->pcb_fpregs.fp_reg[i].u64[1] = 0; + pcb->pcb_fpregs.fp_reg[i].u64[0] = +#endif + fpregs->fpr_vfp.vfp_regs[i]; + } + + return 0; +} + +int cpu_coredump32(struct lwp *l, struct coredump_iostate *iocookie, struct core32 *chdr) { Index: sys/arch/aarch64/aarch64/pmap.c =================================================================== RCS file: /home/netbsd/src/sys/arch/aarch64/aarch64/pmap.c,v retrieving revision 1.79 diff -p -u -r1.79 pmap.c --- sys/arch/aarch64/aarch64/pmap.c 24 Jun 2020 08:27:47 -0000 1.79 +++ sys/arch/aarch64/aarch64/pmap.c 24 Jun 2020 10:52:20 -0000 @@ -947,10 +947,20 @@ pmap_icache_sync_range(pmap_t pm, vaddr_ void pmap_procwr(struct proc *p, vaddr_t va, int len) { +#if 0 + paddr_t pa; - /* We only need to do anything if it is the current process. */ - if (p == curproc) - cpu_icache_sync_range(va, len); + if (p != curproc) { + struct pmap *pm = p->p_vmspace->vm_map.pmap; + if (!pmap_extract(pm, va, &pa)) + return; + va = AARCH64_PA_TO_KVA(pa); + } + cpu_icache_sync_range(va, len); +#else + /* XXX */ + aarch64_icache_inv_all(); +#endif } static pt_entry_t Index: sys/arch/aarch64/aarch64/trap.c =================================================================== RCS file: /home/netbsd/src/sys/arch/aarch64/aarch64/trap.c,v retrieving revision 1.27 diff -p -u -r1.27 trap.c --- sys/arch/aarch64/aarch64/trap.c 13 Apr 2020 05:40:25 -0000 1.27 +++ sys/arch/aarch64/aarch64/trap.c 1 Jun 2020 11:49:22 -0000 @@ -395,6 +395,7 @@ enum emul_arm_result { static enum emul_arm_result emul_arm_insn(struct trapframe *tf) { + struct lwp * const l = curlwp; uint32_t insn; int insn_size; @@ -404,12 +405,28 @@ emul_arm_insn(struct trapframe *tf) case 2: /* T32-16bit instruction */ + /* + * Breakpoint used by GDB. + */ + if (insn == 0xdefe) + goto trap; + /* XXX: some T32 IT instruction deprecated should be emulated */ break; case 4: /* T32-32bit instruction, or A32 instruction */ /* + * Breakpoint used by GDB. + */ + if (insn == 0xe6000011 || insn == 0xe7ffdefe) { + trap: + do_trapsignal(l, SIGTRAP, TRAP_BRKPT, + (void *)tf->tf_pc, 0); + return 0; + } + + /* * Emulate ARMv6 instructions with cache operations * register (c7), that can be used in user mode. */ Index: sys/arch/aarch64/include/netbsd32_machdep.h =================================================================== RCS file: /home/netbsd/src/sys/arch/aarch64/include/netbsd32_machdep.h,v retrieving revision 1.3 diff -p -u -r1.3 netbsd32_machdep.h --- sys/arch/aarch64/include/netbsd32_machdep.h 24 Nov 2019 04:08:36 -0000 1.3 +++ sys/arch/aarch64/include/netbsd32_machdep.h 1 Jun 2020 11:49:22 -0000 @@ -7,6 +7,18 @@ #include #include +/* + * arm ptrace constants + * Please keep in sync with sys/arch/arm/include/ptrace.h. + */ +#define PT32_STEP (PT_FIRSTMACH + 0) /* Not implemented */ +#define PT32_GETREGS (PT_FIRSTMACH + 1) +#define PT32_SETREGS (PT_FIRSTMACH + 2) +#define PT32_GETFPREGS (PT_FIRSTMACH + 5) +#define PT32_SETFPREGS (PT_FIRSTMACH + 6) +#define PT32_SETSTEP (PT_FIRSTMACH + 7) /* Not implemented */ +#define PT32_CLEARSTEP (PT_FIRSTMACH + 8) /* Not implemented */ + #define NETBSD32_POINTER_TYPE uint32_t typedef struct { NETBSD32_POINTER_TYPE i32; } netbsd32_pointer_t; @@ -103,11 +115,20 @@ struct netbsd32_cpustate { #define ARM_FPU_USED 3 struct netbsd32_arm_sync_icache_args { - netbsd32_uintptr_t addr; /* Virtual start address */ - netbsd32_size_t len; /* Region size */ + uint32_t addr; /* Virtual start address */ + uint32_t len; /* Region size */ }; /* Support varying ABI names for netbsd32 */ #define PROC_MACHINE_ARCH32(P) ((P)->p_md.md_march32) +/* Translate ptrace() PT_* request from 32-bit userland to kernel. */ +int netbsd32_ptrace_translate_request(int); + +int netbsd32_process_read_regs(struct lwp *, struct reg32 *); +int netbsd32_process_read_fpregs(struct lwp *, struct fpreg32 *, size_t *); + +int netbsd32_process_write_regs(struct lwp *, const struct reg32 *); +int netbsd32_process_write_fpregs(struct lwp *, const struct fpreg32 *, size_t); + #endif /* _MACHINE_NETBSD32_H_ */ Index: sys/arch/aarch64/include/ptrace.h =================================================================== RCS file: /home/netbsd/src/sys/arch/aarch64/include/ptrace.h,v retrieving revision 1.9 diff -p -u -r1.9 ptrace.h --- sys/arch/aarch64/include/ptrace.h 18 Jun 2019 21:18:11 -0000 1.9 +++ sys/arch/aarch64/include/ptrace.h 1 Jun 2020 11:49:22 -0000 @@ -66,6 +66,25 @@ #define PTRACE_BREAKPOINT_ASM __asm __volatile("brk #13" ::: "memory") #define PTRACE_BREAKPOINT_SIZE 4 +#ifdef _KERNEL_OPT +#include "opt_compat_netbsd32.h" +#endif + +#ifdef COMPAT_NETBSD32 +#include + +#define process_read_regs32 netbsd32_process_read_regs +#define process_read_fpregs32 netbsd32_process_read_fpregs + +#define process_write_regs32 netbsd32_process_write_regs +#define process_write_fpregs32 netbsd32_process_write_fpregs + +#define process_reg32 struct reg32 +#define process_fpreg32 struct fpreg32 + +#define PTRACE_TRANSLATE_REQUEST32(x) netbsd32_ptrace_translate_request(x) +#endif /* COMPAT_NETBSD32 */ + #elif defined(__arm__) #include