summaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
authorAndrew Cagney <cagney@redhat.com>2003-08-28 17:02:00 +0000
committerAndrew Cagney <cagney@redhat.com>2003-08-28 17:02:00 +0000
commit49831d3da4d665e0235a92e69fef232a50fdcaf3 (patch)
treee550b9ec3b33b267b4a75c9ec10997a7a3a5f978 /sim
parentdc91349054292249d6472324db8e8b30872d9e01 (diff)
downloadgdb-49831d3da4d665e0235a92e69fef232a50fdcaf3.tar.gz
Index: common/ChangeLog
2003-08-28 Andrew Cagney <cagney@redhat.com> * dv-glue.c (hw_glue_finish): Change %d to %ld to match sizeof. * sim-options.c (print_help): Cast the format with specifier to "int". Index: mn10300/ChangeLog 2003-08-28 Andrew Cagney <cagney@redhat.com> * dv-mn103ser.c (do_polling_event): Change type of "serial_reg" to "long". (read_status_reg): Cast "serial_reg" to "long". * dv-mn103tim.c (do_counter_event): Change type of "timer_nr" to "long". (do_counter6_event, write_mode_reg, write_tm6md): Ditto.
Diffstat (limited to 'sim')
-rw-r--r--sim/common/ChangeLog6
-rw-r--r--sim/common/dv-glue.c4
-rw-r--r--sim/common/sim-options.c5
-rw-r--r--sim/mn10300/ChangeLog9
-rw-r--r--sim/mn10300/dv-mn103ser.c4
-rw-r--r--sim/mn10300/dv-mn103tim.c13
6 files changed, 30 insertions, 11 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index c7172f9d152..3d012d74d3b 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-28 Andrew Cagney <cagney@redhat.com>
+
+ * dv-glue.c (hw_glue_finish): Change %d to %ld to match sizeof.
+ * sim-options.c (print_help): Cast the format with specifier to
+ "int".
+
2003-06-23 Michael Snyder <msnyder@redhat.com>
* nrun.c (main): Delete h8/300 ifdef (sim now handles signals).
diff --git a/sim/common/dv-glue.c b/sim/common/dv-glue.c
index 560fd7051ea..ab04fe737b2 100644
--- a/sim/common/dv-glue.c
+++ b/sim/common/dv-glue.c
@@ -221,7 +221,7 @@ hw_glue_finish (struct hw *me)
if (glue->sizeof_output == 0)
hw_abort (me, "at least one reg property size must be nonzero");
if (glue->sizeof_output % sizeof (unsigned_word) != 0)
- hw_abort (me, "reg property size must be %d aligned",
+ hw_abort (me, "reg property size must be %ld aligned",
sizeof (unsigned_word));
/* and the address */
hw_unit_address_to_attach_address (hw_parent (me),
@@ -230,7 +230,7 @@ hw_glue_finish (struct hw *me)
&glue->address,
me);
if (glue->address % (sizeof (unsigned_word) * max_nr_ports) != 0)
- hw_abort (me, "reg property address must be %d aligned",
+ hw_abort (me, "reg property address must be %ld aligned",
sizeof (unsigned_word) * max_nr_ports);
glue->nr_outputs = glue->sizeof_output / sizeof (unsigned_word);
glue->output = hw_zalloc (me, glue->sizeof_output);
diff --git a/sim/common/sim-options.c b/sim/common/sim-options.c
index 8c16d56cc75..df12a639b8a 100644
--- a/sim/common/sim-options.c
+++ b/sim/common/sim-options.c
@@ -769,7 +769,10 @@ print_help (SIM_DESC sd, sim_cpu *cpu, const struct option_list *ol, int is_comm
end --;
if (end == chp)
end = chp + doc_width - 1;
- sim_io_printf (sd, "%.*s\n%*s", end - chp, chp, indent, "");
+ /* The cast should be ok - its distances between to
+ points in a string. */
+ sim_io_printf (sd, "%.*s\n%*s", (int) (end - chp), chp, indent,
+ "");
chp = end;
while (isspace (*chp) && *chp != '\0')
chp++;
diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 9a5b6023ade..5602ce8fe95 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,12 @@
+2003-08-28 Andrew Cagney <cagney@redhat.com>
+
+ * dv-mn103ser.c (do_polling_event): Change type of "serial_reg" to
+ "long".
+ (read_status_reg): Cast "serial_reg" to "long".
+ * dv-mn103tim.c (do_counter_event): Change type of "timer_nr" to
+ "long".
+ (do_counter6_event, write_mode_reg, write_tm6md): Ditto.
+
2003-02-27 Andrew Cagney <cagney@redhat.com>
* interp.c (sim_open, sim_create_inferior, sim_open)
diff --git a/sim/mn10300/dv-mn103ser.c b/sim/mn10300/dv-mn103ser.c
index 7f20ed1f6b2..bba20c9d920 100644
--- a/sim/mn10300/dv-mn103ser.c
+++ b/sim/mn10300/dv-mn103ser.c
@@ -240,7 +240,7 @@ do_polling_event (struct hw *me,
void *data)
{
struct mn103ser *serial = hw_data(me);
- int serial_reg = (int) data;
+ long serial_reg = (long) data;
char c;
int count;
@@ -421,7 +421,7 @@ read_status_reg (struct hw *me,
serial->device[serial_reg].event
= hw_event_queue_schedule (me, 1000,
do_polling_event,
- (void *)serial_reg);
+ (void *) (long) serial_reg);
}
if ( nr_bytes == 1 )
diff --git a/sim/mn10300/dv-mn103tim.c b/sim/mn10300/dv-mn103tim.c
index 9b1e0d2e7ee..a6272d8bc3a 100644
--- a/sim/mn10300/dv-mn103tim.c
+++ b/sim/mn10300/dv-mn103tim.c
@@ -568,7 +568,7 @@ do_counter_event (struct hw *me,
void *data)
{
struct mn103tim *timers = hw_data(me);
- int timer_nr = (int) data;
+ long timer_nr = (long) data;
int next_timer;
/* Check if counting is still enabled. */
@@ -609,7 +609,7 @@ do_counter6_event (struct hw *me,
void *data)
{
struct mn103tim *timers = hw_data(me);
- int timer_nr = (int) data;
+ long timer_nr = (long) data;
int next_timer;
/* Check if counting is still enabled. */
@@ -705,7 +705,7 @@ write_base_reg (struct hw *me,
static void
write_mode_reg (struct hw *me,
struct mn103tim *timers,
- int timer_nr,
+ long timer_nr,
const void *source,
unsigned nr_bytes)
/* for timers 0 to 5 */
@@ -716,7 +716,8 @@ write_mode_reg (struct hw *me,
if ( nr_bytes != 1 )
{
- hw_abort (me, "bad write size of %d bytes to TM%dMD.", nr_bytes, timer_nr);
+ hw_abort (me, "bad write size of %d bytes to TM%ldMD.", nr_bytes,
+ timer_nr);
}
mode_val = *(unsigned8 *)source;
@@ -742,7 +743,7 @@ write_mode_reg (struct hw *me,
{
if ( timer_nr == 0 || timer_nr == 4 )
{
- hw_abort(me, "Timer %d cannot be cascaded.", timer_nr);
+ hw_abort(me, "Timer %ld cannot be cascaded.", timer_nr);
}
}
else
@@ -839,7 +840,7 @@ write_tm6md (struct hw *me,
{
unsigned8 mode_val0 = 0x00, mode_val1 = 0x00;
unsigned32 div_ratio;
- int timer_nr = 6;
+ long timer_nr = 6;
unsigned_word offset = address - timers->block[0].base;