Regenerate configure in sim

[deliverable/binutils-gdb.git] / sim / cris / devices.c

diff --git a/sim/cris/devices.c b/sim/cris/devices.c
index feb901ae4eaba0753c84b2542c8a555b23db753b..a7fa051349b2d707098f9dd4854915fdc90c8801 100644 (file)
--- a/sim/cris/devices.c
+++ b/sim/cris/devices.c
@@ -1,22 +1,21 @@
 /* CRIS device support
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004-2015 Free Software Foundation, Inc.
    Contributed by Axis Communications.
 
 This file is part of the GNU 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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Based on the i960 devices.c (for the purposes, the same as all the
    others).  */
@@ -27,12 +26,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "dv-sockser.h"
 #endif
 
+#include "hw-device.h"
+
 /* Placeholder definition.  */
 struct _device { char dummy; } cris_devices;
 
 void
 device_error (device *me ATTRIBUTE_UNUSED,
-             char *message ATTRIBUTE_UNUSED,
+             const char *message ATTRIBUTE_UNUSED,
              ...)
 {
   abort ();
@@ -48,7 +49,11 @@ device_io_read_buffer (device *me ATTRIBUTE_UNUSED,
                       SIM_CPU *cpu ATTRIBUTE_UNUSED,
                       sim_cia cia ATTRIBUTE_UNUSED)
 {
+#if WITH_HW
+  return hw_io_read_buffer ((struct hw *) me, source, space, addr, nr_bytes);
+#else
   abort ();
+#endif
 }
 
 int
@@ -61,13 +66,22 @@ device_io_write_buffer (device *me ATTRIBUTE_UNUSED,
   static const unsigned char ok[] = { 4, 0, 0, 0x90};
   static const unsigned char bad[] = { 8, 0, 0, 0x90};
 
-  if (addr == 0x90000004 && memcmp (source, ok, sizeof ok) == 0)
-    cris_break_13_handler (cpu, 1, 0, 0, 0, 0, 0, 0, cia);
-  else if (addr == 0x90000008
-          && memcmp (source, bad, sizeof bad) == 0)
-    cris_break_13_handler (cpu, 1, 34, 0, 0, 0, 0, 0, cia);
+  if (cris_have_900000xxif)
+    {
+      if (addr == 0x90000004 && memcmp (source, ok, sizeof ok) == 0)
+       return cris_break_13_handler (cpu, 1, 0, 0, 0, 0, 0, 0, cia);
+      else if (addr == 0x90000008
+              && memcmp (source, bad, sizeof bad) == 0)
+       return cris_break_13_handler (cpu, 1, 34, 0, 0, 0, 0, 0, cia);
+    }
+#if WITH_HW
+  else
+    return hw_io_write_buffer ((struct hw *) me, source, space, addr, nr_bytes);
+#endif
 
   /* If it wasn't one of those, send an invalid-memory signal.  */
   sim_core_signal (sd, cpu, cia, 0, nr_bytes, addr,
                   write_transfer, sim_core_unmapped_signal);
+
+  return 0;
 }