OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdb/ 

Code cleanup.
	* defs.h (find_memory_region_ftype): New typedef.
	(exec_set_find_memory_regions): Use it.
	* exec.c (exec_set_find_memory_regions): Use find_memory_region_ftype.
	* fbsd-nat.c (fbsd_find_memory_regions): Likewise.
	* gcore.c (objfile_find_memory_regions): Likewise.
	* gnu-nat.c (gnu_find_memory_regions): Likewise.
	* linux-nat.c (linux_nat_find_memory_regions): Likewise.
	* procfs.c (iterate_over_mappings_cb_ftype): Remove.
	(iterate_over_mappings): Rename iterate_over_mappings_cb_ftype to
	find_memory_region_ftype.
	(insert_dbx_link_bpt_in_region): Likewise.
	(iterate_over_mappings): Likewise.  Drop the comment part about the
	function prototype.
	(find_memory_regions_callback): Use find_memory_region_ftype.
	(proc_find_memory_regions): Likewise.
	(info_mappings_callback): Rename iterate_over_mappings_cb_ftype to
	find_memory_region_ftype.
	* target.c (dummy_find_memory_regions): Use find_memory_region_ftype.
	* target.h (struct target_ops) <to_find_memory_regions>: Likewise.
This commit is contained in:
Jan Kratochvil 2010-08-31 18:08:43 +00:00
parent cbd7053759
commit b8edc417a7
10 changed files with 45 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gdb/ChangeLog
View File

@ -1,3 +1,26 @@
2010-08-31 Jan Kratochvil <jan.kratochvil@redhat.com>
Code cleanup.
* defs.h (find_memory_region_ftype): New typedef.
(exec_set_find_memory_regions): Use it.
* exec.c (exec_set_find_memory_regions): Use find_memory_region_ftype.
* fbsd-nat.c (fbsd_find_memory_regions): Likewise.
* gcore.c (objfile_find_memory_regions): Likewise.
* gnu-nat.c (gnu_find_memory_regions): Likewise.
* linux-nat.c (linux_nat_find_memory_regions): Likewise.
* procfs.c (iterate_over_mappings_cb_ftype): Remove.
(iterate_over_mappings): Rename iterate_over_mappings_cb_ftype to
find_memory_region_ftype.
(insert_dbx_link_bpt_in_region): Likewise.
(iterate_over_mappings): Likewise. Drop the comment part about the
function prototype.
(find_memory_regions_callback): Use find_memory_region_ftype.
(proc_find_memory_regions): Likewise.
(info_mappings_callback): Rename iterate_over_mappings_cb_ftype to
find_memory_region_ftype.
* target.c (dummy_find_memory_regions): Use find_memory_region_ftype.
* target.h (struct target_ops) <to_find_memory_regions>: Likewise.
2010-08-31 Sami Wagiaalla <swagiaal@redhat.com>
* psymtab.c (add_psymbol_to_bcache): Remove 'static' from

11
gdb/defs.h
View File

@ -634,12 +634,13 @@ extern void init_source_path (void);
/* From exec.c */
typedef int (*find_memory_region_ftype) (CORE_ADDR addr, unsigned long size,
int read, int write, int exec,
void *data);
/* Take over the 'find_mapped_memory' vector from exec.c. */
extern void exec_set_find_memory_regions (int (*) (int (*) (CORE_ADDR,
unsigned long,
int, int, int,
void *),
void *));
extern void exec_set_find_memory_regions
(int (*func) (find_memory_region_ftype func, void *data));
/* Possible lvalue types. Like enum language, this should be in
value.h, but needs to be here for the same reason. */

6
gdb/exec.c
View File

@ -835,11 +835,7 @@ exec_has_memory (struct target_ops *ops)
/* Find mapped memory. */
extern void
exec_set_find_memory_regions (int (*func) (int (*) (CORE_ADDR,
unsigned long,
int, int, int,
void *),
void *))
exec_set_find_memory_regions (int (*func) (find_memory_region_ftype, void *))
{
exec_ops.to_find_memory_regions = func;
}

4
gdb/fbsd-nat.c
View File

