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.
This commit is contained in:
parent
268c91391a
commit
9e8e7dd966
|
@ -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.
|
||||
|
|
|
@ -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:
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue