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

Rename the read symbol to xread

Browse Source 
This avoids clashes with macro read in the NetBSD headers.

gdb/ChangeLog:

	* user-regs.c (user_reg::read): Rename to...
	(user_reg::xread): ...this.
	* (append_user_reg): Rename argument `read' to `xread'.
	* (user_reg_add_builtin): Likewise.
	* (user_reg_add): Likewise.
	* (value_of_user_reg): Likewise.
This commit is contained in:
Kamil Rytarowski 2020-03-17 13:41:46 +01:00
parent fe64b263e0
commit 5ccd2fb722
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gdb/ChangeLog
View File

@ -1,3 +1,12 @@
2020-03-17 Kamil Rytarowski <n54@gmx.com>
* user-regs.c (user_reg::read): Rename to...
(user_reg::xread): ...this.
* (append_user_reg): Rename argument `read' to `xread'.
* (user_reg_add_builtin): Likewise.
* (user_reg_add): Likewise.
* (value_of_user_reg): Likewise.
2020-03-17 Kamil Rytarowski <n54@gmx.com> 2020-03-17 Kamil Rytarowski <n54@gmx.com>
* sparc-nat.c (gdb_ptrace): New. * sparc-nat.c (gdb_ptrace): New.

21
gdb/user-regs.c
View File

@ -41,7 +41,10 @@
struct user_reg struct user_reg
{ {
const char *name; const char *name;
struct value *(*read) (struct frame_info * frame, const void *baton); /* Avoid the "read" symbol name as it conflicts with a preprocessor symbol
in the NetBSD header for Stack Smashing Protection, that wraps the read(2)
syscall. */
struct value *(*xread) (struct frame_info * frame, const void *baton);
const void *baton; const void *baton;
struct user_reg *next; struct user_reg *next;
}; };
@ -60,7 +63,7 @@ struct gdb_user_regs
static void static void
append_user_reg (struct gdb_user_regs *regs, const char *name, append_user_reg (struct gdb_user_regs *regs, const char *name,
user_reg_read_ftype *read, const void *baton, user_reg_read_ftype *xread, const void *baton,
struct user_reg *reg) struct user_reg *reg)
{ {
/* The caller is responsible for allocating memory needed to store /* The caller is responsible for allocating memory needed to store
@ -68,7 +71,7 @@ append_user_reg (struct gdb_user_regs *regs, const char *name,
register list stored in the common heap or a specific obstack. */ register list stored in the common heap or a specific obstack. */
gdb_assert (reg != NULL); gdb_assert (reg != NULL);
reg->name = name; reg->name = name;
reg->read = read; reg->xread = xread;
reg->baton = baton; reg->baton = baton;
reg->next = NULL; reg->next = NULL;
(*regs->last) = reg; (*regs->last) = reg;
@ -82,10 +85,10 @@ static struct gdb_user_regs builtin_user_regs = {
}; };
void void
user_reg_add_builtin (const char *name, user_reg_read_ftype *read, user_reg_add_builtin (const char *name, user_reg_read_ftype *xread,
const void *baton) const void *baton)
{ {
append_user_reg (&builtin_user_regs, name, read, baton, append_user_reg (&builtin_user_regs, name, xread, baton,
XNEW (struct user_reg)); XNEW (struct user_reg));
} }
@ -103,14 +106,14 @@ user_regs_init (struct gdbarch *gdbarch)
regs->last = &regs->first; regs->last = &regs->first;
for (reg = builtin_user_regs.first; reg != NULL; reg = reg->next) for (reg = builtin_user_regs.first; reg != NULL; reg = reg->next)
append_user_reg (regs, reg->name, reg->read, reg->baton, append_user_reg (regs, reg->name, reg->xread, reg->baton,
GDBARCH_OBSTACK_ZALLOC (gdbarch, struct user_reg)); GDBARCH_OBSTACK_ZALLOC (gdbarch, struct user_reg));
return regs; return regs;
} }
void void
user_reg_add (struct gdbarch *gdbarch, const char *name, user_reg_add (struct gdbarch *gdbarch, const char *name,
user_reg_read_ftype *read, const void *baton) user_reg_read_ftype *xread, const void *baton)
{ {
struct gdb_user_regs *regs struct gdb_user_regs *regs
= (struct gdb_user_regs *) gdbarch_data (gdbarch, user_regs_data); = (struct gdb_user_regs *) gdbarch_data (gdbarch, user_regs_data);
@ -122,7 +125,7 @@ user_reg_add (struct gdbarch *gdbarch, const char *name,
regs = (struct gdb_user_regs *) user_regs_init (gdbarch); regs = (struct gdb_user_regs *) user_regs_init (gdbarch);
deprecated_set_gdbarch_data (gdbarch, user_regs_data, regs); deprecated_set_gdbarch_data (gdbarch, user_regs_data, regs);
} }
append_user_reg (regs, name, read, baton, append_user_reg (regs, name, xread, baton,
GDBARCH_OBSTACK_ZALLOC (gdbarch, struct user_reg)); GDBARCH_OBSTACK_ZALLOC (gdbarch, struct user_reg));
} }
@ -214,7 +217,7 @@ value_of_user_reg (int regnum, struct frame_info *frame)
struct user_reg *reg = usernum_to_user_reg (gdbarch, regnum - maxregs); struct user_reg *reg = usernum_to_user_reg (gdbarch, regnum - maxregs);
gdb_assert (reg != NULL); gdb_assert (reg != NULL);
return reg->read (frame, reg->baton); return reg->xread (frame, reg->baton);
} }
static void static void