Don't write to inferior_ptid in linux_get_siginfo_data

[deliverable/binutils-gdb.git] / sim / bfin / dv-bfin_dma.c

diff --git a/sim/bfin/dv-bfin_dma.c b/sim/bfin/dv-bfin_dma.c
index e61348af87ce210a2bb4d584492b179db64ef47b..476f887871e7334714c98983d508054889530fa1 100644 (file)
--- a/sim/bfin/dv-bfin_dma.c
+++ b/sim/bfin/dv-bfin_dma.c
@@ -1,6 +1,6 @@
 /* Blackfin Direct Memory Access (DMA) Channel model.
 
-   Copyright (C) 2010-2011 Free Software Foundation, Inc.
+   Copyright (C) 2010-2020 Free Software Foundation, Inc.
    Contributed by Analog Devices, Inc.
 
    This file is part of simulators.
@@ -68,7 +68,8 @@ struct bfin_dma
 #define mmr_base()      offsetof(struct bfin_dma, next_desc_ptr)
 #define mmr_offset(mmr) (offsetof(struct bfin_dma, mmr) - mmr_base())
 
-static const char * const mmr_names[] = {
+static const char * const mmr_names[] =
+{
   "NEXT_DESC_PTR", "START_ADDR", "CONFIG", "<INV>", "X_COUNT", "X_MODIFY",
   "Y_COUNT", "Y_MODIFY", "CURR_DESC_PTR", "CURR_ADDR", "IRQ_STATUS",
   "PERIPHERAL_MAP", "CURR_X_COUNT", "<INV>", "CURR_Y_COUNT", "<INV>",
@@ -254,7 +255,7 @@ bfin_dma_hw_event_callback (struct hw *me, void *data)
     /* XXX: This sucks performance wise.  */
     nr_bytes = dma->ele_size;
   else
-    nr_bytes = MIN (sizeof (buf), dma->curr_x_count * dma->ele_size);
+    nr_bytes = min (sizeof (buf), dma->curr_x_count * dma->ele_size);
 
   /* Pumping a chunk!  */
   bfin_peer->dma_master = me;
@@ -317,6 +318,10 @@ bfin_dma_io_write_buffer (struct hw *me, const void *source, int space,
   bu32 *value32p;
   void *valuep;
 
+  /* Invalid access mode is higher priority than missing register.  */
+  if (!dv_bfin_mmr_require_16_32 (me, addr, nr_bytes, true))
+    return 0;
+
   if (nr_bytes == 4)
     value = dv_load_4 (source);
   else
@@ -344,7 +349,7 @@ bfin_dma_io_write_buffer (struct hw *me, const void *source, int space,
          if (nr_bytes == 4)
            *value32p = value;
          else
-          *value16p = value;
+           *value16p = value;
        }
       else
        HW_TRACE ((me, "discarding write while dma running"));
@@ -400,7 +405,7 @@ bfin_dma_io_write_buffer (struct hw *me, const void *source, int space,
     default:
       /* XXX: The HW lets the pad regions be read/written ...  */
       dv_bfin_mmr_invalid (me, addr, nr_bytes, true);
-      break;
+      return 0;
     }
 
   return nr_bytes;
@@ -416,6 +421,10 @@ bfin_dma_io_read_buffer (struct hw *me, void *dest, int space,
   bu32 *value32p;
   void *valuep;
 
+  /* Invalid access mode is higher priority than missing register.  */
+  if (!dv_bfin_mmr_require_16_32 (me, addr, nr_bytes, false))
+    return 0;
+
   mmr_off = addr % dma->base;
   valuep = (void *)((unsigned long)dma + mmr_base() + mmr_off);
   value16p = valuep;
@@ -494,7 +503,8 @@ bfin_dma_dma_write_buffer (struct hw *me, const void *source,
   return ret;
 }
 
-static const struct hw_port_descriptor bfin_dma_ports[] = {
+static const struct hw_port_descriptor bfin_dma_ports[] =
+{
   { "di", 0, 0, output_port, }, /* DMA Interrupt */
   { NULL, 0, 0, 0, },
 };
@@ -547,7 +557,8 @@ bfin_dma_finish (struct hw *me)
   dma->peripheral_map = bfin_dmac_default_pmap (me);
 }
 
-const struct hw_descriptor dv_bfin_dma_descriptor[] = {
+const struct hw_descriptor dv_bfin_dma_descriptor[] =
+{
   {"bfin_dma", bfin_dma_finish,},
   {NULL, NULL},
 };