Index: stable/12/sys/arm/arm/gdb_machdep.c =================================================================== --- stable/12/sys/arm/arm/gdb_machdep.c (revision 368635) +++ stable/12/sys/arm/arm/gdb_machdep.c (revision 368636) @@ -1,117 +1,131 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2006 Olivier Houchard * All rights reserved. * * 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 * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR 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. */ #include __FBSDID("$FreeBSD$"); #include #include #include #include #include #include #include #include #include #include #include #include #include #include static register_t stacktest; void * gdb_cpu_getreg(int regnum, size_t *regsz) { *regsz = gdb_cpu_regsz(regnum); if (kdb_thread == curthread) { if (regnum < 13) return (&kdb_frame->tf_r0 + regnum); if (regnum == 13) return (&kdb_frame->tf_svc_sp); if (regnum == 14) return (&kdb_frame->tf_svc_lr); if (regnum == 15) return (&kdb_frame->tf_pc); if (regnum == 25) return (&kdb_frame->tf_spsr); } switch (regnum) { case 4: return (&kdb_thrctx->pcb_regs.sf_r4); case 5: return (&kdb_thrctx->pcb_regs.sf_r5); case 6: return (&kdb_thrctx->pcb_regs.sf_r6); case 7: return (&kdb_thrctx->pcb_regs.sf_r7); case 8: return (&kdb_thrctx->pcb_regs.sf_r8); case 9: return (&kdb_thrctx->pcb_regs.sf_r9); case 10: return (&kdb_thrctx->pcb_regs.sf_r10); case 11: return (&kdb_thrctx->pcb_regs.sf_r11); case 12: return (&kdb_thrctx->pcb_regs.sf_r12); case 13: stacktest = kdb_thrctx->pcb_regs.sf_sp + 5 * 4; return (&stacktest); case 15: /* * On context switch, the PC is not put in the PCB, but * we can retrieve it from the stack. */ if (kdb_thrctx->pcb_regs.sf_sp > KERNBASE) { kdb_thrctx->pcb_regs.sf_pc = *(register_t *) (kdb_thrctx->pcb_regs.sf_sp + 4 * 4); return (&kdb_thrctx->pcb_regs.sf_pc); } } return (NULL); } void gdb_cpu_setreg(int regnum, void *val) { + if (kdb_thread != curthread) + return; switch (regnum) { case GDB_REG_PC: - if (kdb_thread == curthread) - kdb_frame->tf_pc = *(register_t *)val; + kdb_frame->tf_pc = *(register_t *)val; + break; + case GDB_REG_SP: + kdb_frame->tf_svc_sp = *(register_t *)val; + break; + case GDB_REG_LR: + kdb_frame->tf_svc_lr = *(register_t *)val; + break; + default: + /* Write to the general purpose registers r0-r12. */ + if (regnum >= 0 && regnum <= 12) { + *(&kdb_frame->tf_r0 + regnum) = *(register_t *)val; + } + break; } } int gdb_cpu_signal(int type, int code) { switch (type) { case T_BREAKPOINT: return (SIGTRAP); } return (SIGEMT); } Index: stable/12/sys/arm/include/gdb_machdep.h =================================================================== --- stable/12/sys/arm/include/gdb_machdep.h (revision 368635) +++ stable/12/sys/arm/include/gdb_machdep.h (revision 368636) @@ -1,71 +1,73 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2006 Olivier Houchard * All rights reserved. * * 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 * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR 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. * * $FreeBSD$ */ #ifndef _MACHINE_GDB_MACHDEP_H_ #define _MACHINE_GDB_MACHDEP_H_ #define GDB_BUFSZ 400 #define GDB_NREGS 26 +#define GDB_REG_SP 13 +#define GDB_REG_LR 14 #define GDB_REG_PC 15 static __inline size_t gdb_cpu_regsz(int regnum) { /* * GDB expects the FPA registers f0-f7, each 96 bits wide, to be placed * in between the PC and CSPR in response to a "g" packet. */ return (regnum >= 16 && regnum <= 23 ? 12 : sizeof(int)); } static __inline int gdb_cpu_query(void) { return (0); } static __inline void * gdb_begin_write(void) { return (NULL); } static __inline void gdb_end_write(void *arg __unused) { } void *gdb_cpu_getreg(int, size_t *); void gdb_cpu_setreg(int, void *); int gdb_cpu_signal(int, int); #endif /* !_MACHINE_GDB_MACHDEP_H_ */ Index: stable/12 =================================================================== --- stable/12 (revision 368635) +++ stable/12 (revision 368636) Property changes on: stable/12 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r368414