sim: bfin: push down mmr address/size checks

[thirdparty/binutils-gdb.git] / sim / bfin / dv-bfin_jtag.c

diff --git a/sim/bfin/dv-bfin_jtag.c b/sim/bfin/dv-bfin_jtag.c
index 78a3686ef56df5242f180338ab1ca3a822813eaa..ad4c8b63d1064b33b9a8aea50d1a4fbf3db41adf 100644 (file)
--- a/sim/bfin/dv-bfin_jtag.c
+++ b/sim/bfin/dv-bfin_jtag.c
@@ -1,6 +1,6 @@
 /* Blackfin JTAG model.
 
-   Copyright (C) 2010-2011 Free Software Foundation, Inc.
+   Copyright (C) 2010-2015 Free Software Foundation, Inc.
    Contributed by Analog Devices, Inc.
 
    This file is part of simulators.
@@ -54,6 +54,10 @@ bfin_jtag_io_write_buffer (struct hw *me, const void *source, int space,
   bu32 value;
   bu32 *valuep;
 
+  /* Invalid access mode is higher priority than missing register.  */
+  if (!dv_bfin_mmr_require_32 (me, addr, nr_bytes, true))
+    return 0;
+
   value = dv_load_4 (source);
   mmr_off = addr - jtag->base;
   valuep = (void *)((unsigned long)jtag + mmr_base() + mmr_off);
@@ -63,14 +67,14 @@ bfin_jtag_io_write_buffer (struct hw *me, const void *source, int space,
   switch (mmr_off)
     {
     case mmr_offset(dbgstat):
-      dv_w1c_4 (valuep, value, ~0xc);
+      dv_w1c_4 (valuep, value, 0xc);
       break;
     case mmr_offset(dspid):
       /* Discard writes to these.  */
       break;
     default:
       dv_bfin_mmr_invalid (me, addr, nr_bytes, true);
-      break;
+      return 0;
     }
 
   return nr_bytes;
@@ -85,6 +89,10 @@ bfin_jtag_io_read_buffer (struct hw *me, void *dest, int space,
   bu32 value;
   bu32 *valuep;
 
+  /* Invalid access mode is higher priority than missing register.  */
+  if (!dv_bfin_mmr_require_32 (me, addr, nr_bytes, false))
+    return 0;
+
   mmr_off = addr - jtag->base;
   valuep = (void *)((unsigned long)jtag + mmr_base() + mmr_off);
 
@@ -97,9 +105,8 @@ bfin_jtag_io_read_buffer (struct hw *me, void *dest, int space,
       value = *valuep;
       break;
     default:
-      while (1) /* Core MMRs -> exception -> doesn't return.  */
-       dv_bfin_mmr_invalid (me, addr, nr_bytes, false);
-      break;
+      dv_bfin_mmr_invalid (me, addr, nr_bytes, false);
+      return 0;
     }
 
   dv_store_4 (dest, value);
@@ -152,7 +159,8 @@ bfin_jtag_finish (struct hw *me)
   jtag->dspid = bfin_model_get_dspid (hw_system (me));
 }
 
-const struct hw_descriptor dv_bfin_jtag_descriptor[] = {
+const struct hw_descriptor dv_bfin_jtag_descriptor[] =
+{
   {"bfin_jtag", bfin_jtag_finish,},
   {NULL, NULL},
 };