diff options
author | 2009-07-08 14:47:35 +0000 | |
---|---|---|
committer | 2009-07-08 14:47:35 +0000 | |
commit | 7b28233e47541c9c5bf075ff0e4af86f973a1917 (patch) | |
tree | 94ba6e9b6e3cf058b888026fbc254d4874c23f71 /src/emu/cpuexec.h | |
parent | 54ca1938bc3e06bb473329c26d7db15474a79b17 (diff) |
Move address_map array from cpu_config to device_config. Added
MDRV macros in the device for specifying address maps. Changed
the memory system to fetch the maps from the new location.
This is just a small step toward the end goal of getting address
maps into arbitrary devices.
Diffstat (limited to 'src/emu/cpuexec.h')
-rw-r--r-- | src/emu/cpuexec.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/emu/cpuexec.h b/src/emu/cpuexec.h index 695f8bfbc53..79fdb59ca89 100644 --- a/src/emu/cpuexec.h +++ b/src/emu/cpuexec.h @@ -63,7 +63,6 @@ struct _cpu_config { cpu_type type; /* index for the CPU type */ UINT32 flags; /* flags; see #defines below */ - const addrmap_token *address_map[ADDRESS_SPACES]; /* 1 memory map per address space */ cpu_interrupt_func vblank_interrupt; /* for interrupts tied to VBLANK */ int vblank_interrupts_per_frame;/* usually 1 */ const char * vblank_interrupt_screen; /* the screen that causes the VBLANK interrupt */ @@ -111,14 +110,14 @@ struct _cpu_class_header #define MDRV_CPU_CONFIG(_config) \ MDRV_DEVICE_CONFIG(_config) -#define MDRV_CPU_PROGRAM_MAP(_map1) \ - MDRV_DEVICE_CONFIG_DATAPTR_ARRAY(cpu_config, address_map, ADDRESS_SPACE_PROGRAM, ADDRESS_MAP_NAME(_map1)) \ +#define MDRV_CPU_PROGRAM_MAP(_map) \ + MDRV_DEVICE_PROGRAM_MAP(_map) -#define MDRV_CPU_DATA_MAP(_map1) \ - MDRV_DEVICE_CONFIG_DATAPTR_ARRAY(cpu_config, address_map, ADDRESS_SPACE_DATA, ADDRESS_MAP_NAME(_map1)) \ +#define MDRV_CPU_DATA_MAP(_map) \ + MDRV_DEVICE_DATA_MAP(_map) -#define MDRV_CPU_IO_MAP(_map1) \ - MDRV_DEVICE_CONFIG_DATAPTR_ARRAY(cpu_config, address_map, ADDRESS_SPACE_IO, ADDRESS_MAP_NAME(_map1)) \ +#define MDRV_CPU_IO_MAP(_map) \ + MDRV_DEVICE_IO_MAP(_map) #define MDRV_CPU_VBLANK_INT(_tag, _func) \ MDRV_DEVICE_CONFIG_DATAPTR(cpu_config, vblank_interrupt, _func) \ |