Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR/37932: Yakovetsky Vladimir: build distribution with USE_FORT fails 

Avoid read redefinition
This commit is contained in:
christos 2008-02-02 17:12:44 +00:00
parent 9aa2376bc7
commit 99a86a6512
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/dist/gdb6/gdb/regcache.c vendored
View File

@ -839,11 +839,10 @@ typedef void (regcache_read_ftype) (struct regcache *regcache, int regnum,
void *buf);
typedef void (regcache_write_ftype) (struct regcache *regcache, int regnum,
const void *buf);
static void
regcache_xfer_part (struct regcache *regcache, int regnum,
int offset, int len, void *in, const void *out,
void (*read) (struct regcache *regcache, int regnum,
void (*xread) (struct regcache *regcache, int regnum,
gdb_byte *buf),
void (*write) (struct regcache *regcache, int regnum,
const gdb_byte *buf))
@ -860,8 +859,8 @@ regcache_xfer_part (struct regcache *regcache, int regnum,
|| offset > 0
|| offset + len < descr->sizeof_register[regnum])
{
gdb_assert (read != NULL);
read (regcache, regnum, reg);
gdb_assert (xread != NULL);
xread (regcache, regnum, reg);
}
/* ... modify ... */
if (in != NULL)

18
gnu/dist/gdb6/gdb/user-regs.c vendored
View File

@ -41,7 +41,7 @@
struct user_reg
{
const char *name;
struct value *(*read) (struct frame_info * frame);
struct value *(*xread) (struct frame_info * frame);
struct user_reg *next;
};
@ -59,14 +59,14 @@ struct gdb_user_regs
static void
append_user_reg (struct gdb_user_regs *regs, const char *name,
user_reg_read_ftype *read, struct user_reg *reg)
user_reg_read_ftype *xread, struct user_reg *reg)
{
/* The caller is responsible for allocating memory needed to store
the register. By doing this, the function can operate on a
register list stored in the common heap or a specific obstack. */
gdb_assert (reg != NULL);
reg->name = name;
reg->read = read;
reg->xread = xread;
reg->next = NULL;
(*regs->last) = reg;
regs->last = &(*regs->last)->next;
@ -77,9 +77,9 @@ append_user_reg (struct gdb_user_regs *regs, const char *name,
static struct gdb_user_regs builtin_user_regs = { NULL, &builtin_user_regs.first };
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)
{
append_user_reg (&builtin_user_regs, name, read,
append_user_reg (&builtin_user_regs, name, xread,
XMALLOC (struct user_reg));
}
@ -95,14 +95,14 @@ user_regs_init (struct gdbarch *gdbarch)
struct gdb_user_regs *regs = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct gdb_user_regs);
regs->last = &regs->first;
for (reg = builtin_user_regs.first; reg != NULL; reg = reg->next)
append_user_reg (regs, reg->name, reg->read,
append_user_reg (regs, reg->name, reg->xread,
GDBARCH_OBSTACK_ZALLOC (gdbarch, struct user_reg));
return regs;
}
void
user_reg_add (struct gdbarch *gdbarch, const char *name,
user_reg_read_ftype *read)
user_reg_read_ftype *xread)
{
struct gdb_user_regs *regs = gdbarch_data (gdbarch, user_regs_data);
if (regs == NULL)
@ -112,7 +112,7 @@ user_reg_add (struct gdbarch *gdbarch, const char *name,
regs = user_regs_init (gdbarch);
deprecated_set_gdbarch_data (gdbarch, user_regs_data, regs);
}
append_user_reg (regs, name, read,
append_user_reg (regs, name, xread,
GDBARCH_OBSTACK_ZALLOC (gdbarch, struct user_reg));
}
@ -199,7 +199,7 @@ value_of_user_reg (int regnum, struct frame_info *frame)
+ gdbarch_num_pseudo_regs (gdbarch));
struct user_reg *reg = usernum_to_user_reg (gdbarch, regnum - maxregs);
gdb_assert (reg != NULL);
return reg->read (frame);
return reg->xread (frame);
}
extern initialize_file_ftype _initialize_user_regs; /* -Wmissing-prototypes */