m32r sim: Add prototypes for functions that pass/return DI values

	* m32r-sim.h (m32rbf_h_accum_get_handler): Always provide a
	prototype for this function.
	(m32rbf_h_accum_set_handler): Likewise.
	(m32r2f_h_accums_get_handler): Prototype.
	(m32r2f_h_accums_set_handler): Prototype.

diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index 05f478b41db94f2c5940a63cb73ef7a57a128004..698dbad919b61641591911c9ee7dbfd2f06215d1 100644 (file)
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,11 @@
+2020-11-12  Nick Clifton  <nickc@redhat.com>
+
+       * m32r-sim.h (m32rbf_h_accum_get_handler): Always provide a
+       prototype for this function.
+       (m32rbf_h_accum_set_handler): Likewise.
+       (m32r2f_h_accums_get_handler): Prototype.
+       (m32r2f_h_accums_set_handler): Prototype.
+
 2020-09-18  Andrew Burgess  <andrew.burgess@embecosm.com>
 
        * m32r.c (m32rbf_register_size): New function.

diff --git a/sim/m32r/m32r-sim.h b/sim/m32r/m32r-sim.h
index 9f3e270f393ec1bab4f08fc04474ada498092428..6f9f4610c045b857599084218c9b51309db5e077 100644 (file)
--- a/sim/m32r/m32r-sim.h
+++ b/sim/m32r/m32r-sim.h
@@ -61,10 +61,19 @@ extern void m32rbf_h_psw_set_handler (SIM_CPU *, UQI);
   XCONCAT2 (WANT_CPU,_h_psw_set_handler) (current_cpu, (val))
 #endif
 
-#ifndef  GET_H_ACCUM
+/* FIXME: These prototypes are necessary because the cgen generated
+   cpu.h, cpux.h and cpu2.h headers do not provide them, and functions
+   which take or return parameters that are larger than an int must be
+   prototyed in order for them to work correctly.
+
+   The correct solution is to fix the code in cgen/sim.scm to generate
+   prototypes for each of the functions it generates.  */
 extern DI   m32rbf_h_accum_get_handler (SIM_CPU *);
 extern void m32rbf_h_accum_set_handler (SIM_CPU *, DI);
+extern DI   m32r2f_h_accums_get_handler (SIM_CPU *, UINT);
+extern void m32r2f_h_accums_set_handler (SIM_CPU *, UINT, DI);
 
+#ifndef  GET_H_ACCUM
 #define GET_H_ACCUM() \
   XCONCAT2 (WANT_CPU,_h_accum_get_handler) (current_cpu)
 #define SET_H_ACCUM(val) \