[rfc][35/37] Eliminate builtin_type_ macros: Use target arch in bsd-uthread.c

uweigand
2008-08-31T17:53:52Z

[-- Attachment #1: diff-type-bsduthread --]
[-- Type: text/plain, Size: 3151 bytes --]

Hello,

bsd-uthread.c uses builtin_type_void_data_ptr to access target pointers.
As the thread layers (like shared library layers) should now be using
per-target architecture, this patch changes every such use to refer to
the builtin types defined by target_gdbarch instead.

Bye,
Ulrich

ChangeLog:

* 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.

Index: gdb-head/gdb/bsd-uthread.c
===================================================================
--- gdb-head.orig/gdb/bsd-uthread.c
+++ gdb-head/gdb/bsd-uthread.c
@@ -145,6 +145,13 @@ bsd_uthread_lookup_offset (const char *n
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 regc
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 regc
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 ta

/* 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];
@@ -413,8 +417,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);
@@ -422,8 +425,7 @@ bsd_uthread_find_new_threads (void)
if (!in_thread_list (ptid))
add_thread (ptid);

- addr = read_memory_typed_address (addr + offset,
- builtin_type_void_data_ptr);
+ addr = bsd_uthread_read_memory_address (addr + offset);
}
}