[PATCH] sim: constify sim_write source buffer

Mike Frysinger vapier@gentoo.org
Wed Apr 14 00:39:00 GMT 2010


On Tuesday 13 April 2010 19:26:10 Sandra Loosemore wrote:
> FYI, this patch:
> 
> 2010-04-13  Mike Frysinger  <vapier@gentoo.org>
> 
> 	* remote-sim.h (sim_write): Add const to buf arg.
> 
> caused the ARM simulator to fail to build.  See sim/arm/wrapper.c:158:

hmm, i didnt realize so many sim ports arent using the common/ code.  the
targets ive been testing all do.  this patch should build fine for the targets
that otherwise work (seems like some have been marked for removal apparently,
and moxie requires some random "dtc" program).
-mike

arm/
2010-04-13  Mike Frysinger  <vapier@gentoo.org>

	* wrapper.c (sim_write): Add const to buffer arg.

RCS file: /cvs/src/src/sim/arm/wrapper.c,v
retrieving revision 1.38
diff -u -p -r1.38 wrapper.c
--- sim/arm/wrapper.c	1 Jan 2010 10:03:26 -0000	1.38
+++ sim/arm/wrapper.c	14 Apr 2010 00:20:26 -0000
@@ -158,7 +158,7 @@ int
 sim_write (sd, addr, buffer, size)
      SIM_DESC sd ATTRIBUTE_UNUSED;
      SIM_ADDR addr;
-     unsigned char * buffer;
+     const unsigned char * buffer;
      int size;
 {
   int i;

avr/
2010-04-13  Mike Frysinger  <vapier@gentoo.org>

	* interp.c (sim_write): Add const to buffer arg.

RCS file: /cvs/src/src/sim/avr/interp.c,v
retrieving revision 1.6
diff -u -p -r1.6 interp.c
--- sim/avr/interp.c	1 Jan 2010 10:03:26 -0000	1.6
+++ sim/avr/interp.c	14 Apr 2010 00:20:26 -0000
@@ -1622,7 +1622,7 @@ sim_trace (SIM_DESC sd)
 }
 
 int
