[PATCH 1/7] sim: frv: fix ambiguous else compiler warnings

[PATCH 1/7] sim: frv: fix ambiguous else compiler warnings

[Mike Frysinger]

Add explicit braces to if bodies when the body is another if/else
to fix a bunch of compiler warnings.
---
 sim/frv/frv.c           | 10 ++++++----
 sim/frv/profile-fr500.c | 32 +++++++++++++++++++-------------
 sim/frv/profile-fr550.c | 20 ++++++++++++--------
 3 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/sim/frv/frv.c b/sim/frv/frv.c
index aff9dc1a49ef..22c5fb7d8bdf 100644
--- a/sim/frv/frv.c
+++ b/sim/frv/frv.c
@@ -1182,10 +1182,12 @@ frvbf_shift_left_arith_saturate (SIM_CPU *current_cpu, SI arg1, SI arg2)
 
   /* Signed shift by 31 or greater saturates by definition.  */
   if (arg2 >= 31)
-    if (arg1 > 0)
-      return (SI) 0x7fffffff;
-    else
-      return (SI) 0x80000000;
+    {
+      if (arg1 > 0)
+	return (SI) 0x7fffffff;
+      else
+	return (SI) 0x80000000;
+    }
 
   /* OK, arg2 is between 1 and 31.  */
   neg_arg1 = (arg1 < 0);
diff --git a/sim/frv/profile-fr500.c b/sim/frv/profile-fr500.c
index f89e451bad84..e9cc49dc38d7 100644
--- a/sim/frv/profile-fr500.c
+++ b/sim/frv/profile-fr500.c
@@ -158,22 +158,28 @@ adjust_float_register_busy (SIM_CPU *cpu, INT in_FRi, INT in_FRj, INT out_FRk,
      then their latency will be less than previously recorded.
      See Table 13-13 in the LSI.  */
   if (in_FRi >= 0)
-    if (use_is_fpop (cpu, in_FRi))
-      decrease_FR_busy (cpu, in_FRi, cycles);
-    else
-      enforce_full_fr_latency (cpu, in_FRi);
-  
+    {
+      if (use_is_fpop (cpu, in_FRi))
+	decrease_FR_busy (cpu, in_FRi, cycles);
+      else
+	enforce_full_fr_latency (cpu, in_FRi);
+    }
+
   if (in_FRj >= 0 && in_FRj != in_FRi)
-    if (use_is_fpop (cpu, in_FRj))
-      decrease_FR_busy (cpu, in_FRj, cycles);
-    else
-      enforce_full_fr_latency (cpu, in_FRj);
+    {
+      if (use_is_fpop (cpu, in_FRj))
+	decrease_FR_busy (cpu, in_FRj, cycles);
+      else
+	enforce_full_fr_latency (cpu, in_FRj);
+    }
 
   if (out_FRk >= 0 && out_FRk != in_FRi && out_FRk != in_FRj)
-    if (use_is_fpop (cpu, out_FRk))
-      decrease_FR_busy (cpu, out_FRk, cycles);
-    else
-      enforce_full_fr_latency (cpu, out_FRk);
+    {
+      if (use_is_fpop (cpu, out_FRk))
+	decrease_FR_busy (cpu, out_FRk, cycles);
+      else
+	enforce_full_fr_latency (cpu, out_FRk);
+    }
 }
 
 /* Latency of floating point registers may be less than recorded when followed
diff --git a/sim/frv/profile-fr550.c b/sim/frv/profile-fr550.c
index 2bf1729135a8..9b17931abc29 100644
--- a/sim/frv/profile-fr550.c
+++ b/sim/frv/profile-fr550.c
@@ -225,10 +225,12 @@ adjust_float_register_busy (SIM_CPU *cpu,
       for (i = 0; i < iwidth; ++i)
 	{
 	  if (! REG_OVERLAP (in_FRi + i, 1, out_FRk, kwidth))
-	    if (use_is_fr_load (cpu, in_FRi + i))
-	      decrease_FR_busy (cpu, in_FRi + i, 1);
-	    else
-	      enforce_full_fr_latency (cpu, in_FRi + i);
+	    {
+	      if (use_is_fr_load (cpu, in_FRi + i))
+		decrease_FR_busy (cpu, in_FRi + i, 1);
+	      else
+		enforce_full_fr_latency (cpu, in_FRi + i);
+	    }
 	}
     }
 
@@ -238,10 +240,12 @@ adjust_float_register_busy (SIM_CPU *cpu,
 	{
 	  if (! REG_OVERLAP (in_FRj + i, 1, in_FRi, iwidth)
 	      && ! REG_OVERLAP (in_FRj + i, 1, out_FRk, kwidth))
-	    if (use_is_fr_load (cpu, in_FRj + i))
-	      decrease_FR_busy (cpu, in_FRj + i, 1);
-	    else
-	      enforce_full_fr_latency (cpu, in_FRj + i);
+	    {
+	      if (use_is_fr_load (cpu, in_FRj + i))
+		decrease_FR_busy (cpu, in_FRj + i, 1);
+	      else
+		enforce_full_fr_latency (cpu, in_FRj + i);
+	    }
 	}
     }
 
-- 
2.31.1

[PATCH 2/7] sim: frv: fix return type for post_wait_for funcs

[Mike Frysinger]

These functions never return anything, so change the int return type
to void to fix a bunch of compiler warnings about missing return.
---
 sim/frv/profile.c | 20 ++++++++++----------
 sim/frv/profile.h | 18 +++++++++---------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/sim/frv/profile.c b/sim/frv/profile.c
index 0d2b6f40c424..94212bfa0f3d 100644
--- a/sim/frv/profile.c
+++ b/sim/frv/profile.c
@@ -1012,7 +1012,7 @@ frvbf_model_insn_after (SIM_CPU *cpu, int last_p, int cycles)
     }
 }
 
-USI
+void
 frvbf_model_branch (SIM_CPU *current_cpu, PCADDR target, int hint)
 {
   /* Record the hint and branch address for use in profiling.  */
