PowerPC64 .branch_lt address

[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 76b59acccee57b92088a1e6ee055801f9dd07708..7cc2ee009e214db0db373a0c64a48f86ad538f10 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-2022 Free Software Foundation, Inc.
    Contributed by Analog Devices, Inc.
 
    This file is part of simulators.
@@ -18,7 +18,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "config.h"
+/* This must come before any other includes.  */
+#include "defs.h"
 
 #include "sim-main.h"
 #include "devices.h"
@@ -39,7 +40,8 @@ struct bfin_jtag
 #define mmr_base()      offsetof(struct bfin_jtag, dspid)
 #define mmr_offset(mmr) (offsetof(struct bfin_jtag, mmr) - mmr_base())
 
-static const char * const mmr_names[] = {
+static const char * const mmr_names[] =
+{
   "DSPID", NULL, "DBGSTAT",
 };
 #define mmr_name(off) (mmr_names[(off) / 4] ? : "<INV>")
@@ -53,23 +55,27 @@ 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);
+  valuep = (void *)((uintptr_t)jtag + mmr_base() + mmr_off);
 
   HW_TRACE_WRITE ();
 
   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;
@@ -84,8 +90,12 @@ 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);
+  valuep = (void *)((uintptr_t)jtag + mmr_base() + mmr_off);
 
   HW_TRACE_READ ();
 
@@ -96,9 +106,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);
@@ -151,7 +160,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},
 };