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
This commit is contained in:
Mike Frysinger 2010-03-30 20:38:26 +00:00
parent 739dfd28c3
commit fb0cc53ef6
8 changed files with 20 additions and 4 deletions

View file

@ -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

View file

@ -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

3
sim/cris/ChangeLog Normal file
View file

@ -0,0 +1,3 @@
2010-03-30 Mike Frysinger <vapier@gentoo.org>
* devices.c (device_error): Add const to message.

View file

@ -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 ();

View file

@ -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.

View file

@ -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, ...) {}

View file

@ -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,

View file

@ -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, ...)
{
}