From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29025 invoked by alias); 31 Aug 2008 17:53:52 -0000 Received: (qmail 28996 invoked by uid 22791); 31 Aug 2008 17:53:51 -0000 X-Spam-Check-By: sourceware.org Received: from mtagate5.de.ibm.com (HELO mtagate5.de.ibm.com) (195.212.29.154) by sourceware.org (qpsmtpd/0.31) with ESMTP; Sun, 31 Aug 2008 17:53:08 +0000 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate5.de.ibm.com (8.13.8/8.13.8) with ESMTP id m7VHpihH333268 for ; Sun, 31 Aug 2008 17:51:44 GMT Received: from d12av02.megacenter.de.ibm.com (d12av02.megacenter.de.ibm.com [9.149.165.228]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v9.0) with ESMTP id m7VHpiPf3743808 for ; Sun, 31 Aug 2008 19:51:44 +0200 Received: from d12av02.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id m7VHpemF020306 for ; Sun, 31 Aug 2008 19:51:41 +0200 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id m7VHpeTl020303 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sun, 31 Aug 2008 19:51:40 +0200 Received: from tuxmaker.boeblingen.de.ibm.com (localhost.localdomain [127.0.0.1]) by tuxmaker.boeblingen.de.ibm.com (8.13.8/8.13.8) with ESMTP id m7VHpeVC003229 for ; Sun, 31 Aug 2008 19:51:40 +0200 Received: (from uweigand@localhost) by tuxmaker.boeblingen.de.ibm.com (8.13.8/8.13.8/Submit) id m7VHpewU003228 for gdb-patches@sourceware.org; Sun, 31 Aug 2008 19:51:40 +0200 Message-Id: <20080831175140.327935000@de.ibm.com> References: <20080831175045.128504000@de.ibm.com> User-Agent: quilt/0.46-1 Date: Sun, 31 Aug 2008 17:53:00 -0000 From: uweigand@de.ibm.com To: gdb-patches@sourceware.org Subject: [rfc][35/37] Eliminate builtin_type_ macros: Use target arch in bsd-uthread.c Content-Disposition: inline; filename=diff-type-bsduthread Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2008-08/txt/msg00695.txt.bz2 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); } } -- Dr. Ulrich Weigand GNU Toolchain for Linux on System z and Cell BE Ulrich.Weigand@de.ibm.com