*/
-#ifndef _SIM_CORE_C_
-#define _SIM_CORE_C_
+#ifndef SIM_CORE_C
+#define SIM_CORE_C
#include "sim-main.h"
#include "sim-assert.h"
+#if (WITH_HW)
+#include "sim-hw.h"
+#endif
+
/* "core" module install handler.
This is called via sim_module_install to install the "core" subsystem
sim_core_uninstall (SIM_DESC sd)
{
sim_core *core = STATE_CORE(sd);
- sim_core_maps map;
+ unsigned map;
/* blow away any mappings */
- for (map = 0; map < nr_sim_core_maps; map++) {
+ for (map = 0; map < nr_maps; map++) {
sim_core_mapping *curr = core->common.map[map].first;
while (curr != NULL) {
sim_core_mapping *tbd = curr;
#ifndef SIM_CORE_SIGNAL
#define SIM_CORE_SIGNAL(SD,CPU,CIA,MAP,NR_BYTES,ADDR,TRANSFER,ERROR) \
sim_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), (TRANSFER), (ERROR))
+#endif
-STATIC_SIM_CORE\
+EXTERN_SIM_CORE\
(void)
sim_core_signal (SIM_DESC sd,
sim_cpu *cpu,
sim_cia cia,
- sim_core_maps map,
+ unsigned map,
int nr_bytes,
address_word addr,
transfer_type transfer,
"sim_core_signal - internal error - bad switch");
}
}
-#endif
-
-
-EXTERN_SIM_CORE\
-(const char *)
-sim_core_map_to_str (sim_core_maps map)
-{
- switch (map)
- {
- case sim_core_read_map: return "read";
- case sim_core_write_map: return "write";
- case sim_core_execute_map: return "exec";
- default: return "(invalid-map)";
- }
-}
STATIC_SIM_CORE\
address_word addr,
address_word nr_bytes,
unsigned modulo,
+#if WITH_HW
+ struct hw *device,
+#else
device *device,
+#endif
void *buffer,
void *free_buffer)
{
address_word addr,
address_word nr_bytes,
unsigned modulo,
+#if WITH_HW
+ struct hw *client, /*callback/default*/
+#else
device *client, /*callback/default*/
+#endif
void *buffer, /*raw_memory*/
void *free_buffer) /*raw_memory*/
{
{
#if (WITH_DEVICES)
device_error(client, "called on sim_core_map_attach with size zero");
-#else
- sim_io_error (sd, "called on sim_core_map_attach with size zero");
#endif
+#if (WITH_HW)
+ sim_hw_abort (sd, client, "called on sim_core_map_attach with size zero");
+#endif
+ sim_io_error (sd, "called on sim_core_map_attach with size zero");
}
/* find the insertion point (between last/next) */
(long) next_mapping->base,
(long) next_mapping->bound,
(long) next_mapping->nr_bytes);
-#else
- sim_io_error (sd, "memory map %d:0x%lx..0x%lx (%ld bytes) overlaps %d:0x%lx..0x%lx (%ld bytes)",
+#endif
+#if WITH_HW
+ sim_hw_abort (sd, client, "memory map %d:0x%lx..0x%lx (%ld bytes) overlaps %d:0x%lx..0x%lx (%ld bytes)",
space,
(long) addr,
(long) nr_bytes,
(long) next_mapping->bound,
(long) next_mapping->nr_bytes);
#endif
+ sim_io_error (sd, "memory map %d:0x%lx..0x%lx (%ld bytes) overlaps %d:0x%lx..0x%lx (%ld bytes)",
+ space,
+ (long) addr,
+ (long) nr_bytes,
+ (long) (addr + (nr_bytes - 1)),
+ next_mapping->space,
+ (long) next_mapping->base,
+ (long) next_mapping->bound,
+ (long) next_mapping->nr_bytes);
}
/* create/insert the new mapping */
sim_core_attach (SIM_DESC sd,
sim_cpu *cpu,
int level,
- access_type access,
+ unsigned mapmask,
int space,
address_word addr,
address_word nr_bytes,
unsigned modulo,
+#if WITH_HW
+ struct hw *client,
+#else
device *client,
+#endif
void *optional_buffer)
{
sim_core *memory = STATE_CORE(sd);
- sim_core_maps map;
+ unsigned map;
void *buffer;
void *free_buffer;
if (cpu != NULL)
sim_io_error (sd, "sim_core_map_attach - processor specific memory map not yet supported");
- if ((access & access_read_write_exec) == 0
- || (access & ~access_read_write_exec) != 0)
- {
-#if (WITH_DEVICES)
- device_error(client, "invalid access for core attach");
-#else
- sim_io_error (sd, "invalid access for core attach");
-#endif
- }
-
/* verify modulo memory */
if (!WITH_MODULO_MEMORY && modulo != 0)
{
#if (WITH_DEVICES)
device_error (client, "sim_core_attach - internal error - modulo memory disabled");
-#else
- sim_io_error (sd, "sim_core_attach - internal error - modulo memory disabled");
#endif
+#if (WITH_HW)
+ sim_hw_abort (sd, client, "sim_core_attach - internal error - modulo memory disabled");
+#endif
+ sim_io_error (sd, "sim_core_attach - internal error - modulo memory disabled");
}
if (client != NULL && modulo != 0)
{
#if (WITH_DEVICES)
device_error (client, "sim_core_attach - internal error - modulo and callback memory conflict");
-#else
- sim_io_error (sd, "sim_core_attach - internal error - modulo and callback memory conflict");
#endif
+#if (WITH_HW)
+ sim_hw_abort (sd, client, "sim_core_attach - internal error - modulo and callback memory conflict");
+#endif
+ sim_io_error (sd, "sim_core_attach - internal error - modulo and callback memory conflict");
}
if (modulo != 0)
{
{
#if (WITH_DEVICES)
device_error (client, "sim_core_attach - internal error - modulo %lx not power of two", (long) modulo);
-#else
- sim_io_error (sd, "sim_core_attach - internal error - modulo %lx not power of two", (long) modulo);
#endif
+#if (WITH_HW)
+ sim_hw_abort (sd, client, "sim_core_attach - internal error - modulo %lx not power of two", (long) modulo);
+#endif
+ sim_io_error (sd, "sim_core_attach - internal error - modulo %lx not power of two", (long) modulo);
}
}
{
#if (WITH_DEVICES)
device_error (client, "sim_core_attach - internal error - conflicting buffer and attach arguments");
-#else
- sim_io_error (sd, "sim_core_attach - internal error - conflicting buffer and attach arguments");
#endif
+#if (WITH_HW)
+ sim_hw_abort (sd, client, "sim_core_attach - internal error - conflicting buffer and attach arguments");
+#endif
+ sim_io_error (sd, "sim_core_attach - internal error - conflicting buffer and attach arguments");
}
if (client == NULL)
{
/* attach the region to all applicable access maps */
for (map = 0;
- map < nr_sim_core_maps;
+ map < nr_maps;
map++)
{
- switch (map)
+ if (mapmask & (1 << map))
{
- case sim_core_read_map:
- if (access & access_read)
- sim_core_map_attach (sd, &memory->common.map[map],
- level, space, addr, nr_bytes, modulo,
- client, buffer, free_buffer);
+ sim_core_map_attach (sd, &memory->common.map[map],
+ level, space, addr, nr_bytes, modulo,
+ client, buffer, free_buffer);
free_buffer = NULL;
- break;
- case sim_core_write_map:
- if (access & access_write)
- sim_core_map_attach (sd, &memory->common.map[map],
- level, space, addr, nr_bytes, modulo,
- client, buffer, free_buffer);
- free_buffer = NULL;
- break;
- case sim_core_execute_map:
- if (access & access_exec)
- sim_core_map_attach (sd, &memory->common.map[map],
- level, space, addr, nr_bytes, modulo,
- client, buffer, free_buffer);
- free_buffer = NULL;
- break;
- default:
- sim_io_error (sd, "sim_core_attach - internal error - bad switch");
- break;
}
}
address_word addr)
{
sim_core *memory = STATE_CORE (sd);
- sim_core_maps map;
- for (map = 0; map < nr_sim_core_maps; map++)
+ unsigned map;
+ for (map = 0; map < nr_maps; map++)
{
sim_core_map_detach (sd, &memory->common.map[map],
level, address_space, addr);
STATIC_INLINE_SIM_CORE\
(sim_core_mapping *)
sim_core_find_mapping(sim_core_common *core,
- sim_core_maps map,
+ unsigned map,
address_word addr,
unsigned nr_bytes,
transfer_type transfer,
(unsigned)
sim_core_read_buffer (SIM_DESC sd,
sim_cpu *cpu,
- sim_core_maps map,
+ unsigned map,
void *buffer,
address_word addr,
unsigned len)
{
sim_core_common *core = (cpu == NULL ? &STATE_CORE (sd)->common : &CPU_CORE (cpu)->common);
unsigned count = 0;
- while (count < len) {
+ while (count < len)
+ {
unsigned_word raddr = addr + count;
sim_core_mapping *mapping =
- sim_core_find_mapping(core, map,
+ sim_core_find_mapping (core, map,
raddr, /*nr-bytes*/1,
read_transfer,
0 /*dont-abort*/, NULL, NULL_CIA);
if (mapping == NULL)
break;
#if (WITH_DEVICES)
- if (mapping->device != NULL) {
- int nr_bytes = len - count;
- if (raddr + nr_bytes - 1> mapping->bound)
- nr_bytes = mapping->bound - raddr + 1;
- if (device_io_read_buffer(mapping->device,
- (unsigned_1*)buffer + count,
- mapping->space,
- raddr,
- nr_bytes,
- cpu,
- CIA_GET(cpu)) != nr_bytes)
- break;
- count += nr_bytes;
- }
- else
+ if (mapping->device != NULL)
+ {
+ int nr_bytes = len - count;
+ if (raddr + nr_bytes - 1> mapping->bound)
+ nr_bytes = mapping->bound - raddr + 1;
+ if (device_io_read_buffer (mapping->device,
+ (unsigned_1*)buffer + count,
+ mapping->space,
+ raddr,
+ nr_bytes,
+ cpu,
+ CIA_GET (cpu)) != nr_bytes)
+ break;
+ count += nr_bytes;
+ continue;
+ }
#endif
+#if (WITH_HW)
+ if (mapping->device != NULL)
{
- ((unsigned_1*)buffer)[count] =
- *(unsigned_1*)sim_core_translate(mapping, raddr);
- count += 1;
+ int nr_bytes = len - count;
+ if (raddr + nr_bytes - 1> mapping->bound)
+ nr_bytes = mapping->bound - raddr + 1;
+ if (sim_hw_io_read_buffer (sd, mapping->device,
+ (unsigned_1*)buffer + count,
+ mapping->space,
+ raddr,
+ nr_bytes) != nr_bytes)
+ break;
+ count += nr_bytes;
+ continue;
}
- }
+#endif
+ ((unsigned_1*)buffer)[count] =
+ *(unsigned_1*)sim_core_translate(mapping, raddr);
+ count += 1;
+ }
return count;
}
(unsigned)
sim_core_write_buffer (SIM_DESC sd,
sim_cpu *cpu,
- sim_core_maps map,
+ unsigned map,
const void *buffer,
address_word addr,
unsigned len)
{
sim_core_common *core = (cpu == NULL ? &STATE_CORE (sd)->common : &CPU_CORE (cpu)->common);
unsigned count = 0;
- while (count < len) {
- unsigned_word raddr = addr + count;
- sim_core_mapping *mapping =
- sim_core_find_mapping(core, map,
- raddr, /*nr-bytes*/1,
- write_transfer,
- 0 /*dont-abort*/, NULL, NULL_CIA);
- if (mapping == NULL)
- break;
-#if (WITH_DEVICES)
- if (WITH_CALLBACK_MEMORY
- && mapping->device != NULL) {
- int nr_bytes = len - count;
- if (raddr + nr_bytes - 1 > mapping->bound)
- nr_bytes = mapping->bound - raddr + 1;
- if (device_io_write_buffer(mapping->device,
- (unsigned_1*)buffer + count,
- mapping->space,
- raddr,
- nr_bytes,
- cpu,
- CIA_GET(cpu)) != nr_bytes)
+ while (count < len)
+ {
+ unsigned_word raddr = addr + count;
+ sim_core_mapping *mapping =
+ sim_core_find_mapping (core, map,
+ raddr, /*nr-bytes*/1,
+ write_transfer,
+ 0 /*dont-abort*/, NULL, NULL_CIA);
+ if (mapping == NULL)
break;
- count += nr_bytes;
- }
- else
+#if (WITH_DEVICES)
+ if (WITH_CALLBACK_MEMORY
+ && mapping->device != NULL)
+ {
+ int nr_bytes = len - count;
+ if (raddr + nr_bytes - 1 > mapping->bound)
+ nr_bytes = mapping->bound - raddr + 1;
+ if (device_io_write_buffer (mapping->device,
+ (unsigned_1*)buffer + count,
+ mapping->space,
+ raddr,
+ nr_bytes,
+ cpu,
+ CIA_GET(cpu)) != nr_bytes)
+ break;
+ count += nr_bytes;
+ continue;
+ }
#endif
- {
- *(unsigned_1*)sim_core_translate(mapping, raddr) =
- ((unsigned_1*)buffer)[count];
- count += 1;
- }
- }
+#if (WITH_HW)
+ if (WITH_CALLBACK_MEMORY
+ && mapping->device != NULL)
+ {
+ int nr_bytes = len - count;
+ if (raddr + nr_bytes - 1 > mapping->bound)
+ nr_bytes = mapping->bound - raddr + 1;
+ if (sim_hw_io_write_buffer (sd, mapping->device,
+ (unsigned_1*)buffer + count,
+ mapping->space,
+ raddr,
+ nr_bytes) != nr_bytes)
+ break;
+ count += nr_bytes;
+ continue;
+ }
+#endif
+ *(unsigned_1*)sim_core_translate(mapping, raddr) =
+ ((unsigned_1*)buffer)[count];
+ count += 1;
+ }
return count;
}
}
else {
if (is_xor)
- sim_engine_abort (sd, cpu, NULL_CIA,
+ sim_engine_abort (sd, NULL, NULL_CIA,
"Attempted to enable xor-endian mode when permenantly disabled.");
}
}
(unsigned)
sim_core_xor_read_buffer (SIM_DESC sd,
sim_cpu *cpu,
- sim_core_maps map,
+ unsigned map,
void *buffer,
address_word addr,
unsigned nr_bytes)
(unsigned)
sim_core_xor_write_buffer (SIM_DESC sd,
sim_cpu *cpu,
- sim_core_maps map,
+ unsigned map,
const void *buffer,
address_word addr,
unsigned nr_bytes)
*/
-#ifndef _SIM_CORE_H_
-#define _SIM_CORE_H_
+#ifndef SIM_CORE_H
+#define SIM_CORE_H
-/* core signals (error conditions) */
+/* core signals (error conditions)
+ Define SIM_CORE_SIGNAL to catch these signals - see sim-core.c for
+ details. */
typedef enum {
sim_core_unmapped_signal,
nr_sim_core_signals,
} sim_core_signals;
-/* define SIM_CORE_SIGNAL to catch these signals - see sim-core.c for
- details */
+/* Type of SIM_CORE_SIGNAL handler. */
+typedef void (SIM_CORE_SIGNAL_FN)
+ (SIM_DESC sd, sim_cpu *cpu, sim_cia cia, unsigned map, int nr_bytes,
+ address_word addr, transfer_type transfer, sim_core_signals sig);
+extern SIM_CORE_SIGNAL_FN sim_core_signal;
/* basic types */
void *free_buffer;
void *buffer;
/* callback map */
+#if (WITH_HW)
+ struct hw *device;
+#else
device *device;
+#endif
/* tracing */
int trace;
/* growth */
sim_core_mapping *first;
};
-typedef enum {
- sim_core_read_map,
- sim_core_write_map,
- sim_core_execute_map,
- nr_sim_core_maps,
-} sim_core_maps;
-
typedef struct _sim_core_common {
- sim_core_map map[nr_sim_core_maps];
+ sim_core_map map[nr_maps];
} sim_core_common;
-/* Create a memory space within the core.
+/* Create a memory region within the core.
- CPU, when non NULL, specifes the single processor that the memory
- space is to be attached to. (UNIMPLEMENTED).
+ CPU - when non NULL, specifes the single processor that the memory
+ space is to be attached to. (INIMPLEMENTED).
- LEVEL specifies the ordering of the memory region. Lower regions
+ LEVEL - specifies the ordering of the memory region. Lower regions
are searched first. Within a level, memory regions can not
overlap.
- DEVICE, when non NULL, specifies a callback memory space.
- (UNIMPLEMENTED, see the ppc simulator for an example).
+ MAPMASK - Bitmask specifying the memory maps that the region is to
+ be attached to. Typically the enums sim-basics.h:access_* are used.
- MODULO, when the simulator has been configured WITH_MODULO support
+ ADDRESS_SPACE - For device regions, a MAP:ADDRESS pair is
+ translated into ADDRESS_SPACE:OFFSET before being passed to the
+ client device.
+
+ MODULO - when the simulator has been configured WITH_MODULO support
and is greater than zero, specifies that accesses to the region
[ADDR .. ADDR+NR_BYTES) should be mapped onto the sub region [ADDR
.. ADDR+MODULO). The modulo value must be a power of two.
- OPTIONAL_BUFFER, when non NULL, specifies the buffer to use for
+ DEVICE - When non NULL, indicates that this is a callback memory
+ space and specified device's memory callback handler should be
+ called.
+
+ OPTIONAL_BUFFER - when non NULL, specifies the buffer to use for
data read & written to the region. Normally a more efficient
internal structure is used. It is assumed that buffer is allocated
such that the byte alignmed of OPTIONAL_BUFFER matches ADDR vis
(OPTIONAL_BUFFER % 8) == (ADDR % 8)). It is defined to be a sub-optimal
hook that allows clients to do nasty things that the interface doesn't
- accomodate. ??? That seems unnecessarily restrictive. */
+ accomodate. */
EXTERN_SIM_CORE\
(void) sim_core_attach
(SIM_DESC sd,
sim_cpu *cpu,
int level,
- access_type access,
+ unsigned mapmask,
int address_space,
address_word addr,
address_word nr_bytes,
unsigned modulo,
+#if (WITH_HW)
+ struct hw *client,
+#else
device *client,
+#endif
void *optional_buffer);
-/* Utility to return the name of a map. */
-
-EXTERN_SIM_CORE\
-(const char *) sim_core_map_to_str
-(sim_core_maps);
-
-
-/* Delete a memory space within the core.
+/* Delete a memory section within the core.
*/
(unsigned) sim_core_read_buffer
(SIM_DESC sd,
sim_cpu *cpu,
- sim_core_maps map,
+ unsigned map,
void *buffer,
address_word addr,
unsigned nr_bytes);
(unsigned) sim_core_write_buffer
(SIM_DESC sd,
sim_cpu *cpu,
- sim_core_maps map,
+ unsigned map,
const void *buffer,
address_word addr,
unsigned nr_bytes);
(unsigned) sim_core_xor_read_buffer
(SIM_DESC sd,
sim_cpu *cpu,
- sim_core_maps map,
+ unsigned map,
void *buffer,
address_word addr,
unsigned nr_bytes);
(unsigned) sim_core_xor_write_buffer
(SIM_DESC sd,
sim_cpu *cpu,
- sim_core_maps map,
+ unsigned map,
const void *buffer,
address_word addr,
unsigned nr_bytes);
(void) sim_core_write_##ALIGNMENT##_##N \
(sim_cpu *cpu, \
sim_cia cia, \
- sim_core_maps map, \
+ unsigned map, \
address_word addr, \
unsigned_##M val);
(unsigned_##M) sim_core_read_##ALIGNMENT##_##N \
(sim_cpu *cpu, \
sim_cia cia, \
- sim_core_maps map, \
+ unsigned map, \
address_word addr);
DECLARE_SIM_CORE_READ_N(aligned,1,1)
#undef DECLARE_SIM_CORE_READ_N
+
#endif
projects / binutils-gdb.git / commitdiff