/* Target-dependent code for OpenBSD/i386.
Copyright 1988, 1989, 1991, 1992, 1994, 1996, 2000, 2001, 2002,
- 2003, 2004
+ 2003, 2004, 2005
Free Software Foundation, Inc.
This file is part of GDB.
#include "i386-tdep.h"
#include "i387-tdep.h"
#include "solib-svr4.h"
+#include "bsd-uthread.h"
/* Support for signal handlers. */
{
CORE_ADDR pc = frame_pc_unwind (next_frame);
CORE_ADDR start_pc = (pc & ~(i386obsd_page_size - 1));
- const char sigreturn[] =
+ const gdb_byte sigreturn[] =
{
0xb8,
0x67, 0x00, 0x00, 0x00, /* movl $SYS_sigreturn, %eax */
0xcd, 0x80 /* int $0x80 */
};
- char *name, *buf;
+ size_t buflen = sizeof sigreturn;
+ gdb_byte *buf;
+ char *name;
/* If the function has a valid symbol name, it isn't a
trampoline. */
return 0;
/* Allocate buffer. */
- buf = alloca (sizeof sigreturn);
+ buf = alloca (buflen);
/* If we can't read the instructions at START_PC, return zero. */
- if (target_read_memory (start_pc + 0x0a, buf, sizeof sigreturn))
+ if (!safe_frame_unwind_memory (next_frame, start_pc + 0x0a, buf, buflen))
return 0;
/* Check for sigreturn(2). */
- if (memcmp (buf, sigreturn, sizeof sigreturn) == 0)
+ if (memcmp (buf, sigreturn, buflen) == 0)
return 1;
/* If we can't read the instructions at START_PC, return zero. */
- if (target_read_memory (start_pc + 0x14, buf, sizeof sigreturn))
+ if (!safe_frame_unwind_memory (next_frame, start_pc + 0x14, buf, buflen))
return 0;
/* Check for sigreturn(2) (again). */
- if (memcmp (buf, sigreturn, sizeof sigreturn) == 0)
+ if (memcmp (buf, sigreturn, buflen) == 0)
return 1;
return 0;
0 * 4 /* %gs */
};
+/* From /usr/src/lib/libpthread/arch/i386/uthread_machdep.c. */
+static int i386obsd_uthread_reg_offset[] =
+{
+ 11 * 4, /* %eax */
+ 10 * 4, /* %ecx */
+ 9 * 4, /* %edx */
+ 8 * 4, /* %ebx */
+ -1, /* %esp */
+ 6 * 4, /* %ebp */
+ 5 * 4, /* %esi */
+ 4 * 4, /* %edi */
+ 12 * 4, /* %eip */
+ -1, /* %eflags */
+ 13 * 4, /* %cs */
+ -1, /* %ss */
+ 3 * 4, /* %ds */
+ 2 * 4, /* %es */
+ 1 * 4, /* %fs */
+ 0 * 4 /* %gs */
+};
+
+/* Offset within the thread structure where we can find the saved
+ stack pointer (%esp). */
+#define I386OBSD_UTHREAD_ESP_OFFSET 176
+
+static void
+i386obsd_supply_uthread (struct regcache *regcache,
+ int regnum, CORE_ADDR addr)
+{
+ CORE_ADDR sp_addr = addr + I386OBSD_UTHREAD_ESP_OFFSET;
+ CORE_ADDR sp = 0;
+ gdb_byte buf[4];
+ int i;
+
+ gdb_assert (regnum >= -1);
+
+ if (regnum == -1 || regnum == I386_ESP_REGNUM)
+ {
+ int offset;
+
+ /* Fetch stack pointer from thread structure. */
+ sp = read_memory_unsigned_integer (sp_addr, 4);
+
+ /* Adjust the stack pointer such that it looks as if we just
+ returned from _thread_machdep_switch. */
+ offset = i386obsd_uthread_reg_offset[I386_EIP_REGNUM] + 4;
+ store_unsigned_integer (buf, 4, sp + offset);
+ regcache_raw_supply (regcache, I386_ESP_REGNUM, buf);
+ }
+
+ for (i = 0; i < ARRAY_SIZE (i386obsd_uthread_reg_offset); i++)
+ {
+ if (i386obsd_uthread_reg_offset[i] != -1
+ && (regnum == -1 || regnum == i))
+ {
+ /* Fetch stack pointer from thread structure (if we didn't
+ do so already). */
+ if (sp == 0)
+ sp = read_memory_unsigned_integer (sp_addr, 4);
+
+ /* Read the saved register from the stack frame. */
+ read_memory (sp + i386obsd_uthread_reg_offset[i], buf, 4);
+ regcache_raw_supply (regcache, i, buf);
+ }
+ }
+
+}
+
+static void
+i386obsd_collect_uthread (const struct regcache *regcache,
+ int regnum, CORE_ADDR addr)
+{
+ CORE_ADDR sp_addr = addr + I386OBSD_UTHREAD_ESP_OFFSET;
+ CORE_ADDR sp = 0;
+ gdb_byte buf[4];
+ int i;
+
+ gdb_assert (regnum >= -1);
+
+ if (regnum == -1 || regnum == I386_ESP_REGNUM)
+ {
+ int offset;
+
+ /* Calculate the stack pointer (frame pointer) that will be
+ stored into the thread structure. */
+ offset = i386obsd_uthread_reg_offset[I386_EIP_REGNUM] + 4;
+ regcache_raw_collect (regcache, I386_ESP_REGNUM, buf);
+ sp = extract_unsigned_integer (buf, 4) - offset;
+
+ /* Store the stack pointer. */
+ write_memory_unsigned_integer (sp_addr, 4, sp);
+
+ /* The stack pointer was (potentially) modified. Make sure we
+ build a proper stack frame. */
+ regnum = -1;
+ }
+
+ for (i = 0; i < ARRAY_SIZE (i386obsd_uthread_reg_offset); i++)
+ {
+ if (i386obsd_uthread_reg_offset[i] != -1
+ && (regnum == -1 || regnum == i))
+ {
+ /* Fetch stack pointer from thread structure (if we didn't
+ calculate it already). */
+ if (sp == 0)
+ sp = read_memory_unsigned_integer (sp_addr, 4);
+
+ /* Write the register into the stack frame. */
+ regcache_raw_collect (regcache, i, buf);
+ write_memory (sp + i386obsd_uthread_reg_offset[i], buf, 4);
+ }
+ }
+}
+
static void
i386obsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
{
original 4.3 BSD. */
tdep->sc_reg_offset = i386obsd_sc_reg_offset;
tdep->sc_num_regs = ARRAY_SIZE (i386obsd_sc_reg_offset);
+
+ /* OpenBSD provides a user-level threads implementation. */
+ bsd_uthread_set_supply_uthread (gdbarch, i386obsd_supply_uthread);
+ bsd_uthread_set_collect_uthread (gdbarch, i386obsd_collect_uthread);
}
/* OpenBSD a.out. */
i386_elf_init_abi (info, gdbarch);
/* OpenBSD ELF uses SVR4-style shared libraries. */
- set_gdbarch_in_solib_call_trampoline
- (gdbarch, generic_in_solib_call_trampoline);
set_solib_svr4_fetch_link_map_offsets
(gdbarch, svr4_ilp32_fetch_link_map_offsets);
}
projects / deliverable / binutils-gdb.git / blobdiff