@@ -1787,7 +1787,7 @@ enforce_full_fr_latency (SIM_CPU *cpu, INT in_FR)
 
 /* Calculate how long the post processing for a floating point insn must
    wait for resources to become available.  */
-int
+void
 post_wait_for_FR (SIM_CPU *cpu, INT in_FR)
 {
   FRV_PROFILE_STATE *ps = CPU_PROFILE_STATE (cpu);
@@ -1803,7 +1803,7 @@ post_wait_for_FR (SIM_CPU *cpu, INT in_FR)
 
 /* Calculate how long the post processing for a floating point insn must
    wait for resources to become available.  */
-int
+void
 post_wait_for_FRdouble (SIM_CPU *cpu, INT in_FR)
 {
   FRV_PROFILE_STATE *ps = CPU_PROFILE_STATE (cpu);
@@ -1826,7 +1826,7 @@ post_wait_for_FRdouble (SIM_CPU *cpu, INT in_FR)
     }
 }
 
-int
+void
 post_wait_for_ACC (SIM_CPU *cpu, INT in_ACC)
 {
   FRV_PROFILE_STATE *ps = CPU_PROFILE_STATE (cpu);
@@ -1840,7 +1840,7 @@ post_wait_for_ACC (SIM_CPU *cpu, INT in_ACC)
     }
 }
 
-int
+void
 post_wait_for_CCR (SIM_CPU *cpu, INT in_CCR)
 {
   FRV_PROFILE_STATE *ps = CPU_PROFILE_STATE (cpu);
@@ -1859,7 +1859,7 @@ post_wait_for_CCR (SIM_CPU *cpu, INT in_CCR)
     }
 }
 
-int
+void
 post_wait_for_SPR (SIM_CPU *cpu, INT in_SPR)
 {
   FRV_PROFILE_STATE *ps = CPU_PROFILE_STATE (cpu);
@@ -1873,7 +1873,7 @@ post_wait_for_SPR (SIM_CPU *cpu, INT in_SPR)
     }
 }
 
