summaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-03-06 23:29:37 -0500
committerMike Frysinger <vapier@gentoo.org>2014-03-10 22:59:22 -0400
commita3271a3e6c841729a9ece40af973e275ea2de875 (patch)
treedb2911deb63aa4a00f36e921b124b2619db8463c /sim
parent60d847df0b9691b7cb38bfba41b9d6aafd97efc2 (diff)
downloadbinutils-a3271a3e6c841729a9ece40af973e275ea2de875.tar.gz
binutils-a3271a3e6c841729a9ece40af973e275ea2de875.tar.bz2
binutils-a3271a3e6c841729a9ece40af973e275ea2de875.zip
sim: msp430: fix build time warnings
This fix is simple: msp430-sim.c: In function 'maybe_perform_syscall': msp430-sim.c:898:10: warning: format '%d' expects argument of type 'int', but argument 5 has type 'long int' [-Wformat] This one we change to use casts like everyone else does in the code base: msp430-sim.c: In function 'msp430_step_once': msp430-sim.c:985:7: warning: passing argument 3 of 'init_disassemble_info' from incompatible pointer type [enabled by default] include/dis-asm.h:368:13: note: expected 'fprintf_ftype' but argument is of type 'int (*)(struct FILE * __restrict__, const char * __restrict__)'
Diffstat (limited to 'sim')
-rw-r--r--sim/msp430/ChangeLog5
-rw-r--r--sim/msp430/msp430-sim.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog
index a5c5fec2589..0a3da7dc491 100644
--- a/sim/msp430/ChangeLog
+++ b/sim/msp430/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-10 Mike Frysinger <vapier@gentoo.org>
+
+ * msp430-sim (maybe_perform_syscall): Change %d to %ld.
+ (msp430_step_once): Cast fprintf to fprintf_ftype.
+
2013-09-23 Alan Modra <amodra@gmail.com>
* aclocal.m4, configure: Regenerate.
diff --git a/sim/msp430/msp430-sim.c b/sim/msp430/msp430-sim.c
index 8cd2e1e1448..c3fa4a9621b 100644
--- a/sim/msp430/msp430-sim.c
+++ b/sim/msp430/msp430-sim.c
@@ -895,7 +895,7 @@ maybe_perform_syscall (SIM_DESC sd, int call_addr)
if (TRACE_SYSCALL_P (MSP430_CPU (sd)))
trace_generic (sd, MSP430_CPU (sd), TRACE_SYSCALL_IDX,
- "returns %d", sc.result);
+ "returns %ld", sc.result);
MSP430_CPU (sd)->state.regs[12] = sc.result;
return 1;
@@ -982,7 +982,7 @@ msp430_step_once (SIM_DESC sd)
sim_core_read_buffer (sd, MSP430_CPU (sd), 0, b, opcode_pc, opsize);
- init_disassemble_info (&info, stderr, fprintf);
+ init_disassemble_info (&info, stderr, (fprintf_ftype) fprintf);
info.private_data = sd;
info.read_memory_func = msp430_dis_read;
fprintf (stderr, "%#8x ", opcode_pc);