-sim_write (SIM_DESC sd, SIM_ADDR addr, unsigned char *buffer, int size)
+sim_write (SIM_DESC sd, SIM_ADDR addr, const unsigned char *buffer, int size)
 {
   int osize = size;
 

cr16/
2010-04-13  Mike Frysinger  <vapier@gentoo.org>

	* interp.c (sim_write): Add const to buffer arg.

RCS file: /cvs/src/src/sim/cr16/interp.c,v
retrieving revision 1.5
diff -u -p -r1.5 interp.c
--- sim/cr16/interp.c	1 Jan 2010 10:03:27 -0000	1.5
+++ sim/cr16/interp.c	14 Apr 2010 00:20:26 -0000
@@ -883,7 +883,7 @@ int
 sim_write (sd, addr, buffer, size)
      SIM_DESC sd;
      SIM_ADDR addr;
-     unsigned char *buffer;
+     const unsigned char *buffer;
      int size;
 {
   /* FIXME: this should be performing a virtual transfer */

d10v/
2010-04-13  Mike Frysinger  <vapier@gentoo.org>

	* interp.c (sim_write): Add const to buffer arg.

RCS file: /cvs/src/src/sim/d10v/interp.c,v
retrieving revision 1.18
diff -u -p -r1.18 interp.c
--- sim/d10v/interp.c	18 Apr 2006 09:15:29 -0000	1.18
+++ sim/d10v/interp.c	14 Apr 2010 00:20:26 -0000
@@ -761,7 +761,7 @@ int
 sim_write (sd, addr, buffer, size)
      SIM_DESC sd;
      SIM_ADDR addr;
-     unsigned char *buffer;
+     const unsigned char *buffer;
      int size;
 {
   /* FIXME: this should be performing a virtual transfer */

erc32/
2010-04-13  Mike Frysinger  <vapier@gentoo.org>

	* interp.c (sim_write): Add const to buf arg.

RCS file: /cvs/src/src/sim/erc32/interf.c,v
retrieving revision 1.6
diff -u -p -r1.6 interf.c
--- sim/erc32/interf.c	28 Nov 2005 18:33:03 -0000	1.6
+++ sim/erc32/interf.c	14 Apr 2010 00:20:26 -0000
@@ -351,7 +351,7 @@ int
 sim_write(sd, mem, buf, length)
      SIM_DESC sd;
     SIM_ADDR             mem;
-    unsigned char  *buf;
+    const unsigned char  *buf;
     int             length;
 {
     return (sis_memory_write(mem, buf, length));

h8300/
2010-04-13  Mike Frysinger  <vapier@gentoo.org>

	* compile.c (sim_write): Add const to buffer arg.

RCS file: /cvs/src/src/sim/h8300/compile.c,v
retrieving revision 1.46
diff -u -p -r1.46 compile.c
--- sim/h8300/compile.c	9 Dec 2009 05:32:16 -0000	1.46
+++ sim/h8300/compile.c	14 Apr 2010 00:20:26 -0000
@@ -4616,7 +4616,7 @@ sim_trace (SIM_DESC sd)
 }
 
 int
-sim_write (SIM_DESC sd, SIM_ADDR addr, unsigned char *buffer, int size)
+sim_write (SIM_DESC sd, SIM_ADDR addr, const unsigned char *buffer, int size)
 {
   int i;
 

m32c/
2010-04-13  Mike Frysinger  <vapier@gentoo.org>

	* gdb-if.c (sim_write): Add const to buf arg.
	* mem.h (mem_put_blk): Add const to bufptr arg.
	* mem.c (mem_put_blk): Likewise, and add const to cast.

RCS file: /cvs/src/src/sim/m32c/gdb-if.c,v
retrieving revision 1.9
diff -u -p -r1.9 gdb-if.c
--- sim/m32c/gdb-if.c	1 Jan 2010 10:03:31 -0000	1.9
+++ sim/m32c/gdb-if.c	14 Apr 2010 00:20:26 -0000
@@ -167,7 +167,7 @@ sim_read (SIM_DESC sd, SIM_ADDR mem, uns
 }
 
 int
-sim_write (SIM_DESC sd, SIM_ADDR mem, unsigned char *buf, int length)
+sim_write (SIM_DESC sd, SIM_ADDR mem, const unsigned char *buf, int length)
 {
   check_desc (sd);
 
RCS file: /cvs/src/src/sim/m32c/mem.c,v
retrieving revision 1.11
diff -u -p -r1.11 mem.c
--- sim/m32c/mem.c	1 Jan 2010 10:03:31 -0000	1.11
+++ sim/m32c/mem.c	14 Apr 2010 00:34:30 -0000
@@ -365,13 +365,13 @@ mem_put_si (int address, unsigned long v
 }
 
 void
-mem_put_blk (int address, void *bufptr, int nbytes)
+mem_put_blk (int address, const void *bufptr, int nbytes)
 {
   S ("<=");
   if (enable_counting)
     mem_counters[1][1] += nbytes;
   while (nbytes--)
-    mem_put_byte (address++, *(unsigned char *) bufptr++);
+    mem_put_byte (address++, *(const unsigned char *) bufptr++);
   E ();
 }
 
RCS file: /cvs/src/src/sim/m32c/mem.h,v
retrieving revision 1.8
diff -u -p -r1.8 mem.h
--- sim/m32c/mem.h	1 Jan 2010 10:03:31 -0000	1.8
+++ sim/m32c/mem.h	14 Apr 2010 00:34:30 -0000
@@ -27,7 +27,7 @@ void mem_put_hi (int address, unsigned s
 void mem_put_psi (int address, unsigned long value);
 void mem_put_si (int address, unsigned long value);
 
-void mem_put_blk (int address, void *bufptr, int nbytes);
+void mem_put_blk (int address, const void *bufptr, int nbytes);
 
 unsigned char mem_get_pc ();
 

mcore/
2010-04-13  Mike Frysinger  <vapier@gentoo.org>

	* interp.c (sim_write): Add const to buffer arg.

RCS file: /cvs/src/src/sim/mcore/interp.c,v
retrieving revision 1.12
diff -u -p -r1.12 interp.c
--- sim/mcore/interp.c	1 Jan 2010 10:03:32 -0000	1.12
+++ sim/mcore/interp.c	14 Apr 2010 00:20:26 -0000
@@ -1718,7 +1718,7 @@ int
 sim_write (sd, addr, buffer, size)
      SIM_DESC sd;
      SIM_ADDR addr;
-     unsigned char * buffer;
+     const unsigned char * buffer;
      int size;
 {
   int i;

microblaze/
2010-04-13  Mike Frysinger  <vapier@gentoo.org>

	* interp.c (sim_write): Add const to buffer arg.

RCS file: /cvs/src/src/sim/microblaze/interp.c,v
retrieving revision 1.3
diff -u -p -r1.3 interp.c
--- sim/microblaze/interp.c	1 Jan 2010 10:03:32 -0000	1.3
+++ sim/microblaze/interp.c	14 Apr 2010 00:20:26 -0000
@@ -704,7 +704,7 @@ sim_resume (SIM_DESC sd, int step, int s
 
 
 int
-sim_write (SIM_DESC sd, SIM_ADDR addr, unsigned char *buffer, int size)
+sim_write (SIM_DESC sd, SIM_ADDR addr, const unsigned char *buffer, int size)
 {
   int i;
   init_pointers ();

mips/
2010-04-13  Mike Frysinger  <vapier@gentoo.org>

	* interp.c (sim_write): Add const to buffer arg.

RCS file: /cvs/src/src/sim/mips/interp.c,v
retrieving revision 1.25
diff -u -p -r1.25 interp.c
--- sim/mips/interp.c	18 Jan 2010 03:30:28 -0000	1.25
+++ sim/mips/interp.c	14 Apr 2010 00:20:26 -0000
@@ -862,7 +862,7 @@ int
 sim_write (sd,addr,buffer,size)
      SIM_DESC sd;
      SIM_ADDR addr;
-     unsigned char *buffer;
+     const unsigned char *buffer;
      int size;
 {
   int index;

moxie/
2010-04-13  Mike Frysinger  <vapier@gentoo.org>

	* interp.c (sim_write): Add const to buffer arg.

RCS file: /cvs/src/src/sim/moxie/interp.c,v
retrieving revision 1.10
diff -u -p -r1.10 interp.c
--- sim/moxie/interp.c	27 Feb 2010 01:24:37 -0000	1.10
+++ sim/moxie/interp.c	14 Apr 2010 00:20:26 -0000
@@ -1028,7 +1028,7 @@ int
 sim_write (sd, addr, buffer, size)
      SIM_DESC sd;
      SIM_ADDR addr;
-     unsigned char * buffer;
+     const unsigned char * buffer;
      int size;
 {
   sim_cpu *scpu = STATE_CPU (sd, 0); /* FIXME */

ppc/
2010-04-13  Mike Frysinger  <vapier@gentoo.org>

	* sim_calls.c (sim_write): Add const to buf arg.

RCS file: /cvs/src/src/sim/ppc/sim_calls.c,v
retrieving revision 1.12
diff -u -p -r1.12 sim_calls.c
--- sim/ppc/sim_calls.c	28 Nov 2005 18:33:03 -0000	1.12
+++ sim/ppc/sim_calls.c	14 Apr 2010 00:20:26 -0000
@@ -144,7 +144,7 @@ sim_read (SIM_DESC sd, SIM_ADDR mem, uns
 
 
 int
-sim_write (SIM_DESC sd, SIM_ADDR mem, unsigned char *buf, int length)
+sim_write (SIM_DESC sd, SIM_ADDR mem, const unsigned char *buf, int length)
 {
   int result = psim_write_memory(simulator, MAX_NR_PROCESSORS,
 				 buf, mem, length,

rx/
2010-04-13  Mike Frysinger  <vapier@gentoo.org>

	* gdb-if.c (sim_write): Add const to buf arg.

RCS file: /cvs/src/src/sim/rx/gdb-if.c,v
retrieving revision 1.2
diff -u -p -r1.2 gdb-if.c
--- sim/rx/gdb-if.c	1 Jan 2010 10:03:33 -0000	1.2
+++ sim/rx/gdb-if.c	14 Apr 2010 00:20:26 -0000
@@ -245,7 +245,7 @@ sim_read (SIM_DESC sd, SIM_ADDR mem, uns
 }
 
 int
-sim_write (SIM_DESC sd, SIM_ADDR mem, unsigned char *buf, int length)
+sim_write (SIM_DESC sd, SIM_ADDR mem, const unsigned char *buf, int length)
 {
   int i;
 

sh/
2010-04-13  Mike Frysinger  <vapier@gentoo.org>

	* interp.c (sim_write): Add const to buffer arg.

RCS file: /cvs/src/src/sim/sh/interp.c,v
retrieving revision 1.21
diff -u -p -r1.21 interp.c
--- sim/sh/interp.c	14 Feb 2010 07:15:57 -0000	1.21
+++ sim/sh/interp.c	14 Apr 2010 00:20:26 -0000
@@ -81,7 +81,7 @@
 
 extern unsigned short sh_jump_table[], sh_dsp_table[0x1000], ppi_table[];
 
-int sim_write (SIM_DESC sd, SIM_ADDR addr, unsigned char *buffer, int size);
+int sim_write (SIM_DESC sd, SIM_ADDR addr, const unsigned char *buffer, int size);
 
 #define O_RECOMPILE 85
 #define DEFINE_TABLE
@@ -2141,7 +2141,7 @@ int
 sim_write (sd, addr, buffer, size)
      SIM_DESC sd;
      SIM_ADDR addr;
-     unsigned char *buffer;
+     const unsigned char *buffer;
      int size;
 {
   int i;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://sourceware.org/pipermail/gdb-patches/attachments/20100414/9e96274b/attachment.sig>


More information about the Gdb-patches mailing list