-int
+void
 post_wait_for_fdiv (SIM_CPU *cpu, INT slot)
 {
   FRV_PROFILE_STATE *ps = CPU_PROFILE_STATE (cpu);
@@ -1891,7 +1891,7 @@ post_wait_for_fdiv (SIM_CPU *cpu, INT slot)
     }
 }
 
-int
+void
 post_wait_for_fsqrt (SIM_CPU *cpu, INT slot)
 {
   FRV_PROFILE_STATE *ps = CPU_PROFILE_STATE (cpu);
@@ -1909,7 +1909,7 @@ post_wait_for_fsqrt (SIM_CPU *cpu, INT slot)
     }
 }
 
-int
+void
 post_wait_for_float (SIM_CPU *cpu, INT slot)
 {
   FRV_PROFILE_STATE *ps = CPU_PROFILE_STATE (cpu);
@@ -1927,7 +1927,7 @@ post_wait_for_float (SIM_CPU *cpu, INT slot)
     }
 }
 
-int
+void
 post_wait_for_media (SIM_CPU *cpu, INT slot)
 {
   FRV_PROFILE_STATE *ps = CPU_PROFILE_STATE (cpu);
diff --git a/sim/frv/profile.h b/sim/frv/profile.h
index 9154a65630e7..fa8139f56fd3 100644
--- a/sim/frv/profile.h
+++ b/sim/frv/profile.h
@@ -150,15 +150,15 @@ void load_wait_for_GRdouble (SIM_CPU *, INT);
 void load_wait_for_FRdouble (SIM_CPU *, INT);
 void enforce_full_fr_latency (SIM_CPU *, INT);
 void enforce_full_acc_latency (SIM_CPU *, INT);
-int post_wait_for_FR (SIM_CPU *, INT);
-int post_wait_for_FRdouble (SIM_CPU *, INT);
-int post_wait_for_ACC (SIM_CPU *, INT);
-int post_wait_for_CCR (SIM_CPU *, INT);
-int post_wait_for_SPR (SIM_CPU *, INT);
-int post_wait_for_fdiv (SIM_CPU *, INT);
-int post_wait_for_fsqrt (SIM_CPU *, INT);
-int post_wait_for_float (SIM_CPU *, INT);
-int post_wait_for_media (SIM_CPU *, INT);
+void post_wait_for_FR (SIM_CPU *, INT);
+void post_wait_for_FRdouble (SIM_CPU *, INT);
+void post_wait_for_ACC (SIM_CPU *, INT);
+void post_wait_for_CCR (SIM_CPU *, INT);
+void post_wait_for_SPR (SIM_CPU *, INT);
+void post_wait_for_fdiv (SIM_CPU *, INT);
+void post_wait_for_fsqrt (SIM_CPU *, INT);
+void post_wait_for_float (SIM_CPU *, INT);
+void post_wait_for_media (SIM_CPU *, INT);
 
 void trace_vliw_wait_cycles (SIM_CPU *);
 void handle_resource_wait (SIM_CPU *);
-- 
2.31.1

[PATCH 3/7] sim: frv: fix uninitialized variable warnings

[Mike Frysinger]

---
 sim/frv/traps.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sim/frv/traps.c b/sim/frv/traps.c
index 46cb8d92f29e..59f1a25f5f1c 100644
--- a/sim/frv/traps.c
+++ b/sim/frv/traps.c
@@ -286,14 +286,14 @@ frv_mtrap (SIM_CPU *current_cpu)
 void
 frv_break (SIM_CPU *current_cpu)
 {
-  IADDR pc;
   SIM_DESC sd = CPU_STATE (current_cpu);
 
   if (STATE_ENVIRONMENT (sd) != OPERATING_ENVIRONMENT)
     {
       /* Invalidate the insn cache because the debugger will presumably
 	 replace the breakpoint insn with the real one.  */
-      sim_engine_halt (sd, current_cpu, NULL, pc, sim_stopped, SIM_SIGTRAP);
+      sim_engine_halt (sd, current_cpu, NULL, NULL_CIA, sim_stopped,
+		       SIM_SIGTRAP);
     }
 
   frv_queue_break_interrupt (current_cpu);
-- 
2.31.1

[PATCH 4/7] sim: frv: fix some printf type mismatch warnings

[Mike Frysinger]

The %p usage was a real bug that would probably cause a crash.
---
 sim/frv/profile.c | 2 +-
 sim/frv/sim-if.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sim/frv/profile.c b/sim/frv/profile.c
index 94212bfa0f3d..89332e580402 100644
--- a/sim/frv/profile.c
+++ b/sim/frv/profile.c
@@ -901,7 +901,7 @@ wait_for_flush (SIM_CPU *cpu)
     }
   if (TRACE_INSN_P (cpu) && wait)
     {
-      sprintf (hazard_name, "Data cache flush address %p:", address);
+      sprintf (hazard_name, "Data cache flush address %x:", address);
       frv_model_trace_wait_cycles (cpu, wait, hazard_name);
     }
 }
