From 9e8e7dd966670c80f3b71f8cf7e07f2843b33e80 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 25 Dec 2015 00:23:50 -0500
Subject: [PATCH] sim: always enable callback memory

We enable WITH_CALLBACK_MEMORY everywhere and don't provide a way to
turn it off, and no target does so.  Make it unconditional for all
to keep things simple.
---
 sim/common/ChangeLog    | 7 +++++++
 sim/common/sim-config.h | 5 -----
 sim/common/sim-core.c   | 6 ++----
 sim/common/sim-n-core.h | 8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 0778130d42..0a6cb159a6 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,10 @@
+2015-12-25  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-config.h (WITH_CALLBACK_MEMORY): Delete.
+	* sim-core.c (sim_core_write_buffer): Likewise.
+	* sim-n-core.h (sim_core_read_aligned_N): Likewise.
+	(sim_core_write_aligned_N): Likewise.
+
 2015-12-25  Mike Frysinger  <vapier@gentoo.org>
 
 	* dv-pal.c: Include config.h and sim-main.h.
diff --git a/sim/common/sim-config.h b/sim/common/sim-config.h
index d34ae88129..599b84c09c 100644
--- a/sim/common/sim-config.h
+++ b/sim/common/sim-config.h
@@ -394,11 +394,6 @@ extern char *simulator_sysroot;
    x86) in eliminating a function call for the most common
    (raw_memory) case. */
 
-#ifndef WITH_CALLBACK_MEMORY
-#define WITH_CALLBACK_MEMORY		1
-#endif
-
-
 
 /* Alignment:
 
diff --git a/sim/common/sim-core.c b/sim/common/sim-core.c
index 724a036fe7..a5e3cdbb28 100644
--- a/sim/common/sim-core.c
+++ b/sim/common/sim-core.c
@@ -576,8 +576,7 @@ sim_core_write_buffer (SIM_DESC sd,
       if (mapping == NULL)
 	break;
 #if (WITH_DEVICES)
-      if (WITH_CALLBACK_MEMORY
-	  && mapping->device != NULL)
+      if (mapping->device != NULL)
 	{
 	  int nr_bytes = len - count;
 	  sim_cia cia = cpu ? CPU_PC_GET (cpu) : NULL_CIA;
@@ -597,8 +596,7 @@ sim_core_write_buffer (SIM_DESC sd,
 	}
 #endif
 #if (WITH_HW)
-      if (WITH_CALLBACK_MEMORY
-	  && mapping->device != NULL)
+      if (mapping->device != NULL)
 	{
 	  int nr_bytes = len - count;
 	  if (raddr + nr_bytes - 1 > mapping->bound)
diff --git a/sim/common/sim-n-core.h b/sim/common/sim-n-core.h
index a8eebe2742..f57e8f8421 100644
--- a/sim/common/sim-n-core.h
+++ b/sim/common/sim-n-core.h
@@ -165,7 +165,7 @@ sim_core_read_aligned_N(sim_cpu *cpu,
   do
     {
 #if (WITH_DEVICES)
-      if (WITH_CALLBACK_MEMORY && mapping->device != NULL)
+      if (mapping->device != NULL)
 	{
 	  unsigned_M data;
 	  if (device_io_read_buffer (mapping->device, &data, mapping->space, addr, N, CPU_STATE (cpu), cpu, cia) != N)
@@ -176,7 +176,7 @@ sim_core_read_aligned_N(sim_cpu *cpu,
 	}
 #endif
 #if (WITH_HW)
-      if (WITH_CALLBACK_MEMORY && mapping->device != NULL)
+      if (mapping->device != NULL)
 	{
 	  unsigned_M data;
 	  sim_cpu_hw_io_read_buffer (cpu, cia, mapping->device, &data, mapping->space, addr, N);
@@ -296,7 +296,7 @@ sim_core_write_aligned_N(sim_cpu *cpu,
   do
     {
 #if (WITH_DEVICES)
-      if (WITH_CALLBACK_MEMORY && mapping->device != NULL)
+      if (mapping->device != NULL)
 	{
 	  unsigned_M data = H2T_M (val);
 	  if (device_io_write_buffer (mapping->device, &data, mapping->space, addr, N, CPU_STATE (cpu), cpu, cia) != N)
@@ -306,7 +306,7 @@ sim_core_write_aligned_N(sim_cpu *cpu,
 	}
 #endif
 #if (WITH_HW)
-      if (WITH_CALLBACK_MEMORY && mapping->device != NULL)
+      if (mapping->device != NULL)
 	{
 	  unsigned_M data = H2T_M (val);
 	  sim_cpu_hw_io_write_buffer (cpu, cia, mapping->device, &data, mapping->space, addr, N);