Add fbsd_nat_add_target.

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.
This commit is contained in:
John Baldwin 2015-04-17 14:02:03 -04:00
parent 7a2a1c7935
commit 8f60fe014d
7 changed files with 30 additions and 26 deletions

View file

@ -1,3 +1,15 @@
2015-04-27 John Baldwin <jhb@FreeBSD.org>
* 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.
2015-04-27 Gary Benson <gbenson@redhat.com>
* objfiles.c (allocate_objfile): Do not attempt to expand name

View file

@ -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);

View file

@ -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);
}

View file

@ -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 */

View file

@ -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);

View file

@ -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);

View file

@ -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;