diff --git a/sim/frv/sim-if.c b/sim/frv/sim-if.c
index 758e17a3fc5a..3dd76ad7c9c2 100644
--- a/sim/frv/sim-if.c
+++ b/sim/frv/sim-if.c
@@ -86,7 +86,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, bfd *abfd,
   /* Allocate core managed memory if none specified by user.
      Use address 4 here in case the user wanted address 0 unmapped.  */
   if (sim_core_read_buffer (sd, NULL, read_map, &c, 4, 1) == 0)
-    sim_do_commandf (sd, "memory region 0,0x%lx", FRV_DEFAULT_MEM_SIZE);
+    sim_do_commandf (sd, "memory region 0,0x%x", FRV_DEFAULT_MEM_SIZE);
 
   /* check for/establish the reference program image */
   if (sim_analyze_program (sd,
-- 
2.31.1

[PATCH 5/7] sim: frv: fix up various missing prototype warnings

[Mike Frysinger]

Some of these were missing includes, some were unused funcs we can
cleanup, and some were missing prototypes for use in other files.
---
 sim/frv/cpu.c           | 8 --------
 sim/frv/interrupts.c    | 1 +
 sim/frv/profile-fr400.c | 2 ++
 sim/frv/reset.c         | 1 +
 sim/frv/sim-if.c        | 1 -
 sim/frv/sim-main.h      | 8 ++++++++
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/sim/frv/cpu.c b/sim/frv/cpu.c
index 38983756296e..b56b219201ba 100644
--- a/sim/frv/cpu.c
+++ b/sim/frv/cpu.c
@@ -698,11 +698,3 @@ frvbf_h_cccr_set (SIM_CPU *current_cpu, UINT regno, UQI newval)
 {
   CPU (h_cccr[regno]) = newval;
 }
-
-/* Record trace results for INSN.  */
-
-void
-frvbf_record_trace_results (SIM_CPU *current_cpu, CGEN_INSN *insn,
-			    int *indices, TRACE_RECORD *tr)
-{
-}
diff --git a/sim/frv/interrupts.c b/sim/frv/interrupts.c
index 99b27cffa948..64c563a2a894 100644
--- a/sim/frv/interrupts.c
+++ b/sim/frv/interrupts.c
@@ -27,6 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "sim-signal.h"
 #include "bfd.h"
 #include <stdlib.h>
+#include "cgen-mem.h"
 
 /* FR-V Interrupt table.
    Describes the interrupts supported by the FR-V.
diff --git a/sim/frv/profile-fr400.c b/sim/frv/profile-fr400.c
index f6752d88c10b..3f2b6efcb44e 100644
--- a/sim/frv/profile-fr400.c
+++ b/sim/frv/profile-fr400.c
@@ -176,6 +176,7 @@ set_acc_use_not_media_p4 (SIM_CPU *cpu, INT acc)
     d->cur_acc_p4 &= ~(((DI)1) << acc);
 }
 
+#if 0
 static int
 acc_use_is_media_p4 (SIM_CPU *cpu, INT acc)
 {
@@ -184,6 +185,7 @@ acc_use_is_media_p4 (SIM_CPU *cpu, INT acc)
     return d->cur_acc_p4 & (((DI)1) << acc);
   return 0;
 }
+#endif
 
 static void
 set_use_is_media_p6 (SIM_CPU *cpu, INT fr)
diff --git a/sim/frv/reset.c b/sim/frv/reset.c
index c87b99f2a958..8b44fab6de60 100644
--- a/sim/frv/reset.c
+++ b/sim/frv/reset.c
@@ -25,6 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "sim-main.h"
 #include "bfd.h"
+#include "cgen-mem.h"
 
 /* Initialize the frv simulator.  */
 void
diff --git a/sim/frv/sim-if.c b/sim/frv/sim-if.c
index 3dd76ad7c9c2..ac5d83cbed15 100644
--- a/sim/frv/sim-if.c
+++ b/sim/frv/sim-if.c
@@ -30,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "elf-bfd.h"
 
 static void free_state (SIM_DESC);
-static void print_frv_misc_cpu (SIM_CPU *cpu, int verbose);
 \f
 /* Cover function of sim_state_free to free the cpu buffers as well.  */
 
diff --git a/sim/frv/sim-main.h b/sim/frv/sim-main.h
index e2b09a3778d1..9297e55521b9 100644
--- a/sim/frv/sim-main.h
+++ b/sim/frv/sim-main.h
@@ -17,6 +17,9 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef FRV_SIM_MAIN_H
+#define FRV_SIM_MAIN_H
+
 /* Main header for the frv.  */
 
 /* This is a global setting.  Different cpu families can't mix-n-match -scache
@@ -114,3 +117,8 @@ frv_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), \
 
 /* Default memory size.  */
 #define FRV_DEFAULT_MEM_SIZE 0x800000 /* 8M */
+
+void frvbf_model_branch (SIM_CPU *, PCADDR, int hint);
+void frvbf_perform_writeback (SIM_CPU *);
+
+#endif
-- 
2.31.1

[PATCH 6/7] sim: frv: fix engine hook

[Mike Frysinger]

This hook doesn't return a value, so don't define it to 0 to avoid
the compiler warning about it not being used.
---
 sim/frv/sim-main.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sim/frv/sim-main.h b/sim/frv/sim-main.h
index 9297e55521b9..b7ead0b5de89 100644
--- a/sim/frv/sim-main.h
+++ b/sim/frv/sim-main.h
@@ -37,7 +37,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #define SIM_ENGINE_HALT_HOOK(SD, LAST_CPU, CIA) \
   frv_sim_engine_halt_hook ((SD), (LAST_CPU), (CIA))
 
-#define SIM_ENGINE_RESTART_HOOK(SD, LAST_CPU, CIA) 0
+#define SIM_ENGINE_RESTART_HOOK(SD, LAST_CPU, CIA)
 
 #include "sim-base.h"
 #include "cgen-sim.h"
-- 
2.31.1

[PATCH 7/7] sim: frv: add missing const type

[Mike Frysinger]

---
 sim/frv/sim-if.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sim/frv/sim-if.c b/sim/frv/sim-if.c
index ac5d83cbed15..530a8dd04289 100644
--- a/sim/frv/sim-if.c
+++ b/sim/frv/sim-if.c
@@ -103,7 +103,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, bfd *abfd,
     bfd *prog_bfd = STATE_PROG_BFD (sd);
     if (prog_bfd != NULL)
       {
-	struct elf_backend_data *backend_data;
+	const struct elf_backend_data *backend_data;
 
 	if (bfd_get_arch (prog_bfd) != bfd_arch_frv)
 	  {
-- 
2.31.1