diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/bsd-uthread.c | 22 |
2 files changed, 18 insertions, 10 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 520ad04..2261960 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2008-09-11 Ulrich Weigand <uweigand@de.ibm.com> + * bsd-uthread.c (bsd_uthread_read_memory_address): New function. + (bsd_uthread_fetch_registers, bsd_uthread_store_registers, + bsd_uthread_wait, bsd_uthread_find_new_threads): Use it. + +2008-09-11 Ulrich Weigand <uweigand@de.ibm.com> + * procfs.c (procfs_address_to_host_pointer): Use target_gdbarch and its associated types to perform pointer conversion. (procfs_can_use_hw_breakpoint): Likewise. diff --git a/gdb/bsd-uthread.c b/gdb/bsd-uthread.c index 93198d3..59853ce 100644 --- a/gdb/bsd-uthread.c +++ b/gdb/bsd-uthread.c @@ -145,6 +145,13 @@ bsd_uthread_lookup_offset (const char *name, struct objfile *objfile) return read_memory_unsigned_integer (addr, 4); } +static CORE_ADDR +bsd_uthread_read_memory_address (CORE_ADDR addr) +{ + struct type *ptr_type = builtin_type (target_gdbarch)->builtin_data_ptr; + return read_memory_typed_address (addr, ptr_type); +} + /* If OBJFILE contains the symbols corresponding to one of the supported user-level threads libraries, activate the thread stratum implemented by this module. */ @@ -285,8 +292,7 @@ bsd_uthread_fetch_registers (struct regcache *regcache, int regnum) thread structure. This can go once we fix the underlying target. */ regnum = -1; - active_addr = read_memory_typed_address (bsd_uthread_thread_run_addr, - builtin_type_void_data_ptr); + active_addr = bsd_uthread_read_memory_address (bsd_uthread_thread_run_addr); if (addr != 0 && addr != active_addr) { bsd_uthread_check_magic (addr); @@ -303,8 +309,7 @@ bsd_uthread_store_registers (struct regcache *regcache, int regnum) CORE_ADDR addr = ptid_get_tid (inferior_ptid); CORE_ADDR active_addr; - active_addr = read_memory_typed_address (bsd_uthread_thread_run_addr, - builtin_type_void_data_ptr); + active_addr = bsd_uthread_read_memory_address (bsd_uthread_thread_run_addr); if (addr != 0 && addr != active_addr) { bsd_uthread_check_magic (addr); @@ -349,8 +354,7 @@ bsd_uthread_wait (ptid_t ptid, struct target_waitstatus *status) /* Fetch the corresponding thread ID, and augment the returned process ID with it. */ - addr = read_memory_typed_address (bsd_uthread_thread_run_addr, - builtin_type_void_data_ptr); + addr = bsd_uthread_read_memory_address (bsd_uthread_thread_run_addr); if (addr != 0) { gdb_byte buf[4]; @@ -415,8 +419,7 @@ bsd_uthread_find_new_threads (void) int offset = bsd_uthread_thread_next_offset; CORE_ADDR addr; - addr = read_memory_typed_address (bsd_uthread_thread_list_addr, - builtin_type_void_data_ptr); + addr = bsd_uthread_read_memory_address (bsd_uthread_thread_list_addr); while (addr != 0) { ptid_t ptid = ptid_build (pid, 0, addr); @@ -432,8 +435,7 @@ bsd_uthread_find_new_threads (void) add_thread (ptid); } - addr = read_memory_typed_address (addr + offset, - builtin_type_void_data_ptr); + addr = bsd_uthread_read_memory_address (addr + offset); } } |