sim: frv: fix up a bunch of prototype warnings

Some were missing, some were unused, and some were partially renamed.

diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index 348308d7b64e75e80225dc47da59b6e2c863ee45..4ca57d3f4fd48a27aa191c47d831b5d4889e63f9 100644 (file)
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,19 @@
+2021-05-29  Mike Frysinger  <vapier@gentoo.org>
+
+       * cache.h (frv_cache_unlock): New prototype.
+       * frv-sim.h (frvbf_media_average): Likewise.
+       (frv_queue_data_access_exception_interrupt): Likewise.
+       (frv_queue_division_exception_interrupt): Likewise.
+       (frvbf_check_acc_range): Likewise.
+       (frvbf_check_swap_address): Likewise.
+       (frvbf_*_multiple_*): Rename prototypes to ...
+       (frvbf_*_quad_*): ... these.
+       * profile-fr500.c (use_is_cc_complex): Put #if 0 around.
+       * profile-fr550.c (use_is_ccr_complex): Likewise.
+       * profile.h (frv_ref_SI): New prototype.
+       * registers.h (frv_check_spr_read_access): Likewise.
+       (frv_check_spr_write_access): Likewise.
+
 2021-05-29  Mike Frysinger  <vapier@gentoo.org>
 
        * cache.c (non_cache_access): Add parentheses.

diff --git a/sim/frv/cache.h b/sim/frv/cache.h
index 2b9eca8545bc6419125da589b4402d952055570a..866fe448948a9312be48d460838d1d4e849e24d8 100644 (file)
--- a/sim/frv/cache.h
+++ b/sim/frv/cache.h
@@ -234,6 +234,8 @@ frv_cache_write (FRV_CACHE *, SI, char *, unsigned);
 int
 frv_cache_preload (FRV_CACHE *, SI, USI, int);
 int
+frv_cache_unlock (FRV_CACHE *, SI);
+int
 frv_cache_invalidate (FRV_CACHE *, SI, int);
 int
 frv_cache_invalidate_all (FRV_CACHE *, int);

diff --git a/sim/frv/frv-sim.h b/sim/frv/frv-sim.h
index 317bfd8dcd5c8dbe5736c95dd8b0fb16f15fa0f8..d00ff6aff6d624199c15a5c929f65687b08d72ed 100644 (file)
--- a/sim/frv/frv-sim.h
+++ b/sim/frv/frv-sim.h
@@ -641,6 +641,7 @@ void frvbf_media_register_not_aligned (SIM_CPU *);
 void frvbf_media_acc_not_aligned (SIM_CPU *);
 void frvbf_media_cr_not_aligned (SIM_CPU *);
 void frvbf_media_overflow (SIM_CPU *, int);
+SI frvbf_media_average (SIM_CPU *, SI, SI);
 
 /* Functions for queuing and processing interrupts.  */
 struct frv_interrupt_queue_element *
@@ -679,6 +680,9 @@ frv_queue_mem_address_not_aligned_interrupt (SIM_CPU *, USI);
 struct frv_interrupt_queue_element *
 frv_queue_data_access_error_interrupt (SIM_CPU *, USI);
 
+struct frv_interrupt_queue_element *
+frv_queue_data_access_exception_interrupt (SIM_CPU *);
+
 struct frv_interrupt_queue_element *
 frv_queue_instruction_access_error_interrupt (SIM_CPU *);
 
@@ -690,6 +694,9 @@ frv_queue_fp_exception_interrupt (SIM_CPU *, struct frv_fp_exception_info *);
 
 enum frv_dtt frvbf_division_exception (SIM_CPU *, enum frv_dtt, int, int);
 
+struct frv_interrupt_queue_element *
+frv_queue_division_exception_interrupt (SIM_CPU *, enum frv_dtt);
+
 struct frv_interrupt_queue_element *
 frv_queue_interrupt (SIM_CPU *, enum frv_interrupt_kind);
 
@@ -845,6 +852,8 @@ USI frv_rett (SIM_CPU *current_cpu, PCADDR pc, BI debug_field);
 
 BI   frvbf_check_non_excepting_load (SIM_CPU *, SI, SI, SI, SI, QI, BI);
 void frvbf_check_recovering_store (SIM_CPU *, PCADDR, SI, int, int);
+SI   frvbf_check_acc_range (SIM_CPU *, SI);
+void frvbf_check_swap_address (SIM_CPU *, SI);
 
 void frvbf_clear_ne_flags (SIM_CPU *, SI, BI);
 void frvbf_commit (SIM_CPU *, SI, BI);
@@ -864,12 +873,12 @@ extern int insns_in_slot[];
 #define INSNS_IN_SLOT(slot) (insns_in_slot[slot])
     
 /* Multiple loads and stores.  */
