sim: update device_error() prototype

The device_error() takes a printf style string, so update the prototype
accordingly.  The message should be const and it should use an attribute.
This fixes gcc warnings like:

sim-core.c: In function 'sim_core_map_attach':
sim-core.c:200: warning: passing argument 2 of 'device_error' discards qualifiers from pointer target type
sim-core.c:237: warning: passing argument 2 of 'device_error' discards qualifiers from pointer target type
sim-core.c: In function 'sim_core_attach':
sim-core.c:304: warning: passing argument 2 of 'device_error' discards qualifiers from pointer target type
sim-core.c:314: warning: passing argument 2 of 'device_error' discards qualifiers from pointer target type
sim-core.c:335: warning: passing argument 2 of 'device_error' discards qualifiers from pointer target type
sim-core.c:348: warning: passing argument 2 of 'device_error' discards qualifiers from pointer target type

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 7c5e1b7c7339b85a24d44b188959f4131c312844..50418a74e9e031056ee953fedf9bc0fa3aee970f 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-30  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-core.h (device_error): Add const to message, and add printf
+       format attribute.
+
 2010-03-30  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-profile.c (profile_print_addr_ranges): Wrap with the

diff --git a/sim/common/sim-core.h b/sim/common/sim-core.h
index 3fac62727bf8d08d308a44694929f8447fb54d76..696511c45c5b890c3f1d81fe9aaf9c249cdbb038 100644 (file)
--- a/sim/common/sim-core.h
+++ b/sim/common/sim-core.h
@@ -344,7 +344,7 @@ DECLARE_SIM_CORE_READ_N(misaligned,7,8)
 #if (WITH_DEVICES)
 /* TODO: create sim/common/device.h */
 /* These are defined with each particular cpu.  */
-void device_error (device *me, char* message, ...);
+void device_error (device *me, const char *message, ...) __attribute__((format (printf, 2, 3)));
 int device_io_read_buffer(device *me, void *dest, int space, address_word addr, unsigned nr_bytes, SIM_DESC sd, sim_cpu *processor, sim_cia cia);
 int device_io_write_buffer(device *me, const void *source, int space, address_word addr, unsigned nr_bytes, SIM_DESC sd, sim_cpu *processor, sim_cia cia);
 #endif

diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
new file mode 100644 (file)
index 0000000..d7aadd0
--- /dev/null
+++ b/sim/cris/ChangeLog
@@ -0,0 +1,3 @@
+2010-03-30  Mike Frysinger  <vapier@gentoo.org>
+
+       * devices.c (device_error): Add const to message.

diff --git a/sim/cris/devices.c b/sim/cris/devices.c
index 7218c660a5c3b052b817936bb31186018e274b74..50032a65c7e473906e3341f1e5dc4b5803adc61d 100644 (file)
--- a/sim/cris/devices.c
+++ b/sim/cris/devices.c
@@ -34,7 +34,7 @@ struct _device { char dummy; } cris_devices;
 
 void
 device_error (device *me ATTRIBUTE_UNUSED,
-             char *message ATTRIBUTE_UNUSED,
+             const char *message ATTRIBUTE_UNUSED,
              ...)
 {
   abort ();

diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index 0e703aeaeb7b51e347aa9fe77cbb24cc564f8771..b49321d2fd99ea14b7a4b655189546db24f605ee 100644 (file)
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-30  Mike Frysinger  <vapier@gentoo.org>
+
+       * devices.c (device_error): Add const to message.
+
 2010-02-12  Doug Evans  <dje@sebabeach.org>
 
        * decode.c, * decode.h: Regenerate.

diff --git a/sim/frv/devices.c b/sim/frv/devices.c
index 3c028c0677d96c745900148bb853eeb6cd69f561..9b0819f87d0295918c096401a77f906f1488da41 100644 (file)
--- a/sim/frv/devices.c
+++ b/sim/frv/devices.c
@@ -93,4 +93,4 @@ device_io_write_buffer (device *me, const void *source, int space,
   return nr_bytes;
 }
 
-void device_error (device *me, char* message, ...) {}
+void device_error (device *me, const char *message, ...) {}

diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index 9981230ec8226530274d912fc7d09458d2ede59c..4c4ca6cbb9287ccba548b71ec7e8155d05fa200c 100644 (file)
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-30  Mike Frysinger  <vapier@gentoo.org>
+
+       * devices.c (device_error): Add const to message.
+
 2010-02-11  Doug Evans  <dje@sebabeach.org>
 
        * cpu.h, * cpu2.h, * cpux.h, * decode.c, * decode2.c, * decodex.c,

diff --git a/sim/m32r/devices.c b/sim/m32r/devices.c
index cc39d5d9d7689ad12a310c2558c1067158fd88b1..4442f1136dbd5916fc9fe521f5cd13b1ec3cc124 100644 (file)
--- a/sim/m32r/devices.c
+++ b/sim/m32r/devices.c
@@ -102,6 +102,6 @@ device_io_write_buffer (device *me, const void *source, int space,
 }
 
 void
-device_error (device *me, char *message, ...)
+device_error (device *me, const char *message, ...)
 {
 }