From 94cde56ab38348b901bb1f96c64bdd8cfaa578fe Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 12 Nov 2020 12:22:18 +0000 Subject: [PATCH] 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. --- sim/m32r/ChangeLog | 8 ++++++++ sim/m32r/m32r-sim.h | 11 ++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog index 05f478b41db..698dbad919b 100644 --- a/sim/m32r/ChangeLog +++ b/sim/m32r/ChangeLog @@ -1,3 +1,11 @@ +2020-11-12 Nick Clifton + + * 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 * m32r.c (m32rbf_register_size): New function. diff --git a/sim/m32r/m32r-sim.h b/sim/m32r/m32r-sim.h index 9f3e270f393..6f9f4610c04 100644 --- 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) \ -- 2.30.2