Re: [PATCH] sim: constify watchpoint interrupt names

[Mike Frysinger <vapier at gentoo dot org>]

On Tuesday 30 March 2010 18:53:17 Hans-Peter Nilsson wrote:
> On Mon, 29 Mar 2010, Mike Frysinger wrote:
> > 	* sim-watch.h (struct _sim_watchpoints): Add const to interrupt_names.
> 
> Either the above or one of your other committs to this area,
> caused, for v850-elf (beware of linewrapped cutnpaste):

it was this one

> /tmp/hpautotest-sim/src/sim/v850/interp.c: In function
> 'do_interrupt':
> /tmp/hpautotest-sim/src/sim/v850/interp.c:70: error: invalid
> operands to binary -
> /tmp/hpautotest-sim/src/sim/v850/interp.c: In function
> 'sim_open':
> /tmp/hpautotest-sim/src/sim/v850/interp.c:210: warning:
> assignment from incompatible pointer type

this should fix it:
RCS file: /cvs/src/src/sim/v850/interp.c,v
retrieving revision 1.4
diff -u -p -r1.4 interp.c
--- interp.c	5 Sep 2003 17:46:52 -0000	1.4
+++ interp.c	30 Mar 2010 23:06:58 -0000
@@ -48,7 +48,7 @@ enum interrupt_type
   num_int_types
 };
 
-char *interrupt_names[] = {
+const char *interrupt_names[] = {
   "reset",
   "nmi",
   "intov1",
@@ -65,7 +65,7 @@ do_interrupt (sd, data)
      SIM_DESC sd;
      void *data;
 {
-  char **interrupt_name = (char**)data;
+  const char **interrupt_name = (const char**)data;
   enum interrupt_type inttype;
   inttype = (interrupt_name - STATE_WATCHPOINTS (sd)->interrupt_names);
 
-mike

Attachment: signature.asc
Description: This is a digitally signed message part.