Index: head/sys/amd64/amd64/gdb_machdep.c =================================================================== --- head/sys/amd64/amd64/gdb_machdep.c (revision 368764) +++ head/sys/amd64/amd64/gdb_machdep.c (revision 368765) @@ -1,170 +1,170 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2004 Marcel Moolenaar * 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 #include #include #include #include void * gdb_cpu_getreg(int regnum, size_t *regsz) { static uint32_t _kcodesel = GSEL(GCODE_SEL, SEL_KPL); static uint32_t _kdatasel = GSEL(GDATA_SEL, SEL_KPL); *regsz = gdb_cpu_regsz(regnum); if (kdb_thread == curthread) { switch (regnum) { - case 0: return (&kdb_frame->tf_rax); - case 2: return (&kdb_frame->tf_rcx); - case 3: return (&kdb_frame->tf_rdx); - case 4: return (&kdb_frame->tf_rsi); - case 5: return (&kdb_frame->tf_rdi); - case 8: return (&kdb_frame->tf_r8); - case 9: return (&kdb_frame->tf_r9); - case 10: return (&kdb_frame->tf_r10); - case 11: return (&kdb_frame->tf_r11); - case 17: return (&kdb_frame->tf_rflags); - case 18: return (&kdb_frame->tf_cs); - case 19: return (&kdb_frame->tf_ss); + case GDB_REG_RAX: return (&kdb_frame->tf_rax); + case GDB_REG_RCX: return (&kdb_frame->tf_rcx); + case GDB_REG_RDX: return (&kdb_frame->tf_rdx); + case GDB_REG_RSI: return (&kdb_frame->tf_rsi); + case GDB_REG_RDI: return (&kdb_frame->tf_rdi); + case GDB_REG_R8: return (&kdb_frame->tf_r8); + case GDB_REG_R9: return (&kdb_frame->tf_r9); + case GDB_REG_R10: return (&kdb_frame->tf_r10); + case GDB_REG_R11: return (&kdb_frame->tf_r11); + case GDB_REG_RFLAGS: return (&kdb_frame->tf_rflags); + case GDB_REG_CS: return (&kdb_frame->tf_cs); + case GDB_REG_SS: return (&kdb_frame->tf_ss); } } switch (regnum) { - case 1: return (&kdb_thrctx->pcb_rbx); - case 6: return (&kdb_thrctx->pcb_rbp); - case 7: return (&kdb_thrctx->pcb_rsp); - case 12: return (&kdb_thrctx->pcb_r12); - case 13: return (&kdb_thrctx->pcb_r13); - case 14: return (&kdb_thrctx->pcb_r14); - case 15: return (&kdb_thrctx->pcb_r15); - case 16: return (&kdb_thrctx->pcb_rip); - case 18: return (&_kcodesel); - case 19: return (&_kdatasel); + case GDB_REG_RBX: return (&kdb_thrctx->pcb_rbx); + case GDB_REG_RBP: return (&kdb_thrctx->pcb_rbp); + case GDB_REG_RSP: return (&kdb_thrctx->pcb_rsp); + case GDB_REG_R12: return (&kdb_thrctx->pcb_r12); + case GDB_REG_R13: return (&kdb_thrctx->pcb_r13); + case GDB_REG_R14: return (&kdb_thrctx->pcb_r14); + case GDB_REG_R15: return (&kdb_thrctx->pcb_r15); + case GDB_REG_PC: return (&kdb_thrctx->pcb_rip); + case GDB_REG_CS: return (&_kcodesel); + case GDB_REG_SS: return (&_kdatasel); } return (NULL); } void gdb_cpu_setreg(int regnum, void *val) { register_t regval = *(register_t *)val; /* * Write registers to the trapframe and pcb, if applicable. * Some scratch registers are not tracked by the pcb. */ if (kdb_thread == curthread) { switch (regnum) { case GDB_REG_RAX: kdb_frame->tf_rax = regval; break; case GDB_REG_RBX: kdb_frame->tf_rbx = regval; break; case GDB_REG_RCX: kdb_frame->tf_rcx = regval; break; case GDB_REG_RDX: kdb_frame->tf_rdx = regval; break; case GDB_REG_RSI: kdb_frame->tf_rsi = regval; break; case GDB_REG_RDI: kdb_frame->tf_rdi = regval; break; case GDB_REG_RBP: kdb_frame->tf_rbp = regval; break; case GDB_REG_RSP: kdb_frame->tf_rsp = regval; break; case GDB_REG_R8: kdb_frame->tf_r8 = regval; break; case GDB_REG_R9: kdb_frame->tf_r9 = regval; break; case GDB_REG_R10: kdb_frame->tf_r10 = regval; break; case GDB_REG_R11: kdb_frame->tf_r11 = regval; break; case GDB_REG_R12: kdb_frame->tf_r12 = regval; break; case GDB_REG_R13: kdb_frame->tf_r13 = regval; break; case GDB_REG_R14: kdb_frame->tf_r14 = regval; break; case GDB_REG_R15: kdb_frame->tf_r15 = regval; break; case GDB_REG_PC: kdb_frame->tf_rip = regval; break; } } switch (regnum) { case GDB_REG_RBX: kdb_thrctx->pcb_rbx = regval; break; case GDB_REG_RBP: kdb_thrctx->pcb_rbp = regval; break; case GDB_REG_RSP: kdb_thrctx->pcb_rsp = regval; break; case GDB_REG_R12: kdb_thrctx->pcb_r12 = regval; break; case GDB_REG_R13: kdb_thrctx->pcb_r13 = regval; break; case GDB_REG_R14: kdb_thrctx->pcb_r14 = regval; break; case GDB_REG_R15: kdb_thrctx->pcb_r15 = regval; break; case GDB_REG_PC: kdb_thrctx->pcb_rip = regval; break; } } int gdb_cpu_signal(int type, int code) { switch (type & ~T_USER) { case 0: return (SIGFPE); /* Divide by zero. */ case 1: return (SIGTRAP); /* Debug exception. */ case 3: return (SIGTRAP); /* Breakpoint. */ case 4: return (SIGSEGV); /* into instr. (overflow). */ case 5: return (SIGURG); /* bound instruction. */ case 6: return (SIGILL); /* Invalid opcode. */ case 7: return (SIGFPE); /* Coprocessor not present. */ case 8: return (SIGEMT); /* Double fault. */ case 9: return (SIGSEGV); /* Coprocessor segment overrun. */ case 10: return (SIGTRAP); /* Invalid TSS (also single-step). */ case 11: return (SIGSEGV); /* Segment not present. */ case 12: return (SIGSEGV); /* Stack exception. */ case 13: return (SIGSEGV); /* General protection. */ case 14: return (SIGSEGV); /* Page fault. */ case 16: return (SIGEMT); /* Coprocessor error. */ } return (SIGEMT); } void * gdb_begin_write(void) { return (disable_wp() ? &gdb_begin_write : NULL); } void gdb_end_write(void *arg) { restore_wp(arg != NULL); } Index: head/sys/amd64/include/gdb_machdep.h =================================================================== --- head/sys/amd64/include/gdb_machdep.h (revision 368764) +++ head/sys/amd64/include/gdb_machdep.h (revision 368765) @@ -1,73 +1,76 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2004 Marcel Moolenaar * 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 4096 #define GDB_NREGS 56 #define GDB_REG_RAX 0 #define GDB_REG_RBX 1 #define GDB_REG_RCX 2 #define GDB_REG_RDX 3 #define GDB_REG_RSI 4 #define GDB_REG_RDI 5 #define GDB_REG_RBP 6 #define GDB_REG_RSP 7 #define GDB_REG_R8 8 #define GDB_REG_R9 9 #define GDB_REG_R10 10 #define GDB_REG_R11 11 #define GDB_REG_R12 12 #define GDB_REG_R13 13 #define GDB_REG_R14 14 #define GDB_REG_R15 15 #define GDB_REG_PC 16 +#define GDB_REG_RFLAGS 17 +#define GDB_REG_CS 18 +#define GDB_REG_SS 19 _Static_assert(GDB_BUFSZ >= (GDB_NREGS * 16), "buffer fits 'g' regs"); static __inline size_t gdb_cpu_regsz(int regnum) { return ((regnum > 16 && regnum < 24) ? 4 : 8); } static __inline int gdb_cpu_query(void) { return (0); } void *gdb_begin_write(void); void *gdb_cpu_getreg(int, size_t *); void gdb_cpu_setreg(int, void *); int gdb_cpu_signal(int, int); void gdb_end_write(void *); #endif /* !_MACHINE_GDB_MACHDEP_H_ */