-void frvbf_load_multiple_GR (SIM_CPU *, PCADDR, SI, SI, int);
-void frvbf_load_multiple_FRint (SIM_CPU *, PCADDR, SI, SI, int);
-void frvbf_load_multiple_CPR (SIM_CPU *, PCADDR, SI, SI, int);
-void frvbf_store_multiple_GR (SIM_CPU *, PCADDR, SI, SI, int);
-void frvbf_store_multiple_FRint (SIM_CPU *, PCADDR, SI, SI, int);
-void frvbf_store_multiple_CPR (SIM_CPU *, PCADDR, SI, SI, int);
+void frvbf_load_quad_GR (SIM_CPU *, PCADDR, SI, SI);
+void frvbf_load_quad_FRint (SIM_CPU *, PCADDR, SI, SI);
+void frvbf_load_quad_CPR (SIM_CPU *, PCADDR, SI, SI);
+void frvbf_store_quad_GR (SIM_CPU *, PCADDR, SI, SI);
+void frvbf_store_quad_FRint (SIM_CPU *, PCADDR, SI, SI);
+void frvbf_store_quad_CPR (SIM_CPU *, PCADDR, SI, SI);
 
 /* Memory and cache support.  */
 QI  frvbf_read_mem_QI  (SIM_CPU *, IADDR, SI);

diff --git a/sim/frv/profile-fr500.c b/sim/frv/profile-fr500.c
index 41ee067c97a2d5a4d716b65b9f58de322cf96025..f89e451bad847dd26c68e1828ce3667e5f3bbeee 100644 (file)
--- a/sim/frv/profile-fr500.c
+++ b/sim/frv/profile-fr500.c
@@ -126,12 +126,14 @@ set_use_not_cc_complex (SIM_CPU *cpu, INT cc)
   d->cur_cc_complex &= ~(((DI)1) << (cc));
 }
 
+#if 0
 static int
 use_is_cc_complex (SIM_CPU *cpu, INT cc)
 {
   MODEL_FR500_DATA *d = CPU_MODEL_DATA (cpu);
   return d->prev_cc_complex &   (((DI)1) << (cc));
 }
+#endif
 
 void
 fr500_reset_fr_flags (SIM_CPU *cpu, INT fr)

diff --git a/sim/frv/profile-fr550.c b/sim/frv/profile-fr550.c
index af42d37a1710881e5f954f7e11c44c8c5edfa479..2bf1729135a8c2469209617998b127dded15f0f5 100644 (file)
--- a/sim/frv/profile-fr550.c
+++ b/sim/frv/profile-fr550.c
@@ -152,12 +152,14 @@ set_use_not_ccr_complex (SIM_CPU *cpu, INT ccr)
   d->cur_ccr_complex &= ~(((SI)1) << (ccr));
 }
 
+#if 0
 static int
 use_is_ccr_complex (SIM_CPU *cpu, INT ccr)
 {
   MODEL_FR550_DATA *d = CPU_MODEL_DATA (cpu);
   return d->prev_ccr_complex & (((SI)1) << (ccr));
 }
+#endif
 
 static void
 set_use_is_acc_mmac (SIM_CPU *cpu, INT acc)

diff --git a/sim/frv/profile.h b/sim/frv/profile.h
index cae20c4b580ce5c0ca2025fa49071738a8693e18..9154a65630e78f46ce910995bb580ba916b77699 100644 (file)
--- a/sim/frv/profile.h
+++ b/sim/frv/profile.h
@@ -225,4 +225,6 @@ frv_model_trace_wait_cycles (SIM_CPU *, int, const char *);
 #define REGTYPE_FR   1
 #define REGTYPE_ACC  2
 
+SI frv_ref_SI (SI);
+
 #endif /* PROFILE_H */

diff --git a/sim/frv/registers.h b/sim/frv/registers.h
index af2c293b7242fd335f9871fa9e189bdcd6b64aaf..4e5bde098bfa1b5187069c69d81296f410209ed5 100644 (file)
--- a/sim/frv/registers.h
+++ b/sim/frv/registers.h
@@ -48,6 +48,8 @@ void frv_initialize_spr (SIM_CPU *);
 void frv_reset_spr (SIM_CPU *);
 
 void frv_check_spr_access (SIM_CPU *, UINT);
+void frv_check_spr_read_access (SIM_CPU *, UINT);
+void frv_check_spr_write_access (SIM_CPU *, UINT);
 
 void frv_fr_registers_available (SIM_CPU *, int *, int *);
 void frv_gr_registers_available (SIM_CPU *, int *, int *);