sim: cris: fix a few warnings

Include header for hw funcs called, adjust prototype to match the
args given to it, and adjust cast to match the function.

diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index d31f91e0a26e7dbf9b05bd1ad79dac9ac70a6a53..78b106535ba81dd33957984d0eb4166352234094 100644 (file)
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,3 +1,9 @@
+2021-06-22  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-if.c: Include sim-hw.h.
+       (cris_write_interp): Change buf to const.
+       (sim_open): Cast sp_init to unsigned char *.
+
 2021-06-22  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/cris/sim-if.c b/sim/cris/sim-if.c
index c183856fa4c8ae929a24ecc3075cc656c2c70d7a..992493935212de24288a112ec3aadf0a328c1ef2 100644 (file)
--- a/sim/cris/sim-if.c
+++ b/sim/cris/sim-if.c
@@ -32,6 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <errno.h>
 #include <unistd.h>
 #include "sim-options.h"
+#include "sim-hw.h"
 #include "dis-asm.h"
 #include "environ.h"
 
@@ -478,7 +479,7 @@ aux_ent_entry (struct bfd *ebfd)
    interp_load_addr offset.  */
 
 static int
-cris_write_interp (SIM_DESC sd, SIM_ADDR mem, unsigned char *buf, int length)
+cris_write_interp (SIM_DESC sd, SIM_ADDR mem, const unsigned char *buf, int length)
 {
   return sim_write (sd, mem + interp_load_addr, buf, length);
 }
@@ -917,7 +918,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd,
        CPU_CRIS_MISC_PROFILE (cpu)->flags = STATE_TRACE_FLAGS (sd)[0];
 
        /* Set SP to the stack we allocated above.  */
-       (* CPU_REG_STORE (cpu)) (cpu, H_GR_SP, (char *) sp_init, 4);
+       (* CPU_REG_STORE (cpu)) (cpu, H_GR_SP, (unsigned char *) sp_init, 4);
 
        /* Set the simulator environment data.  */
        cpu->highest_mmapped_page = NULL;