From 1c617db829e6a6fbcfebd3ad86fa93c88ee3c222 Mon Sep 17 00:00:00 2001 From: Grace Sainsbury Date: Wed, 26 Jun 2002 15:14:32 +0000 Subject: * monitor.h: Add the function regname to monitor_ops structure. This way NUM_REGS does not have to be a constant. * monitor.c (monitor_fetch_register): Added support for regname function. The function is called if the array regnames is NULL. (monitor_store_register): Same. * cpu32bug-rom.c (cpu32bug_regname): Add function. Replaces regnames array. (init_cpu32bug_cmds): set cpu32bug_cmds.regnames to NULL, cpu32bug_cmds.regname to point to new function. * abug-rom.c (abug_regname): Same as above. (init_abug_cmds): Same. * dbug-rom.c (dbug_regname): Same as above. (init_dbug_cmds): Same. * remote-est.c (est_regname): Same. (init_est_cmds): Same. * rom68k-rom.c (rom68k_regname): Same. (init_rom68k_cmds): Same. --- gdb/abug-rom.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'gdb/abug-rom.c') diff --git a/gdb/abug-rom.c b/gdb/abug-rom.c index b4c44a9..8a9e8ff 100644 --- a/gdb/abug-rom.c +++ b/gdb/abug-rom.c @@ -76,12 +76,22 @@ abug_supply_register (char *regname, int regnamelen, char *val, int vallen) * registers either. So, typing "info reg sp" becomes an "A7". */ -static char *abug_regnames[NUM_REGS] = +static const char * +abug_regname (int index) { - "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", - "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", - "PC", -}; + static char *regnames[] = + { + "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", + "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", + "PC", + }; + + if ((index >= (sizeof (regnames) / sizeof (regnames[0]))) + || (index < 0) || (index >= NUM_REGS)) + return NULL; + else + return regnames[index]; +} /* * Define the monitor command strings. Since these are passed directly @@ -141,7 +151,8 @@ init_abug_cmds (void) abug_cmds.cmd_end = NULL; /* optional command terminator */ abug_cmds.target = &abug_ops; /* target operations */ abug_cmds.stopbits = SERIAL_1_STOPBITS; /* number of stop bits */ - abug_cmds.regnames = abug_regnames; /* registers names */ + abug_cmds.regnames = NULL; /* registers names */ + abug_cmds.regname = abug_regname; abug_cmds.magic = MONITOR_OPS_MAGIC; /* magic */ }; -- cgit v1.1