diff options
| author | jhb <jhb@FreeBSD.org> | 2015-11-13 00:50:34 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2015-11-13 00:50:34 +0000 |
| commit | f91ade9d24ff00c5f6f2b46422df18bd732f9201 (patch) | |
| tree | cb4ebd85aec87dff49494a6f7db8147f15c10321 | |
| parent | d10f13372071e4697871503bf0a1ed4b584c55d1 (diff) | |
| download | FreeBSD-src-f91ade9d24ff00c5f6f2b46422df18bd732f9201.zip FreeBSD-src-f91ade9d24ff00c5f6f2b46422df18bd732f9201.tar.gz | |
MFC 284325:
Report the values of x86 segment registers to remote debuggers.
While here, also report %eflags from the i386 trapframe.
| -rw-r--r-- | sys/amd64/amd64/gdb_machdep.c | 4 | ||||
| -rw-r--r-- | sys/i386/i386/gdb_machdep.c | 16 | ||||
| -rw-r--r-- | sys/i386/i386/machdep.c | 1 | ||||
| -rw-r--r-- | sys/i386/include/gdb_machdep.h | 2 |
4 files changed, 21 insertions, 2 deletions
diff --git a/sys/amd64/amd64/gdb_machdep.c b/sys/amd64/amd64/gdb_machdep.c index 5775c8f..61ffad6 100644 --- a/sys/amd64/amd64/gdb_machdep.c +++ b/sys/amd64/amd64/gdb_machdep.c @@ -48,6 +48,8 @@ __FBSDID("$FreeBSD$"); 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); @@ -76,6 +78,8 @@ gdb_cpu_getreg(int regnum, size_t *regsz) 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); } return (NULL); } diff --git a/sys/i386/i386/gdb_machdep.c b/sys/i386/i386/gdb_machdep.c index a42b2b6..06809ad 100644 --- a/sys/i386/i386/gdb_machdep.c +++ b/sys/i386/i386/gdb_machdep.c @@ -45,14 +45,22 @@ __FBSDID("$FreeBSD$"); 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); + static uint32_t _kprivsel = GSEL(GPRIV_SEL, SEL_KPL); *regsz = gdb_cpu_regsz(regnum); - if (kdb_thread == curthread) { + if (kdb_thread == curthread) { switch (regnum) { case 0: return (&kdb_frame->tf_eax); case 1: return (&kdb_frame->tf_ecx); case 2: return (&kdb_frame->tf_edx); + case 9: return (&kdb_frame->tf_eflags); + case 10: return (&kdb_frame->tf_cs); + case 12: return (&kdb_frame->tf_ds); + case 13: return (&kdb_frame->tf_es); + case 14: return (&kdb_frame->tf_fs); } } switch (regnum) { @@ -62,6 +70,12 @@ gdb_cpu_getreg(int regnum, size_t *regsz) case 6: return (&kdb_thrctx->pcb_esi); case 7: return (&kdb_thrctx->pcb_edi); case 8: return (&kdb_thrctx->pcb_eip); + case 10: return (&_kcodesel); + case 11: return (&_kdatasel); + case 12: return (&_kdatasel); + case 13: return (&_kdatasel); + case 14: return (&_kprivsel); + case 15: return (&kdb_thrctx->pcb_gs); } return (NULL); } diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index f7fb369..b3dae26 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -3616,6 +3616,7 @@ makectx(struct trapframe *tf, struct pcb *pcb) pcb->pcb_ebx = tf->tf_ebx; pcb->pcb_eip = tf->tf_eip; pcb->pcb_esp = (ISPL(tf->tf_cs)) ? tf->tf_esp : (int)(tf + 1) - 8; + pcb->pcb_gs = rgs(); } int diff --git a/sys/i386/include/gdb_machdep.h b/sys/i386/include/gdb_machdep.h index 95af8d4..a60ba18 100644 --- a/sys/i386/include/gdb_machdep.h +++ b/sys/i386/include/gdb_machdep.h @@ -30,7 +30,7 @@ #define _MACHINE_GDB_MACHDEP_H_ #define GDB_BUFSZ 400 -#define GDB_NREGS 14 +#define GDB_NREGS 16 #define GDB_REG_PC 8 static __inline size_t |
