diff options
Diffstat (limited to 'gdb/i386bsd-tdep.c')
| -rw-r--r-- | gdb/i386bsd-tdep.c | 100 |
1 files changed, 76 insertions, 24 deletions
diff --git a/gdb/i386bsd-tdep.c b/gdb/i386bsd-tdep.c index c0c544de52d..94d68600fee 100644 --- a/gdb/i386bsd-tdep.c +++ b/gdb/i386bsd-tdep.c @@ -41,26 +41,19 @@ i386bsd_pc_in_sigtramp (CORE_ADDR pc, char *name) return (pc >= tdep->sigtramp_start && pc < tdep->sigtramp_end); } -/* Assuming FRAME is for a BSD sigtramp routine, return the address of - the associated sigcontext structure. +/* Assuming NEXT_FRAME is for a frame following a BSD sigtramp + routine, return the address of the associated sigcontext structure. */ - Note: This function is used for Solaris 2 too, so don't make it - static. */ - -CORE_ADDR -i386bsd_sigcontext_addr (struct frame_info *frame) +static CORE_ADDR +i386bsd_sigcontext_addr (struct frame_info *next_frame) { - struct frame_info *next_frame = get_next_frame (frame); + char buf[4]; + CORE_ADDR sp; - if (next_frame) - /* If this isn't the top frame, the next frame must be for the - signal handler itself. A pointer to the sigcontext structure - is passed as the third argument to the signal handler. */ - return read_memory_unsigned_integer (get_frame_base (next_frame) + 16, 4); + frame_unwind_register (next_frame, I386_ESP_REGNUM, buf); + sp = extract_unsigned_integer (buf, 4); - /* This is the top frame. We'll have to find the address of the - sigcontext structure by looking at the stack pointer. */ - return read_memory_unsigned_integer (read_register (SP_REGNUM) + 8, 4); + return read_memory_unsigned_integer (sp + 8, 4); } /* Return the start address of the sigtramp routine. */ @@ -93,8 +86,25 @@ i386bsd_aout_in_solib_call_trampoline (CORE_ADDR pc, char *name) /* Traditional BSD (4.3 BSD, still used for BSDI and 386BSD). */ /* From <machine/signal.h>. */ -int i386bsd_sc_pc_offset = 20; -int i386bsd_sc_sp_offset = 8; +int i386bsd_sc_reg_offset[I386_NUM_GREGS] = +{ + -1, /* %eax */ + -1, /* %ecx */ + -1, /* %edx */ + -1, /* %ebx */ + 8 + 0 * 4, /* %esp */ + 8 + 1 * 4, /* %ebp */ + -1, /* %esi */ + -1, /* %edi */ + 8 + 3 * 4, /* %eip */ + 8 + 4 * 4, /* %eflags */ + -1, /* %cs */ + -1, /* %ss */ + -1, /* %ds */ + -1, /* %es */ + -1, /* %fs */ + -1 /* %gs */ +}; void i386bsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) @@ -116,8 +126,8 @@ i386bsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) tdep->sigtramp_start = 0xfdbfdfc0; tdep->sigtramp_end = 0xfdbfe000; tdep->sigcontext_addr = i386bsd_sigcontext_addr; - tdep->sc_pc_offset = i386bsd_sc_pc_offset; - tdep->sc_sp_offset = i386bsd_sc_sp_offset; + tdep->sc_reg_offset = i386bsd_sc_reg_offset; + tdep->sc_num_regs = I386_NUM_GREGS; } /* FreeBSD 3.0-RELEASE or later. */ @@ -125,6 +135,27 @@ i386bsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) CORE_ADDR i386fbsd_sigtramp_start = 0xbfbfdf20; CORE_ADDR i386fbsd_sigtramp_end = 0xbfbfdff0; +/* From <machine/signal.h>. */ +int i386fbsd_sc_reg_offset[I386_NUM_GREGS] = +{ + 8 + 14 * 4, /* %eax */ + 8 + 13 * 4, /* %ecx */ + 8 + 12 * 4, /* %edx */ + 8 + 11 * 4, /* %ebx */ + 8 + 0 * 4, /* %esp */ + 8 + 1 * 4, /* %ebp */ + 8 + 10 * 4, /* %esi */ + 8 + 9 * 4, /* %edi */ + 8 + 3 * 4, /* %eip */ + 8 + 4 * 4, /* %eflags */ + 8 + 7 * 4, /* %cs */ + 8 + 8 * 4, /* %ss */ + 8 + 6 * 4, /* %ds */ + 8 + 5 * 4, /* %es */ + 8 + 15 * 4, /* %fs */ + 8 + 16 * 4 /* %gs */ +}; + static void i386fbsdaout_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { @@ -139,6 +170,10 @@ i386fbsdaout_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) /* FreeBSD uses a different memory layout. */ tdep->sigtramp_start = i386fbsd_sigtramp_start; tdep->sigtramp_end = i386fbsd_sigtramp_end; + + /* FreeBSD has a more complete `struct sigcontext'. */ + tdep->sc_reg_offset = i386fbsd_sc_reg_offset; + tdep->sc_num_regs = I386_NUM_GREGS; } static void @@ -158,8 +193,25 @@ i386fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) /* FreeBSD 4.0-RELEASE or later. */ /* From <machine/signal.h>. */ -int i386fbsd4_sc_pc_offset = 76; -int i386fbsd4_sc_sp_offset = 88; +int i386fbsd4_sc_reg_offset[I386_NUM_GREGS] = +{ + 20 + 11 * 4, /* %eax */ + 20 + 10 * 4, /* %ecx */ + 20 + 9 * 4, /* %edx */ + 20 + 8 * 4, /* %ebx */ + 20 + 17 * 4, /* %esp */ + 20 + 6 * 4, /* %ebp */ + 20 + 5 * 4, /* %esi */ + 20 + 4 * 4, /* %edi */ + 20 + 14 * 4, /* %eip */ + 20 + 16 * 4, /* %eflags */ + 20 + 15 * 4, /* %cs */ + 20 + 18 * 4, /* %ss */ + 20 + 3 * 4, /* %ds */ + 20 + 2 * 4, /* %es */ + 20 + 1 * 4, /* %fs */ + 20 + 0 * 4 /* %gs */ +}; static void i386fbsd4_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) @@ -171,8 +223,8 @@ i386fbsd4_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) i386fbsd_init_abi (info, gdbarch); /* FreeBSD 4.0 introduced a new `struct sigcontext'. */ - tdep->sc_pc_offset = i386fbsd4_sc_pc_offset; - tdep->sc_sp_offset = i386fbsd4_sc_sp_offset; + tdep->sc_reg_offset = i386fbsd4_sc_reg_offset; + tdep->sc_num_regs = I386_NUM_GREGS; } |