From patchwork Sun Apr 26 01:24:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Baldwin X-Patchwork-Id: 6434 Received: (qmail 68328 invoked by alias); 26 Apr 2015 01:25:12 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 68235 invoked by uid 89); 26 Apr 2015 01:25:11 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.6 required=5.0 tests=AWL, BAYES_50, SPF_HELO_PASS, SPF_SOFTFAIL autolearn=no version=3.3.2 X-HELO: bigwig.baldwin.cx Received: from bigwig.baldwin.cx (HELO bigwig.baldwin.cx) (96.47.65.170) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (CAMELLIA256-SHA encrypted) ESMTPS; Sun, 26 Apr 2015 01:25:09 +0000 Received: from ralph.baldwin.cx (pool-173-54-116-245.nwrknj.fios.verizon.net [173.54.116.245]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 1F8B5B962 for ; Sat, 25 Apr 2015 21:25:07 -0400 (EDT) From: John Baldwin To: gdb-patches@sourceware.org Subject: [PATCH 1/3] Add fbsd_nat_add_target. Date: Sat, 25 Apr 2015 21:24:41 -0400 Message-ID: <4032488.W8nPzteMFC@ralph.baldwin.cx> User-Agent: KMail/4.14.2 (FreeBSD/10.1-STABLE; KDE/4.14.2; amd64; ; ) MIME-Version: 1.0 X-IsSubscribed: yes Add a wrapper for add_target in fbsd-nat.c to override target operations common to all native FreeBSD targets. gdb/ChangeLog: * fbsd-nat.c (fbsd_pid_to_exec_file): Mark static. (fbsd_find_memory_regions): Mark static. (fbsd_nat_add_target): New function. * fbsd-nat.h: Export fbsd_nat_add_target and remove prototypes for fbsd_pid_to_exec_file and fbsd_find_memory_regions. * amd64fbsd-nat.c (_initialize_amd64fbsd_nat): Use fbsd_nat_add_target. * i386fbsd-nat.c (_initialize_i386fbsd_nat): Likewise. * ppcfbsd-nat.c (_initialize_ppcfbsd_nat): Likewise. * sparc64fbsd-nat.c (_initialize_sparc64fbsd_nat): Likewise. diff --git a/gdb/amd64fbsd-nat.c b/gdb/amd64fbsd-nat.c index a721f48..4745b44 100644 --- a/gdb/amd64fbsd-nat.c +++ b/gdb/amd64fbsd-nat.c @@ -227,9 +227,7 @@ _initialize_amd64fbsd_nat (void) t->to_mourn_inferior = amd64fbsd_mourn_inferior; t->to_read_description = amd64fbsd_read_description; - t->to_pid_to_exec_file = fbsd_pid_to_exec_file; - t->to_find_memory_regions = fbsd_find_memory_regions; - add_target (t); + fbsd_nat_add_target (t); /* Support debugging kernel virtual memory images. */ bsd_kvm_add_target (amd64fbsd_supply_pcb); diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c index 1ce197d..68b8e65 100644 --- a/gdb/fbsd-nat.c +++ b/gdb/fbsd-nat.c @@ -37,7 +37,7 @@ /* Return the name of a file that can be opened to get the symbols for the child process identified by PID. */ -char * +static char * fbsd_pid_to_exec_file (struct target_ops *self, int pid) { ssize_t len = PATH_MAX; @@ -71,7 +71,7 @@ fbsd_pid_to_exec_file (struct target_ops *self, int pid) calling FUNC for each memory region. OBFD is passed as the last argument to FUNC. */ -int +static int fbsd_find_memory_regions (struct target_ops *self, find_memory_region_ftype func, void *obfd) { @@ -149,7 +149,7 @@ fbsd_read_mapping (FILE *mapfile, unsigned long *start, unsigned long *end, calling FUNC for each memory region. OBFD is passed as the last argument to FUNC. */ -int +static int fbsd_find_memory_regions (struct target_ops *self, find_memory_region_ftype func, void *obfd) { @@ -200,3 +200,11 @@ fbsd_find_memory_regions (struct target_ops *self, return 0; } #endif + +void +fbsd_nat_add_target (struct target_ops *t) +{ + t->to_pid_to_exec_file = fbsd_pid_to_exec_file; + t->to_find_memory_regions = fbsd_find_memory_regions; + add_target (t); +} diff --git a/gdb/fbsd-nat.h b/gdb/fbsd-nat.h index e6e88ff..03f6bb1 100644 --- a/gdb/fbsd-nat.h +++ b/gdb/fbsd-nat.h @@ -20,16 +20,8 @@ #ifndef FBSD_NAT_H #define FBSD_NAT_H -/* Return the name of a file that can be opened to get the symbols for - the child process identified by PID. */ - -extern char *fbsd_pid_to_exec_file (struct target_ops *self, int pid); - -/* Iterate over all the memory regions in the current inferior, - calling FUNC for each memory region. OBFD is passed as the last - argument to FUNC. */ - -extern int fbsd_find_memory_regions (struct target_ops *self, - find_memory_region_ftype func, void *obfd); +/* Register the customized FreeBSD target. This should be used + instead of calling add_target directly. */ +extern void fbsd_nat_add_target (struct target_ops *); #endif /* fbsd-nat.h */ diff --git a/gdb/i386fbsd-nat.c b/gdb/i386fbsd-nat.c index 6c43f2c..f5d2ee3 100644 --- a/gdb/i386fbsd-nat.c +++ b/gdb/i386fbsd-nat.c @@ -176,9 +176,7 @@ _initialize_i386fbsd_nat (void) #endif t->to_resume = i386fbsd_resume; - t->to_pid_to_exec_file = fbsd_pid_to_exec_file; - t->to_find_memory_regions = fbsd_find_memory_regions; - add_target (t); + fbsd_nat_add_target (t); /* Support debugging kernel virtual memory images. */ bsd_kvm_add_target (i386fbsd_supply_pcb); diff --git a/gdb/ppcfbsd-nat.c b/gdb/ppcfbsd-nat.c index 778b4bb..778e19a 100644 --- a/gdb/ppcfbsd-nat.c +++ b/gdb/ppcfbsd-nat.c @@ -212,9 +212,7 @@ _initialize_ppcfbsd_nat (void) t = inf_ptrace_target (); t->to_fetch_registers = ppcfbsd_fetch_inferior_registers; t->to_store_registers = ppcfbsd_store_inferior_registers; - t->to_pid_to_exec_file = fbsd_pid_to_exec_file; - t->to_find_memory_regions = fbsd_find_memory_regions; - add_target (t); + fbsd_nat_add_target (t); /* Support debugging kernel virtual memory images. */ bsd_kvm_add_target (ppcfbsd_supply_pcb); diff --git a/gdb/sparc64fbsd-nat.c b/gdb/sparc64fbsd-nat.c index 1a2397f..f197f74 100644 --- a/gdb/sparc64fbsd-nat.c +++ b/gdb/sparc64fbsd-nat.c @@ -70,9 +70,7 @@ _initialize_sparc64fbsd_nat (void) /* Add some extra features to the generic SPARC target. */ t = sparc_target (); - t->to_pid_to_exec_file = fbsd_pid_to_exec_file; - t->to_find_memory_regions = fbsd_find_memory_regions; - add_target (t); + fbsd_nat_add_target (t); sparc_gregmap = &sparc64fbsd_gregmap;