This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
Re: gdb tx39-elf configuration doesn't compile, multi-arch lossage?
- From: Kevin Buettner <kevinb at redhat dot com>
- To: cgd at broadcom dot com
- Cc: gdb-patches at sources dot redhat dot com
- Date: Tue, 17 Dec 2002 16:16:01 -0700
- Subject: Re: gdb tx39-elf configuration doesn't compile, multi-arch lossage?
- References: <yov58yyoeavd.fsf@broadcom.com>
On Dec 17, 10:52am, cgd@broadcom.com wrote:
> multi-arch lossage?
Yes. (My fault, sorry.)
I've just committed the patch below. Please let me know if you have
any problems with it.
Kevin
2002-12-17 Kevin Buettner <kevinb@redhat.com>
* dve3900-rom.c (r3900_regnames): Don't use NUM_REGS to determine
size.
(fetch_bitmapped_register, store_bitmapped_register): Add bounds
checks for r3900_regnames[].
Index: dve3900-rom.c
===================================================================
RCS file: /cvs/src/src/gdb/dve3900-rom.c,v
retrieving revision 1.8
diff -u -p -r1.8 dve3900-rom.c
--- dve3900-rom.c 4 May 2001 04:15:24 -0000 1.8
+++ dve3900-rom.c 17 Dec 2002 23:07:55 -0000
@@ -113,7 +113,7 @@ static int ethernet = 0;
different names than GDB does, and don't support all the registers
either. */
-static char *r3900_regnames[NUM_REGS] =
+static char *r3900_regnames[] =
{
"r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
"r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15",
@@ -456,8 +456,15 @@ fetch_bitmapped_register (int regno, str
{
unsigned long val;
unsigned char regbuf[MAX_REGISTER_RAW_SIZE];
+ char *regname = NULL;
- monitor_printf ("x%s\r", r3900_regnames[regno]);
+ if (regno >= sizeof (r3900_regnames) / sizeof (r3900_regnames[0]))
+ internal_error (__FILE__, __LINE__,
+ "fetch_bitmapped_register: regno out of bounds");
+ else
+ regname = r3900_regnames[regno];
+
+ monitor_printf ("x%s\r", regname);
val = fetch_fields (bf);
monitor_printf (".\r");
monitor_expect_prompt (NULL, 0);
@@ -501,9 +508,16 @@ static void
store_bitmapped_register (int regno, struct bit_field *bf)
{
unsigned long oldval, newval;
+ char *regname = NULL;
+
+ if (regno >= sizeof (r3900_regnames) / sizeof (r3900_regnames[0]))
+ internal_error (__FILE__, __LINE__,
+ "fetch_bitmapped_register: regno out of bounds");
+ else
+ regname = r3900_regnames[regno];
/* Fetch the current value of the register. */
- monitor_printf ("x%s\r", r3900_regnames[regno]);
+ monitor_printf ("x%s\r", regname);
oldval = fetch_fields (bf);
newval = read_register (regno);