projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix "'operator new' should not return NULL" errors in testsuite
[deliverable/binutils-gdb.git]
/
gdb
/
user-regs.c
diff --git
a/gdb/user-regs.c
b/gdb/user-regs.c
index a232b1eb0005b4e99a78da92daffa5f1514c9e30..cb922313b0c855b616ba8228022f3245882f4548 100644
(file)
--- a/
gdb/user-regs.c
+++ b/
gdb/user-regs.c
@@
-41,7
+41,10
@@
struct user_reg
{
const char *name;
struct user_reg
{
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;
struct user_reg *next;
};
const void *baton;
struct user_reg *next;
};
@@
-60,7
+63,7
@@
struct gdb_user_regs
static void
append_user_reg (struct gdb_user_regs *regs, const char *name,
static void
append_user_reg (struct gdb_user_regs *regs, const char *name,
- user_reg_read_ftype *read, const void *baton,
+ user_reg_read_ftype *
x
read, const void *baton,
struct user_reg *reg)
{
/* The caller is responsible for allocating memory needed to store
struct user_reg *reg)
{
/* 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. */
gdb_assert (reg != NULL);
reg->name = name;
register list stored in the common heap or a specific obstack. */
gdb_assert (reg != NULL);
reg->name = name;
- reg->
read =
read;
+ reg->
xread = x
read;
reg->baton = baton;
reg->next = NULL;
(*regs->last) = reg;
reg->baton = baton;
reg->next = NULL;
(*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 *
x
read,
const void *baton)
{
const void *baton)
{
- append_user_reg (&builtin_user_regs, name, read, baton,
+ append_user_reg (&builtin_user_regs, name,
x
read, baton,
XNEW (struct user_reg));
}
XNEW (struct user_reg));
}
@@
-103,14
+106,14
@@
user_regs_init (struct gdbarch *gdbarch)
regs->last = ®s->first;
for (reg = builtin_user_regs.first; reg != NULL; reg = reg->next)
regs->last = ®s->first;
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->
x
read, reg->baton,
GDBARCH_OBSTACK_ZALLOC (gdbarch, struct user_reg));
return regs;
}
void
user_reg_add (struct gdbarch *gdbarch, const char *name,
GDBARCH_OBSTACK_ZALLOC (gdbarch, struct user_reg));
return regs;
}
void
user_reg_add (struct gdbarch *gdbarch, const char *name,
- user_reg_read_ftype *read, const void *baton)
+ user_reg_read_ftype *
x
read, const void *baton)
{
struct gdb_user_regs *regs
= (struct gdb_user_regs *) gdbarch_data (gdbarch, user_regs_data);
{
struct gdb_user_regs *regs
= (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);
deprecated_set_gdbarch_data (gdbarch, user_regs_data, regs);
}
regs = (struct gdb_user_regs *) user_regs_init (gdbarch);
deprecated_set_gdbarch_data (gdbarch, user_regs_data, regs);
}
- append_user_reg (regs, name, read, baton,
+ append_user_reg (regs, name,
x
read, 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);
gdb_assert (reg != NULL);
struct user_reg *reg = usernum_to_user_reg (gdbarch, regnum - maxregs);
gdb_assert (reg != NULL);
- return reg->read (frame, reg->baton);
+ return reg->
x
read (frame, reg->baton);
}
static void
}
static void
This page took
0.024707 seconds
and
4
git commands to generate.