Fix changelog

[external/binutils.git] / sim / bfin / dv-bfin_ebiu_sdc.c

diff --git a/sim/bfin/dv-bfin_ebiu_sdc.c b/sim/bfin/dv-bfin_ebiu_sdc.c
index 710f2f8..1c87376 100644 (file)
--- a/sim/bfin/dv-bfin_ebiu_sdc.c
+++ b/sim/bfin/dv-bfin_ebiu_sdc.c
@@ -1,6 +1,6 @@
 /* Blackfin External Bus Interface Unit (EBIU) SDRAM Controller (SDC) Model.
 
-   Copyright (C) 2010-2011 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 Free Software Foundation, Inc.
    Contributed by Analog Devices, Inc.
 
    This file is part of simulators.
@@ -39,7 +39,8 @@ struct bfin_ebiu_sdc
 #define mmr_base()      offsetof(struct bfin_ebiu_sdc, sdgctl)
 #define mmr_offset(mmr) (offsetof(struct bfin_ebiu_sdc, mmr) - mmr_base())
 
-static const char * const mmr_names[] = {
+static const char * const mmr_names[] =
+{
   "EBIU_SDGCTL", "EBIU_SDBCTL", "EBIU_SDRRC", "EBIU_SDSTAT",
 };
 #define mmr_name(off) mmr_names[(off) / 4]
@@ -55,6 +56,10 @@ bfin_ebiu_sdc_io_write_buffer (struct hw *me, const void *source,
   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
@@ -76,21 +81,25 @@ bfin_ebiu_sdc_io_write_buffer (struct hw *me, const void *source,
     case mmr_offset(sdbctl):
       if (sdc->type == 561)
        {
-         dv_bfin_mmr_require_32 (me, addr, nr_bytes, true);
+         if (!dv_bfin_mmr_require_32 (me, addr, nr_bytes, true))
+           return 0;
          *value32p = value;
        }
       else
        {
-         dv_bfin_mmr_require_16 (me, addr, nr_bytes, true);
+         if (!dv_bfin_mmr_require_16 (me, addr, nr_bytes, true))
+           return 0;
          *value16p = value;
        }
       break;
     case mmr_offset(sdrrc):
-      dv_bfin_mmr_require_16 (me, addr, nr_bytes, true);
+      if (!dv_bfin_mmr_require_16 (me, addr, nr_bytes, true))
+       return 0;
       *value16p = value;
       break;
     case mmr_offset(sdstat):
-      dv_bfin_mmr_require_16 (me, addr, nr_bytes, true);
+      if (!dv_bfin_mmr_require_16 (me, addr, nr_bytes, true))
+       return 0;
       /* XXX: Some bits are W1C ...  */
       break;
     }
@@ -108,6 +117,10 @@ bfin_ebiu_sdc_io_read_buffer (struct hw *me, void *dest,
   bu16 *value16p;
   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 - sdc->base;
   valuep = (void *)((unsigned long)sdc + mmr_base() + mmr_off);
   value16p = valuep;
@@ -123,18 +136,21 @@ bfin_ebiu_sdc_io_read_buffer (struct hw *me, void *dest,
     case mmr_offset(sdbctl):
       if (sdc->type == 561)
        {
-         dv_bfin_mmr_require_32 (me, addr, nr_bytes, false);
+         if (!dv_bfin_mmr_require_32 (me, addr, nr_bytes, false))
+           return 0;
          dv_store_4 (dest, *value32p);
        }
       else
        {
-         dv_bfin_mmr_require_16 (me, addr, nr_bytes, false);
+         if (!dv_bfin_mmr_require_16 (me, addr, nr_bytes, false))
+           return 0;
          dv_store_2 (dest, *value16p);
        }
       break;
     case mmr_offset(sdrrc):
     case mmr_offset(sdstat):
-      dv_bfin_mmr_require_16 (me, addr, nr_bytes, false);
+      if (!dv_bfin_mmr_require_16 (me, addr, nr_bytes, false))
+       return 0;
       dv_store_2 (dest, *value16p);
       break;
     }
@@ -195,7 +211,8 @@ bfin_ebiu_sdc_finish (struct hw *me)
   sdc->sdbctl |= EBE | EBSZ_64 | EBCAW_10;
 }
 
-const struct hw_descriptor dv_bfin_ebiu_sdc_descriptor[] = {
+const struct hw_descriptor dv_bfin_ebiu_sdc_descriptor[] =
+{
   {"bfin_ebiu_sdc", bfin_ebiu_sdc_finish,},
   {NULL, NULL},
 };