Merge GDB 7.5.1

sim/bfin/dv-bfin_ebiu_amc.c

 /* Blackfin External Bus Interface Unit (EBIU) Asynchronous Memory Controller
    (AMC) model.
 
    Copyright (C) 2010-2012 Free Software Foundation, Inc.
    Contributed by Analog Devices, Inc.
 
    This file is part of simulators.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ skipping 11 matching lines @@
 #include "config.h"
 
 #include "sim-main.h"
 #include "devices.h"
 #include "dv-bfin_ebiu_amc.h"
 
 struct bfin_ebiu_amc
 {
   bu32 base;
   int type;
-  bu32 bank_size;
+  bu32 bank_base, bank_size;
   unsigned (*io_write) (struct hw *, const void *, int, address_word,
                         unsigned, struct bfin_ebiu_amc *, bu32, bu32);
   unsigned (*io_read) (struct hw *, void *, int, address_word, unsigned,
                        struct bfin_ebiu_amc *, bu32, void *, bu16 *, bu32 *);
   struct hw *slaves[4];
 
   /* Order after here is important -- matches hardware MMR layout.  */
   bu16 BFIN_MMR_16(amgctl);
   union {
     struct {
@@ skipping 39 matching lines @@
   bu32 amben_old, amben, addr, i;
 
   amben_old = MIN ((amc->amgctl >> 1) & 0x7, 4);
   amben = MIN ((amgctl >> 1) & 0x7, 4);
 
   HW_TRACE ((me, "reattaching banks: AMGCTL 0x%04x[%u] -> 0x%04x[%u]",
              amc->amgctl, amben_old, amgctl, amben));
 
   for (i = 0; i < 4; ++i)
     {
-      addr = BFIN_EBIU_AMC_BASE + i * amc->bank_size;
+      addr = amc->bank_base + i * amc->bank_size;
 
       if (i < amben_old)
         {
           HW_TRACE ((me, "detaching bank %u (%#x base)", i, addr));
           sim_core_detach (hw_system (me), NULL, 0, 0, addr);
         }
 
       if (i < amben)
         {
           struct hw *slave = amc->slaves[i];
@@ skipping 225 matching lines @@
                                        int space,
                                        address_word addr,
                                        address_word nr_bytes,
                                        struct hw *client)
 {
   struct bfin_ebiu_amc *amc = hw_data (me);
 
   HW_TRACE ((me, "attach - level=%d, space=%d, addr=0x%lx, nr_bytes=%lu, client=%s",
              level, space, (unsigned long) addr, (unsigned long) nr_bytes, hw_path (client)));
 
-  if (addr + nr_bytes > 4)
+  if (addr + nr_bytes > ARRAY_SIZE (amc->slaves))
     hw_abort (me, "ebiu amc attaches are done in terms of banks");
 
   while (nr_bytes--)
     amc->slaves[addr + nr_bytes] = client;
 
   bfin_ebiu_amc_write_amgctl (me, amc, amc->amgctl);
 }
 
 static void
 attach_bfin_ebiu_amc_regs (struct hw *me, struct bfin_ebiu_amc *amc,
@@ skipping 45 matching lines @@
 
   switch (amc->type)
     {
     case 500 ... 509:
       amc->io_write = bf50x_ebiu_amc_io_write_buffer;
       amc->io_read = bf50x_ebiu_amc_io_read_buffer;
       mmr_names = bf50x_mmr_names;
       reg_size = sizeof (amc->bf50x) + 4;
 
       /* Initialize the AMC.  */
+      amc->bank_base     = BFIN_EBIU_AMC_BASE;
       amc->bank_size     = 1 * 1024 * 1024;
       amgctl             = 0x00F3;
       amc->bf50x.ambctl0 = 0x0000FFC2;
       amc->bf50x.ambctl1 = 0x0000FFC2;
       amc->bf50x.mode    = 0x0001;
       amc->bf50x.fctl    = 0x0002;
       break;
     case 540 ... 549:
       amc->io_write = bf54x_ebiu_amc_io_write_buffer;
       amc->io_read = bf54x_ebiu_amc_io_read_buffer;
       mmr_names = bf54x_mmr_names;
       reg_size = sizeof (amc->bf54x) + 4;
 
       /* Initialize the AMC.  */
+      amc->bank_base     = BFIN_EBIU_AMC_BASE;
       amc->bank_size     = 64 * 1024 * 1024;
       amgctl             = 0x0002;
       amc->bf54x.ambctl0 = 0xFFC2FFC2;
       amc->bf54x.ambctl1 = 0xFFC2FFC2;
       amc->bf54x.fctl    = 0x0006;
       break;
     case 510 ... 519:
     case 522 ... 527:
     case 531 ... 533:
     case 534:
     case 536:
     case 537:
     case 538 ... 539:
     case 561:
       amc->io_write = bf53x_ebiu_amc_io_write_buffer;
       amc->io_read = bf53x_ebiu_amc_io_read_buffer;
       mmr_names = bf53x_mmr_names;
       reg_size = sizeof (amc->bf53x) + 4;
 
       /* Initialize the AMC.  */
+      amc->bank_base     = BFIN_EBIU_AMC_BASE;
       if (amc->type == 561)
         amc->bank_size   = 64 * 1024 * 1024;
       else
         amc->bank_size   = 1 * 1024 * 1024;
       amgctl             = 0x00F2;
       amc->bf53x.ambctl0 = 0xFFC2FFC2;
       amc->bf53x.ambctl1 = 0xFFC2FFC2;
       break;
     case 590 ... 599: /* BF59x has no AMC.  */
     default:
       hw_abort (me, "no support for EBIU AMC on this Blackfin model yet");
     }
 
   attach_bfin_ebiu_amc_regs (me, amc, reg_size);
 
   bfin_ebiu_amc_write_amgctl (me, amc, amgctl);
 }
 
 const struct hw_descriptor dv_bfin_ebiu_amc_descriptor[] =
 {
   {"bfin_ebiu_amc", bfin_ebiu_amc_finish,},
   {NULL, NULL},
 };