@ -92,9 +92,7 @@ fbsd_read_mapping (FILE *mapfile, unsigned long *start, unsigned long *end,
argument to FUNC. */
int
fbsd_find_memory_regions (int (*func) (CORE_ADDR, unsigned long,
int, int, int, void *),
void *obfd)
fbsd_find_memory_regions (find_memory_region_ftype func, void *obfd)
{
pid_t pid = ptid_get_pid (inferior_ptid);
char *mapfilename;

4
gdb/gcore.c
View File

@ -462,9 +462,7 @@ gcore_create_callback (CORE_ADDR vaddr, unsigned long size,
}
static int
objfile_find_memory_regions (int (*func) (CORE_ADDR, unsigned long,
int, int, int, void *),
void *obfd)
objfile_find_memory_regions (find_memory_region_ftype func, void *obfd)
{
/* Use objfile data to create memory sections. */
struct objfile *objfile;

6
gdb/gnu-nat.c
View File

@ -2487,11 +2487,7 @@ gnu_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write,
/* Call FUNC on each memory region in the task. */
static int
gnu_find_memory_regions (int (*func) (CORE_ADDR,
unsigned long,
int, int, int,
void *),
void *data)
gnu_find_memory_regions (find_memory_region_ftype func, void *data)
{
error_t err;
task_t task;

4
gdb/linux-nat.c
View File

@ -4104,9 +4104,7 @@ read_mapping (FILE *mapfile,
regions in the inferior for a corefile. */
static int
linux_nat_find_memory_regions (int (*func) (CORE_ADDR,
unsigned long,
int, int, int, void *), void *obfd)
linux_nat_find_memory_regions (find_memory_region_ftype func, void *obfd)
{
int pid = PIDGET (inferior_ptid);
char mapsfilename[MAXPATHLEN];

43
gdb/procfs.c
View File

@ -438,17 +438,9 @@ static void free_syscalls (procinfo *pi);
static int find_syscall (procinfo *pi, char *name);
#endif /* DYNAMIC_SYSCALLS */
/* A function type used as a callback back iterate_over_mappings. */
typedef int (iterate_over_mappings_cb_ftype)
(CORE_ADDR vaddr, unsigned long size, int read, int write, int execute,
void *data);
static int iterate_over_mappings
(procinfo *pi,
iterate_over_mappings_cb_ftype *child_func,
void *data,
int (*func) (struct prmap *map,
iterate_over_mappings_cb_ftype *child_func,
(procinfo *pi, find_memory_region_ftype child_func, void *data,
int (*func) (struct prmap *map, find_memory_region_ftype child_func,
void *data));
/* The head of the procinfo list: */
@ -3784,7 +3776,7 @@ solib_mappings_callback (struct prmap *map, int (*func) (int, CORE_ADDR),
static int
insert_dbx_link_bpt_in_region (struct prmap *map,
iterate_over_mappings_cb_ftype *child_func,
find_memory_region_ftype child_func,
void *data)
{
procinfo *pi = (procinfo *) data;
@ -5226,11 +5218,10 @@ procfs_use_watchpoints (struct target_ops *t)
from the callback function, or zero. */
static int
iterate_over_mappings (procinfo *pi,
iterate_over_mappings_cb_ftype *child_func,
iterate_over_mappings (procinfo *pi, find_memory_region_ftype child_func,
void *data,
int (*func) (struct prmap *map,
iterate_over_mappings_cb_ftype *child_func,
find_memory_region_ftype child_func,
void *data))
{
char pathname[MAX_PROC_NAME_SIZE];
@ -5282,23 +5273,12 @@ iterate_over_mappings (procinfo *pi,
}
/* Implements the to_find_memory_regions method. Calls an external
function for each memory region. The external function will have
the signature:
int callback (CORE_ADDR vaddr,
unsigned long size,
int read, int write, int execute,
void *data);
function for each memory region.
Returns the integer value returned by the callback. */
static int
find_memory_regions_callback (struct prmap *map,
int (*func) (CORE_ADDR,
unsigned long,
int, int, int,
void *),
void *data)
find_memory_region_ftype func, void *data)
{
return (*func) ((CORE_ADDR) map->pr_vaddr,
map->pr_size,
@ -5321,11 +5301,7 @@ find_memory_regions_callback (struct prmap *map,
the callback. */
static int
proc_find_memory_regions (int (*func) (CORE_ADDR,
unsigned long,
int, int, int,
void *),
void *data)
proc_find_memory_regions (find_memory_region_ftype func, void *data)
{
procinfo *pi = find_procinfo_or_die (PIDGET (inferior_ptid), 0);
@ -5364,8 +5340,7 @@ mappingflags (long flags)
mappings'. */
static int
info_mappings_callback (struct prmap *map,
iterate_over_mappings_cb_ftype *ignore,
info_mappings_callback (struct prmap *map, find_memory_region_ftype ignore,
void *unused)
{
unsigned int pr_off;

2
gdb/target.c
View File

@ -3005,7 +3005,7 @@ dummy_pid_to_str (struct target_ops *ops, ptid_t ptid)
/* Error-catcher for target_find_memory_regions. */
static int
dummy_find_memory_regions (int (*ignore1) (), void *ignore2)
dummy_find_memory_regions (find_memory_region_ftype ignore1, void *ignore2)
{
error (_("Command not implemented for this target."));
return 0;

6
gdb/target.h
View File

@ -504,11 +504,7 @@ struct target_ops
int (*to_async_mask) (int);
int (*to_supports_non_stop) (void);
/* find_memory_regions support method for gcore */
int (*to_find_memory_regions) (int (*) (CORE_ADDR,
unsigned long,
int, int, int,
void *),
void *);
int (*to_find_memory_regions) (find_memory_region_ftype func, void *data);
/* make_corefile_notes support method for gcore */
char * (*to_make_corefile_notes) (bfd *, int *);
/* get_bookmark support method for bookmarks */