Fix issues with multiple inferiors

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

diff --git a/sim/bfin/dv-bfin_emac.c b/sim/bfin/dv-bfin_emac.c
index a64198d45b6205492be31cfeb1ba171f59e6d7ee..d8ae75c6e5fca34f545c28502f496d97e3d1a36d 100644 (file)
--- a/sim/bfin/dv-bfin_emac.c
+++ b/sim/bfin/dv-bfin_emac.c
@@ -1,6 +1,6 @@
 /* Blackfin Ethernet Media Access Controller (EMAC) 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.
@@ -177,8 +177,10 @@ bfin_emac_io_write_buffer (struct hw *me, const void *source,
   bu32 value;
   bu32 *valuep;
 
+  /* Invalid access mode is higher priority than missing register.  */
   /* XXX: 16bit accesses are allowed ...  */
-  dv_bfin_mmr_require_32 (me, addr, nr_bytes, true);
+  if (!dv_bfin_mmr_require_32 (me, addr, nr_bytes, true))
+    return 0;
   value = dv_load_4 (source);
 
   mmr_off = addr - emac->base;
@@ -224,7 +226,7 @@ bfin_emac_io_write_buffer (struct hw *me, const void *source,
       dv_w1c_4_partial (valuep, value, 0xf20);
       break;
     case mmr_offset(systat):
-      dv_w1c_4 (valuep, value, 0x1e);
+      dv_w1c_4 (valuep, value, 0xe1);
       break;
     case mmr_offset(staadd):
       *valuep = value | STABUSY;
@@ -242,7 +244,7 @@ bfin_emac_io_write_buffer (struct hw *me, const void *source,
     case mmr_offset(tx_stky):
     case mmr_offset(mmc_rirqs):
     case mmr_offset(mmc_tirqs):
-      dv_w1c_4 (valuep, value, 0);
+      dv_w1c_4 (valuep, value, -1);
       break;
     case mmr_offset(mmc_ctl):
       /* Writing to bit 0 clears all counters.  */
@@ -263,7 +265,7 @@ bfin_emac_io_write_buffer (struct hw *me, const void *source,
       break;
     default:
       dv_bfin_mmr_invalid (me, addr, nr_bytes, true);
-      break;
+      return 0;
     }
 
   return nr_bytes;
@@ -277,8 +279,10 @@ bfin_emac_io_read_buffer (struct hw *me, void *dest,
   bu32 mmr_off;
   bu32 *valuep;
 
+  /* Invalid access mode is higher priority than missing register.  */
   /* XXX: 16bit accesses are allowed ...  */
-  dv_bfin_mmr_require_32 (me, addr, nr_bytes, false);
+  if (!dv_bfin_mmr_require_32 (me, addr, nr_bytes, false))
+    return 0;
 
   mmr_off = addr - emac->base;
   valuep = (void *)((unsigned long)emac + mmr_base() + mmr_off);
@@ -328,7 +332,7 @@ bfin_emac_io_read_buffer (struct hw *me, void *dest,
       break;
     default:
       dv_bfin_mmr_invalid (me, addr, nr_bytes, false);
-      break;
+      return 0;
     }
 
   return nr_bytes;
@@ -409,7 +413,7 @@ bfin_emac_dma_read_buffer (struct hw *me, void *dest, int space,
       if (ret < 0)
        return 0;
       ret += 4; /* include crc */
-      pad_ret = MAX (ret + 4, 64);
+      pad_ret = max (ret + 4, 64);
       len = pad_ret;
       memcpy (dest, &len, 2);