diff options
author | 2010-08-19 07:26:14 +0000 | |
---|---|---|
committer | 2010-08-19 07:26:14 +0000 | |
commit | 3598b772bc80b2efb6396c65996462b38eedc593 (patch) | |
tree | e975a31f1f8599b8a947b11675b674fd993accf2 /src/emu/cpu | |
parent | dd19e512c03c58a100ae5025c9fd7624387667fd (diff) |
Replace "const address_space" with "address_space" throughout the system.
The purpose of making it const before was to discourage direct tampering,
but private/protected does a better job of that now anyhow, and it is
annoying now.
s/const[ \t]+address_space\b/address_space/g;
Is basically what I did.
Diffstat (limited to 'src/emu/cpu')
108 files changed, 320 insertions, 320 deletions
diff --git a/src/emu/cpu/adsp2100/adsp2100.c b/src/emu/cpu/adsp2100/adsp2100.c index 628ba02cdae..d147b719fa8 100644 --- a/src/emu/cpu/adsp2100/adsp2100.c +++ b/src/emu/cpu/adsp2100/adsp2100.c @@ -263,9 +263,9 @@ typedef struct adsp21xx_timer_func timer_fired; /* memory spaces */ - const address_space *program; - const address_space *data; - const address_space *io; + address_space *program; + address_space *data; + address_space *io; } adsp2100_state; diff --git a/src/emu/cpu/alph8201/alph8201.c b/src/emu/cpu/alph8201/alph8201.c index 078d939674e..17f78d5968f 100644 --- a/src/emu/cpu/alph8201/alph8201.c +++ b/src/emu/cpu/alph8201/alph8201.c @@ -198,7 +198,7 @@ struct _alpha8201_state #endif legacy_cpu_device *device; - const address_space *program; + address_space *program; int icount; int inst_cycles; }; diff --git a/src/emu/cpu/am29000/am29000.c b/src/emu/cpu/am29000/am29000.c index 68072195351..73a1bfa440a 100644 --- a/src/emu/cpu/am29000/am29000.c +++ b/src/emu/cpu/am29000/am29000.c @@ -131,9 +131,9 @@ typedef struct _am29000_state UINT32 exec_pc; UINT32 next_pc; - const address_space *program; - const address_space *data; - const address_space *io; + address_space *program; + address_space *data; + address_space *io; } am29000_state; diff --git a/src/emu/cpu/apexc/apexc.c b/src/emu/cpu/apexc/apexc.c index 86efb77d773..d218e77eb5d 100644 --- a/src/emu/cpu/apexc/apexc.c +++ b/src/emu/cpu/apexc/apexc.c @@ -359,8 +359,8 @@ struct _apexc_state UINT32 pc; /* address of next instruction for the disassembler */ legacy_cpu_device *device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; int icount; }; diff --git a/src/emu/cpu/arm/arm.c b/src/emu/cpu/arm/arm.c index 7797cde7d02..814410ead26 100644 --- a/src/emu/cpu/arm/arm.c +++ b/src/emu/cpu/arm/arm.c @@ -236,7 +236,7 @@ typedef struct UINT8 pendingFiq; device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; + address_space *program; endianness_t endian; } ARM_REGS; diff --git a/src/emu/cpu/arm7/arm7core.h b/src/emu/cpu/arm7/arm7core.h index e3192dca64b..20ef9a4ccd0 100644 --- a/src/emu/cpu/arm7/arm7core.h +++ b/src/emu/cpu/arm7/arm7core.h @@ -163,7 +163,7 @@ enum endianness_t endian; \ device_irq_callback irq_callback; \ legacy_cpu_device *device; \ - const address_space *program; + address_space *program; /* CPU state struct */ diff --git a/src/emu/cpu/asap/asap.c b/src/emu/cpu/asap/asap.c index 30dc0c4ab43..fe7f2393109 100644 --- a/src/emu/cpu/asap/asap.c +++ b/src/emu/cpu/asap/asap.c @@ -86,7 +86,7 @@ struct _asap_state UINT8 irq_state; int icount; device_irq_callback irq_callback; - const address_space *program; + address_space *program; legacy_cpu_device *device; /* src2val table, registers are at the end */ diff --git a/src/emu/cpu/avr8/avr8.c b/src/emu/cpu/avr8/avr8.c index abe18022c09..d154f13ef12 100644 --- a/src/emu/cpu/avr8/avr8.c +++ b/src/emu/cpu/avr8/avr8.c @@ -27,8 +27,8 @@ struct _avr8_state UINT32 pc; legacy_cpu_device *device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; int icount; }; diff --git a/src/emu/cpu/ccpu/ccpu.c b/src/emu/cpu/ccpu/ccpu.c index a3576bf9180..2896937e1cf 100644 --- a/src/emu/cpu/ccpu/ccpu.c +++ b/src/emu/cpu/ccpu/ccpu.c @@ -44,9 +44,9 @@ struct _ccpu_state int icount; legacy_cpu_device *device; - const address_space *program; - const address_space *data; - const address_space *io; + address_space *program; + address_space *data; + address_space *io; }; diff --git a/src/emu/cpu/cdp1802/cdp1802.c b/src/emu/cpu/cdp1802/cdp1802.c index 2cdfc52932d..51b1e2c7412 100644 --- a/src/emu/cpu/cdp1802/cdp1802.c +++ b/src/emu/cpu/cdp1802/cdp1802.c @@ -26,8 +26,8 @@ struct _cdp1802_state { const cdp1802_interface *intf; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; devcb_resolved_write_line out_q_func; devcb_resolved_read8 in_dma_func; diff --git a/src/emu/cpu/cop400/cop400.c b/src/emu/cpu/cop400/cop400.c index 99059438085..0983df05729 100644 --- a/src/emu/cpu/cop400/cop400.c +++ b/src/emu/cpu/cop400/cop400.c @@ -89,9 +89,9 @@ struct _cop400_state { const cop400_interface *intf; - const address_space *program; - const address_space *data; - const address_space *io; + address_space *program; + address_space *data; + address_space *io; UINT8 featuremask; diff --git a/src/emu/cpu/cp1610/cp1610.c b/src/emu/cpu/cp1610/cp1610.c index 1d3d14fc8fc..1142d16b88e 100644 --- a/src/emu/cpu/cp1610/cp1610.c +++ b/src/emu/cpu/cp1610/cp1610.c @@ -47,7 +47,7 @@ struct _cp1610_state int intrm_pending; int mask_interrupts; legacy_cpu_device *device; - const address_space *program; + address_space *program; int icount; }; diff --git a/src/emu/cpu/cubeqcpu/cubeqcpu.c b/src/emu/cpu/cubeqcpu/cubeqcpu.c index a1afafdf2dd..32c097b3a1b 100644 --- a/src/emu/cpu/cubeqcpu/cubeqcpu.c +++ b/src/emu/cpu/cubeqcpu/cubeqcpu.c @@ -98,7 +98,7 @@ typedef struct UINT16 *sound_data; legacy_cpu_device *device; - const address_space *program; + address_space *program; int icount; } cquestsnd_state; @@ -139,7 +139,7 @@ typedef struct legacy_cpu_device *device; legacy_cpu_device *lindevice; - const address_space *program; + address_space *program; int icount; } cquestrot_state; @@ -185,7 +185,7 @@ typedef struct legacy_cpu_device *device; legacy_cpu_device *rotdevice; - const address_space *program; + address_space *program; int icount; } cquestlin_state; diff --git a/src/emu/cpu/drcbec.c b/src/emu/cpu/drcbec.c index 4e1d48c8c47..07d2c906637 100644 --- a/src/emu/cpu/drcbec.c +++ b/src/emu/cpu/drcbec.c @@ -213,7 +213,7 @@ enum struct _drcbe_state { running_device * device; /* CPU device we are associated with */ - const address_space * space[ADDRESS_SPACES]; /* pointers to CPU's address space */ + address_space * space[ADDRESS_SPACES]; /* pointers to CPU's address space */ drcuml_state * drcuml; /* pointer back to our owner */ drccache * cache; /* pointer to the cache */ drcuml_machine_state state; /* state of the machine */ diff --git a/src/emu/cpu/drcbex64.c b/src/emu/cpu/drcbex64.c index c9da5eae42c..81c95b50bef 100644 --- a/src/emu/cpu/drcbex64.c +++ b/src/emu/cpu/drcbex64.c @@ -278,7 +278,7 @@ struct _drcbe_state x86code * debug_log_hashjmp; /* hashjmp debugging */ x86code * drcmap_get_value; /* map lookup helper */ data_accessors accessors[ADDRESS_SPACES]; /* memory accessors */ - const address_space * space[ADDRESS_SPACES]; /* address spaces */ + address_space * space[ADDRESS_SPACES]; /* address spaces */ UINT8 sse41; /* do we have SSE4.1 support? */ UINT32 ssemode; /* saved SSE mode */ diff --git a/src/emu/cpu/drcbex86.c b/src/emu/cpu/drcbex86.c index b984d75a120..ced858d1380 100644 --- a/src/emu/cpu/drcbex86.c +++ b/src/emu/cpu/drcbex86.c @@ -179,7 +179,7 @@ struct _drcbe_state double fptemp; /* temporary storage for floating point */ data_accessors accessors[ADDRESS_SPACES]; /* memory accessors */ - const address_space * space[ADDRESS_SPACES]; /* address spaces */ + address_space * space[ADDRESS_SPACES]; /* address spaces */ UINT8 sse3; /* do we have SSE3 support? */ UINT16 fpumode; /* saved FPU mode */ diff --git a/src/emu/cpu/drcfe.c b/src/emu/cpu/drcfe.c index 6796444a871..1e9c41e5c20 100644 --- a/src/emu/cpu/drcfe.c +++ b/src/emu/cpu/drcfe.c @@ -55,7 +55,7 @@ struct _drcfe_state /* CPU parameters */ cpu_device * cpudevice; /* CPU device object */ - const address_space *program; /* program address space for this CPU */ + address_space *program; /* program address space for this CPU */ offs_t pageshift; /* shift to convert address to a page index */ /* opcode descriptor arrays */ diff --git a/src/emu/cpu/dsp32/dsp32.c b/src/emu/cpu/dsp32/dsp32.c index 9a643844da4..4e60dec66ac 100644 --- a/src/emu/cpu/dsp32/dsp32.c +++ b/src/emu/cpu/dsp32/dsp32.c @@ -185,7 +185,7 @@ struct _dsp32_state UINT32 ppc; void (*output_pins_changed)(running_device *device, UINT32 pins); legacy_cpu_device * device; - const address_space *program; + address_space *program; }; diff --git a/src/emu/cpu/dsp56k/dsp56k.h b/src/emu/cpu/dsp56k/dsp56k.h index 3667aca818d..ace6eccabee 100644 --- a/src/emu/cpu/dsp56k/dsp56k.h +++ b/src/emu/cpu/dsp56k/dsp56k.h @@ -233,8 +233,8 @@ typedef struct int interrupt_cycles; void (*output_pins_changed)(UINT32 pins); legacy_cpu_device *device; - const address_space *program; - const address_space *data; + address_space *program; + address_space *data; UINT16 peripheral_ram[0x40]; UINT16 program_ram[0x800]; diff --git a/src/emu/cpu/e132xs/e132xs.c b/src/emu/cpu/e132xs/e132xs.c index 6fc51c6df70..8c85ba64a6b 100644 --- a/src/emu/cpu/e132xs/e132xs.c +++ b/src/emu/cpu/e132xs/e132xs.c @@ -320,8 +320,8 @@ struct _hyperstone_state device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; UINT32 opcodexor; INT32 instruction_length; diff --git a/src/emu/cpu/esrip/esrip.c b/src/emu/cpu/esrip/esrip.c index 7ff64cc8e01..bf05659dea5 100644 --- a/src/emu/cpu/esrip/esrip.c +++ b/src/emu/cpu/esrip/esrip.c @@ -110,7 +110,7 @@ typedef struct UINT8 *lbrm; legacy_cpu_device *device; - const address_space *program; + address_space *program; int icount; read16_device_func fdt_r; diff --git a/src/emu/cpu/f8/f8.c b/src/emu/cpu/f8/f8.c index 941999ac143..3abb75d0428 100644 --- a/src/emu/cpu/f8/f8.c +++ b/src/emu/cpu/f8/f8.c @@ -54,8 +54,8 @@ struct _f8_Regs UINT16 irq_vector; device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; - const address_space *iospace; + address_space *program; + address_space *iospace; int icount; UINT8 r[64]; /* scratchpad RAM */ int irq_request; diff --git a/src/emu/cpu/g65816/g65816cm.h b/src/emu/cpu/g65816/g65816cm.h index 1cd7a9a5159..763e7576fe9 100644 --- a/src/emu/cpu/g65816/g65816cm.h +++ b/src/emu/cpu/g65816/g65816cm.h @@ -95,7 +95,7 @@ struct _g65816i_cpu_struct uint irq_delay; /* delay 1 instruction before checking irq */ device_irq_callback int_ack; /* Interrupt Acknowledge */ legacy_cpu_device *device; - const address_space *program; + address_space *program; read8_space_func read_vector; /* Read vector override */ uint stopped; /* Sets how the CPU is stopped */ void (*const *opcodes)(g65816i_cpu_struct *cpustate); diff --git a/src/emu/cpu/h6280/h6280.h b/src/emu/cpu/h6280/h6280.h index da4c5f7e2ce..8fab3e89a84 100644 --- a/src/emu/cpu/h6280/h6280.h +++ b/src/emu/cpu/h6280/h6280.h @@ -62,8 +62,8 @@ typedef struct UINT8 irq_pending; device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; #if LAZY_FLAGS INT32 NZ; /* last value (lazy N and Z flag) */ diff --git a/src/emu/cpu/h83002/h8priv.h b/src/emu/cpu/h83002/h8priv.h index 381d2838633..9003ae8485a 100644 --- a/src/emu/cpu/h83002/h8priv.h +++ b/src/emu/cpu/h83002/h8priv.h @@ -28,8 +28,8 @@ struct _h83xx_state device_irq_callback irq_cb; legacy_cpu_device *device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; // onboard peripherals stuff UINT8 per_regs[256]; diff --git a/src/emu/cpu/hd6309/hd6309.c b/src/emu/cpu/hd6309/hd6309.c index 8ad722d8147..d567edbc043 100644 --- a/src/emu/cpu/hd6309/hd6309.c +++ b/src/emu/cpu/hd6309/hd6309.c @@ -137,7 +137,7 @@ struct _m68_state_t PAIR ea; /* effective address */ /* Memory spaces */ - const address_space *program; + address_space *program; UINT8 int_state; /* SYNC and CWAI flags */ UINT8 nmi_state; diff --git a/src/emu/cpu/i386/i386priv.h b/src/emu/cpu/i386/i386priv.h index 0ed6749d51a..8045ef1eab7 100644 --- a/src/emu/cpu/i386/i386priv.h +++ b/src/emu/cpu/i386/i386priv.h @@ -228,8 +228,8 @@ struct _i386_state UINT8 irq_state; device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; UINT32 a20_mask; int cpuid_max_input_value_eax; diff --git a/src/emu/cpu/i4004/i4004.c b/src/emu/cpu/i4004/i4004.c index e49e23816bb..c3f015abf15 100644 --- a/src/emu/cpu/i4004/i4004.c +++ b/src/emu/cpu/i4004/i4004.c @@ -34,9 +34,9 @@ struct _i4004_state UINT8 flags; // used for I/O only legacy_cpu_device *device; - const address_space *program; - const address_space *data; - const address_space *io; + address_space *program; + address_space *data; + address_space *io; int icount; int pc_pos; // PC possition in ADDR int addr_mask; diff --git a/src/emu/cpu/i8008/i8008.c b/src/emu/cpu/i8008/i8008.c index 9d82168c958..f173bf83007 100644 --- a/src/emu/cpu/i8008/i8008.c +++ b/src/emu/cpu/i8008/i8008.c @@ -34,8 +34,8 @@ struct _i8008_state UINT8 HALT; UINT8 flags; // temporary I/O only legacy_cpu_device *device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; int icount; int pc_pos; // PC possition in ADDR diff --git a/src/emu/cpu/i8085/i8085.c b/src/emu/cpu/i8085/i8085.c index ce8494f9fbf..b3476e8fe6f 100644 --- a/src/emu/cpu/i8085/i8085.c +++ b/src/emu/cpu/i8085/i8085.c @@ -184,8 +184,8 @@ struct _i8085_state device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; int icount; }; diff --git a/src/emu/cpu/i86/i286.c b/src/emu/cpu/i86/i286.c index 02ea3a75ad7..6fd3aac95be 100644 --- a/src/emu/cpu/i86/i286.c +++ b/src/emu/cpu/i86/i286.c @@ -59,8 +59,8 @@ struct _i80286_state } ldtr, tr; device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; INT32 AuxVal, OverVal, SignVal, ZeroVal, CarryVal, DirVal; /* 0 or non-0 valued flags */ UINT8 ParityVal; UINT8 TF, IF; /* 0 or 1 valued flags */ diff --git a/src/emu/cpu/i86/i86.c b/src/emu/cpu/i86/i86.c index 24973817d48..82af4d61d31 100644 --- a/src/emu/cpu/i86/i86.c +++ b/src/emu/cpu/i86/i86.c @@ -60,8 +60,8 @@ struct _i8086_state memory_interface mem; legacy_cpu_device *device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; int icount; unsigned prefix_base; /* base address of the latest prefix segment */ diff --git a/src/emu/cpu/i86/i86mem.c b/src/emu/cpu/i86/i86mem.c index c1954c9cdda..653fe495164 100644 --- a/src/emu/cpu/i86/i86mem.c +++ b/src/emu/cpu/i86/i86mem.c @@ -19,7 +19,7 @@ static void configure_memory_8bit(i8086_state *cpustate) 16-bit memory accessors *****************************************************************************/ -static UINT16 read_word_16le(const address_space *space, offs_t addr) +static UINT16 read_word_16le(address_space *space, offs_t addr) { if (!(addr & 1)) return memory_read_word_16le(space, addr); @@ -30,7 +30,7 @@ static UINT16 read_word_16le(const address_space *space, offs_t addr) } } -static void write_word_16le(const address_space *space, offs_t addr, UINT16 data) +static void write_word_16le(address_space *space, offs_t addr, UINT16 data) { if (!(addr & 1)) memory_write_word_16le(space, addr, data); diff --git a/src/emu/cpu/i86/i86mem.h b/src/emu/cpu/i86/i86mem.h index 9bccd2a2342..a49797c56a0 100644 --- a/src/emu/cpu/i86/i86mem.h +++ b/src/emu/cpu/i86/i86mem.h @@ -3,8 +3,8 @@ struct _memory_interface { offs_t fetch_xor; - UINT8 (*rbyte)(const address_space *, offs_t); - UINT16 (*rword)(const address_space *, offs_t); - void (*wbyte)(const address_space *, offs_t, UINT8); - void (*wword)(const address_space *, offs_t, UINT16); + UINT8 (*rbyte)(address_space *, offs_t); + UINT16 (*rword)(address_space *, offs_t); + void (*wbyte)(address_space *, offs_t, UINT8); + void (*wword)(address_space *, offs_t, UINT16); }; diff --git a/src/emu/cpu/i860/i860.h b/src/emu/cpu/i860/i860.h index 1625a5970c3..aa5692612f6 100644 --- a/src/emu/cpu/i860/i860.h +++ b/src/emu/cpu/i860/i860.h @@ -169,7 +169,7 @@ typedef struct { * MAME-specific stuff. */ legacy_cpu_device *device; - const address_space *program; + address_space *program; UINT32 ppc; int icount; diff --git a/src/emu/cpu/i960/i960.c b/src/emu/cpu/i960/i960.c index 8f921f1f897..9ae1359bb10 100644 --- a/src/emu/cpu/i960/i960.c +++ b/src/emu/cpu/i960/i960.c @@ -35,7 +35,7 @@ struct _i960_state_t { device_irq_callback irq_cb; legacy_cpu_device *device; - const address_space *program; + address_space *program; int icount; }; diff --git a/src/emu/cpu/jaguar/jaguar.c b/src/emu/cpu/jaguar/jaguar.c index d2e0afbbfca..f0f1b981beb 100644 --- a/src/emu/cpu/jaguar/jaguar.c +++ b/src/emu/cpu/jaguar/jaguar.c @@ -101,7 +101,7 @@ struct _jaguar_state device_irq_callback irq_callback; jaguar_int_func cpu_interrupt; legacy_cpu_device *device; - const address_space *program; + address_space *program; }; diff --git a/src/emu/cpu/konami/konami.c b/src/emu/cpu/konami/konami.c index 43412a73422..143c8f3b984 100644 --- a/src/emu/cpu/konami/konami.c +++ b/src/emu/cpu/konami/konami.c @@ -62,7 +62,7 @@ struct _konami_state UINT8 nmi_pending; int icount; legacy_cpu_device *device; - const address_space *program; + address_space *program; konami_set_lines_func setlines_callback; }; diff --git a/src/emu/cpu/lh5801/lh5801.c b/src/emu/cpu/lh5801/lh5801.c index c30b60e336c..3cd4cf4af8c 100644 --- a/src/emu/cpu/lh5801/lh5801.c +++ b/src/emu/cpu/lh5801/lh5801.c @@ -51,7 +51,7 @@ struct _lh5810_state { const lh5801_cpu_core *config; legacy_cpu_device *device; - const address_space *program; + address_space *program; PAIR s, p, u, x, y; int tm; //9 bit diff --git a/src/emu/cpu/lr35902/lr35902.c b/src/emu/cpu/lr35902/lr35902.c index 699e89e6ffc..05958475063 100644 --- a/src/emu/cpu/lr35902/lr35902.c +++ b/src/emu/cpu/lr35902/lr35902.c @@ -66,7 +66,7 @@ typedef struct { int ei_delay; device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; + address_space *program; int icount; /* Timer stuff */ lr35902_timer_fired_func timer_fired_func; diff --git a/src/emu/cpu/m37710/m37710cm.h b/src/emu/cpu/m37710/m37710cm.h index 5fedde511b0..0c10bffc795 100644 --- a/src/emu/cpu/m37710/m37710cm.h +++ b/src/emu/cpu/m37710/m37710cm.h @@ -110,8 +110,8 @@ struct _m37710i_cpu_struct uint destination; /* temp register */ device_irq_callback int_ack; legacy_cpu_device *device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; uint stopped; /* Sets how the CPU is stopped */ void (*const *opcodes)(m37710i_cpu_struct *cpustate); /* opcodes with no prefix */ void (*const *opcodes42)(m37710i_cpu_struct *cpustate); /* opcodes with 0x42 prefix */ diff --git a/src/emu/cpu/m6502/m4510.c b/src/emu/cpu/m6502/m4510.c index e3d7bfca3d4..2a8503600a8 100644 --- a/src/emu/cpu/m6502/m4510.c +++ b/src/emu/cpu/m6502/m4510.c @@ -144,7 +144,7 @@ struct _m4510_Regs { device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *space; + address_space *space; int icount; read8_space_func rdmem_id; /* readmem callback for indexed instructions */ @@ -182,12 +182,12 @@ INLINE int m4510_cpu_readop_arg(m4510_Regs *cpustate) #define M4510 #include "t65ce02.c" -static UINT8 default_rdmem_id(const address_space *space, offs_t address) +static UINT8 default_rdmem_id(address_space *space, offs_t address) { m4510_Regs *cpustate = get_safe_token(space->cpu); return memory_read_byte_8le(space, M4510_MEM(address)); } -static void default_wrmem_id(const address_space *space, offs_t address, UINT8 data) +static void default_wrmem_id(address_space *space, offs_t address, UINT8 data) { m4510_Regs *cpustate = get_safe_token(space->cpu); memory_write_byte_8le(space, M4510_MEM(address), data); diff --git a/src/emu/cpu/m6502/m6502.c b/src/emu/cpu/m6502/m6502.c index b007c21a5b8..8ec0784915f 100644 --- a/src/emu/cpu/m6502/m6502.c +++ b/src/emu/cpu/m6502/m6502.c @@ -70,8 +70,8 @@ struct _m6502_Regs device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *space; - const address_space *io; + address_space *space; + address_space *io; int int_occured; int icount; @@ -99,8 +99,8 @@ INLINE m6502_Regs *get_safe_token(running_device *device) return (m6502_Regs *)downcast<legacy_cpu_device *>(device)->token(); } -static UINT8 default_rdmem_id(const address_space *space, offs_t offset) { return memory_read_byte_8le(space, offset); } -static void default_wdmem_id(const address_space *space, offs_t offset, UINT8 data) { memory_write_byte_8le(space, offset, data); } +static UINT8 default_rdmem_id(address_space *space, offs_t offset) { return memory_read_byte_8le(space, offset); } +static void default_wdmem_id(address_space *space, offs_t offset, UINT8 data) { memory_write_byte_8le(space, offset, data); } /*************************************************************** * include the opcode macros, functions and tables diff --git a/src/emu/cpu/m6502/m6509.c b/src/emu/cpu/m6502/m6509.c index f0d023217a9..9d989465e45 100644 --- a/src/emu/cpu/m6502/m6509.c +++ b/src/emu/cpu/m6502/m6509.c @@ -79,7 +79,7 @@ struct _m6509_Regs { UINT8 so_state; device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *space; + address_space *space; int icount; @@ -134,8 +134,8 @@ static ADDRESS_MAP_START(m6509_mem, ADDRESS_SPACE_PROGRAM, 8) AM_RANGE(0x00001, 0x00001) AM_MIRROR(0xF0000) AM_READWRITE(m6509_read_00001, m6509_write_00001) ADDRESS_MAP_END -static UINT8 default_rdmem_id(const address_space *space, offs_t address) { return memory_read_byte_8le(space, address); } -static void default_wdmem_id(const address_space *space, offs_t address, UINT8 data) { memory_write_byte_8le(space, address, data); } +static UINT8 default_rdmem_id(address_space *space, offs_t address) { return memory_read_byte_8le(space, address); } +static void default_wdmem_id(address_space *space, offs_t address, UINT8 data) { memory_write_byte_8le(space, address, data); } static CPU_INIT( m6509 ) { diff --git a/src/emu/cpu/m6502/m65ce02.c b/src/emu/cpu/m6502/m65ce02.c index c4d9667e6c1..6f5bfd352fb 100644 --- a/src/emu/cpu/m6502/m65ce02.c +++ b/src/emu/cpu/m6502/m65ce02.c @@ -76,7 +76,7 @@ struct _m65ce02_Regs { int icount; device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *space; + address_space *space; read8_space_func rdmem_id; /* readmem callback for indexed instructions */ write8_space_func wrmem_id; /* writemem callback for indexed instructions */ }; @@ -94,8 +94,8 @@ INLINE m65ce02_Regs *get_safe_token(running_device *device) #include "t65ce02.c" -static UINT8 default_rdmem_id(const address_space *space, offs_t address) { return memory_read_byte_8le(space, address); } -static void default_wdmem_id(const address_space *space, offs_t address, UINT8 data) { memory_write_byte_8le(space, address, data); } +static UINT8 default_rdmem_id(address_space *space, offs_t address) { return memory_read_byte_8le(space, address); } +static void default_wdmem_id(address_space *space, offs_t address, UINT8 data) { memory_write_byte_8le(space, address, data); } static CPU_INIT( m65ce02 ) { diff --git a/src/emu/cpu/m6800/m6800.c b/src/emu/cpu/m6800/m6800.c index ba95cab83dc..1ab28fd172f 100644 --- a/src/emu/cpu/m6800/m6800.c +++ b/src/emu/cpu/m6800/m6800.c @@ -116,9 +116,9 @@ struct _m6800_state legacy_cpu_device *device; /* Memory spaces */ - const address_space *program; - const address_space *data; - const address_space *io; + address_space *program; + address_space *data; + address_space *io; void (* const * insn)(m6800_state *); /* instruction table */ const UINT8 *cycles; /* clock cycle of instruction table */ diff --git a/src/emu/cpu/m68000/m68kcpu.c b/src/emu/cpu/m68000/m68kcpu.c index 96185b4f092..1489a6105be 100644 --- a/src/emu/cpu/m68000/m68kcpu.c +++ b/src/emu/cpu/m68000/m68kcpu.c @@ -944,7 +944,7 @@ void m68k_set_encrypted_opcode_range(running_device *device, offs_t start, offs_ * 8-bit data memory interface ****************************************************************************/ -static UINT16 m68008_read_immediate_16(const address_space *space, offs_t address) +static UINT16 m68008_read_immediate_16(address_space *space, offs_t address) { offs_t addr = address; return (memory_decrypted_read_byte(space, addr) << 8) | (memory_decrypted_read_byte(space, addr + 1)); @@ -967,13 +967,13 @@ static const m68k_memory_interface interface_d8 = * 16-bit data memory interface ****************************************************************************/ -static UINT16 read_immediate_16(const address_space *space, offs_t address) +static UINT16 read_immediate_16(address_space *space, offs_t address) { m68ki_cpu_core *m68k = get_safe_token(space->cpu); return memory_decrypted_read_word(space, (address) ^ m68k->memory.opcode_xor); } -static UINT16 simple_read_immediate_16(const address_space *space, offs_t address) +static UINT16 simple_read_immediate_16(address_space *space, offs_t address) { return memory_decrypted_read_word(space, address); } @@ -996,7 +996,7 @@ static const m68k_memory_interface interface_d16 = ****************************************************************************/ /* potentially misaligned 16-bit reads with a 32-bit data bus (and 24-bit address bus) */ -static UINT16 readword_d32(const address_space *space, offs_t address) +static UINT16 readword_d32(address_space *space, offs_t address) { UINT16 result; @@ -1007,7 +1007,7 @@ static UINT16 readword_d32(const address_space *space, offs_t address) } /* potentially misaligned 16-bit writes with a 32-bit data bus (and 24-bit address bus) */ -static void writeword_d32(const address_space *space, offs_t address, UINT16 data) +static void writeword_d32(address_space *space, offs_t address, UINT16 data) { if (!(address & 1)) { @@ -1019,7 +1019,7 @@ static void writeword_d32(const address_space *space, offs_t address, UINT16 dat } /* potentially misaligned 32-bit reads with a 32-bit data bus (and 24-bit address bus) */ -static UINT32 readlong_d32(const address_space *space, offs_t address) +static UINT32 readlong_d32(address_space *space, offs_t address) { UINT32 result; @@ -1036,7 +1036,7 @@ static UINT32 readlong_d32(const address_space *space, offs_t address) } /* potentially misaligned 32-bit writes with a 32-bit data bus (and 24-bit address bus) */ -static void writelong_d32(const address_space *space, offs_t address, UINT32 data) +static void writelong_d32(address_space *space, offs_t address, UINT32 data) { if (!(address & 3)) { @@ -1068,7 +1068,7 @@ static const m68k_memory_interface interface_d32 = }; /* interface for 32-bit data bus with PMMU (68EC020, 68020) */ -static UINT8 read_byte_32_mmu(const address_space *space, offs_t address) +static UINT8 read_byte_32_mmu(address_space *space, offs_t address) { m68ki_cpu_core *m68k = get_safe_token(space->cpu); @@ -1080,7 +1080,7 @@ static UINT8 read_byte_32_mmu(const address_space *space, offs_t address) return memory_read_byte_32be(space, address); } -static void write_byte_32_mmu(const address_space *space, offs_t address, UINT8 data) +static void write_byte_32_mmu(address_space *space, offs_t address, UINT8 data) { m68ki_cpu_core *m68k = get_safe_token(space->cpu); @@ -1092,7 +1092,7 @@ static void write_byte_32_mmu(const address_space *space, offs_t address, UINT8 memory_write_byte_32be(space, address, data); } -static UINT16 read_immediate_16_mmu(const address_space *space, offs_t address) +static UINT16 read_immediate_16_mmu(address_space *space, offs_t address) { m68ki_cpu_core *m68k = get_safe_token(space->cpu); @@ -1105,7 +1105,7 @@ static UINT16 read_immediate_16_mmu(const address_space *space, offs_t address) } /* potentially misaligned 16-bit reads with a 32-bit data bus (and 24-bit address bus) */ -static UINT16 readword_d32_mmu(const address_space *space, offs_t address) +static UINT16 readword_d32_mmu(address_space *space, offs_t address) { m68ki_cpu_core *m68k = get_safe_token(space->cpu); UINT16 result; @@ -1122,7 +1122,7 @@ static UINT16 readword_d32_mmu(const address_space *space, offs_t address) } /* potentially misaligned 16-bit writes with a 32-bit data bus (and 24-bit address bus) */ -static void writeword_d32_mmu(const address_space *space, offs_t address, UINT16 data) +static void writeword_d32_mmu(address_space *space, offs_t address, UINT16 data) { m68ki_cpu_core *m68k = get_safe_token(space->cpu); @@ -1141,7 +1141,7 @@ static void writeword_d32_mmu(const address_space *space, offs_t address, UINT16 } /* potentially misaligned 32-bit reads with a 32-bit data bus (and 24-bit address bus) */ -static UINT32 readlong_d32_mmu(const address_space *space, offs_t address) +static UINT32 readlong_d32_mmu(address_space *space, offs_t address) { m68ki_cpu_core *m68k = get_safe_token(space->cpu); UINT32 result; @@ -1164,7 +1164,7 @@ static UINT32 readlong_d32_mmu(const address_space *space, offs_t address) } /* potentially misaligned 32-bit writes with a 32-bit data bus (and 24-bit address bus) */ -static void writelong_d32_mmu(const address_space *space, offs_t address, UINT32 data) +static void writelong_d32_mmu(address_space *space, offs_t address, UINT32 data) { m68ki_cpu_core *m68k = get_safe_token(space->cpu); diff --git a/src/emu/cpu/m68000/m68kcpu.h b/src/emu/cpu/m68000/m68kcpu.h index 75ce67c757e..e9fb13b7ad1 100644 --- a/src/emu/cpu/m68000/m68kcpu.h +++ b/src/emu/cpu/m68000/m68kcpu.h @@ -539,13 +539,13 @@ typedef struct _m68k_memory_interface m68k_memory_interface; struct _m68k_memory_interface { offs_t opcode_xor; // Address Calculation - UINT16 (*readimm16)(const address_space *, offs_t); // Immediate read 16 bit - UINT8 (*read8)(const address_space *, offs_t); // Normal read 8 bit - UINT16 (*read16)(const address_space *, offs_t); // Normal read 16 bit - UINT32 (*read32)(const address_space *, offs_t); // Normal read 32 bit - void (*write8)(const address_space *, offs_t, UINT8); // Write 8 bit - void (*write16)(const address_space *, offs_t, UINT16); // Write 16 bit - void (*write32)(const address_space *, offs_t, UINT32); // Write 32 bit + UINT16 (*readimm16)(address_space *, offs_t); // Immediate read 16 bit + UINT8 (*read8)(address_space *, offs_t); // Normal read 8 bit + UINT16 (*read16)(address_space *, offs_t); // Normal read 16 bit + UINT32 (*read32)(address_space *, offs_t); // Normal read 32 bit + void (*write8)(address_space *, offs_t, UINT8); // Write 8 bit + void (*write16)(address_space *, offs_t, UINT16); // Write 16 bit + void (*write32)(address_space *, offs_t, UINT32); // Write 32 bit }; struct _m68ki_cpu_core @@ -628,7 +628,7 @@ struct _m68ki_cpu_core m68k_tas_func tas_instr_callback; /* Called when a TAS instruction is encountered, allows / disallows writeback */ legacy_cpu_device *device; - const address_space *program; + address_space *program; m68k_memory_interface memory; offs_t encrypted_start; offs_t encrypted_end; diff --git a/src/emu/cpu/m6805/m6805.c b/src/emu/cpu/m6805/m6805.c index 7b356f6013a..830c9e6517a 100644 --- a/src/emu/cpu/m6805/m6805.c +++ b/src/emu/cpu/m6805/m6805.c @@ -62,7 +62,7 @@ typedef struct UINT16 pending_interrupts; /* MB */ device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; + address_space *program; int irq_state[9]; /* KW Additional lines for HD63705 */ int nmi_state; } m6805_Regs; diff --git a/src/emu/cpu/m6809/m6809.c b/src/emu/cpu/m6809/m6809.c index 9e64437b562..665efada724 100644 --- a/src/emu/cpu/m6809/m6809.c +++ b/src/emu/cpu/m6809/m6809.c @@ -105,7 +105,7 @@ struct _m68_state_t PAIR ea; /* effective address */ /* Memory spaces */ - const address_space *program; + address_space *program; UINT8 int_state; /* SYNC and CWAI flags */ UINT8 nmi_state; diff --git a/src/emu/cpu/mb86233/mb86233.c b/src/emu/cpu/mb86233/mb86233.c index 9f7328cef42..cd61a1d1ed5 100644 --- a/src/emu/cpu/mb86233/mb86233.c +++ b/src/emu/cpu/mb86233/mb86233.c @@ -51,7 +51,7 @@ struct _mb86233_state UINT32 extport[0x30]; legacy_cpu_device *device; - const address_space *program; + address_space *program; int icount; /* FIFO */ diff --git a/src/emu/cpu/mb88xx/mb88xx.c b/src/emu/cpu/mb88xx/mb88xx.c index 32cb4787468..be904aed01a 100644 --- a/src/emu/cpu/mb88xx/mb88xx.c +++ b/src/emu/cpu/mb88xx/mb88xx.c @@ -75,9 +75,9 @@ struct _mb88_state UINT8 pending_interrupt; device_irq_callback irqcallback; legacy_cpu_device *device; - const address_space *program; - const address_space *data; - const address_space *io; + address_space *program; + address_space *data; + address_space *io; int icount; }; diff --git a/src/emu/cpu/mc68hc11/mc68hc11.c b/src/emu/cpu/mc68hc11/mc68hc11.c index 6b8407e5eb3..b336247771a 100644 --- a/src/emu/cpu/mc68hc11/mc68hc11.c +++ b/src/emu/cpu/mc68hc11/mc68hc11.c @@ -62,8 +62,8 @@ struct _hc11_state device_irq_callback irq_callback; UINT8 irq_state[2]; legacy_cpu_device *device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; int icount; int ram_position; diff --git a/src/emu/cpu/mcs48/mcs48.c b/src/emu/cpu/mcs48/mcs48.c index 94f5e98816c..a735800fb5e 100644 --- a/src/emu/cpu/mcs48/mcs48.c +++ b/src/emu/cpu/mcs48/mcs48.c @@ -154,9 +154,9 @@ struct _mcs48_state int icount; /* Memory spaces */ - const address_space *program; - const address_space *data; - const address_space *io; + address_space *program; + address_space *data; + address_space *io; UINT8 feature_mask; /* processor feature flags */ UINT16 int_rom_size; /* internal rom size */ diff --git a/src/emu/cpu/mcs51/mcs51.c b/src/emu/cpu/mcs51/mcs51.c index 97b14180669..6b54f066aae 100644 --- a/src/emu/cpu/mcs51/mcs51.c +++ b/src/emu/cpu/mcs51/mcs51.c @@ -285,9 +285,9 @@ struct _mcs51_state_t legacy_cpu_device *device; /* Memory spaces */ - const address_space *program; - const address_space *data; - const address_space *io; + address_space *program; + address_space *data; + address_space *io; /* Serial Port TX/RX Callbacks */ // TODO: Move to special port r/w diff --git a/src/emu/cpu/minx/minx.c b/src/emu/cpu/minx/minx.c index 3b89bcbabb4..52e6e4bb7be 100644 --- a/src/emu/cpu/minx/minx.c +++ b/src/emu/cpu/minx/minx.c @@ -85,7 +85,7 @@ typedef struct { UINT8 interrupt_pending; device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; + address_space *program; int icount; } minx_state; diff --git a/src/emu/cpu/mips/mips3com.h b/src/emu/cpu/mips/mips3com.h index d88321f9492..a8b1e06d356 100644 --- a/src/emu/cpu/mips/mips3com.h +++ b/src/emu/cpu/mips/mips3com.h @@ -196,7 +196,7 @@ struct _mips3_state mips3_flavor flavor; device_irq_callback irq_callback; legacy_cpu_device * device; - const address_space *program; + address_space *program; UINT32 system_clock; UINT32 cpu_clock; UINT64 count_zero_time; diff --git a/src/emu/cpu/mips/psx.c b/src/emu/cpu/mips/psx.c index 61277581c14..aa23ecc8f9e 100644 --- a/src/emu/cpu/mips/psx.c +++ b/src/emu/cpu/mips/psx.c @@ -186,7 +186,7 @@ struct _psxcpu_state UINT32 multiplier_operand2; device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; + address_space *program; int bus_attached; UINT32 bad_byte_address_mask; UINT32 bad_half_address_mask; @@ -1300,7 +1300,7 @@ static WRITE32_HANDLER( psx_berr_w ) psxcpu->berr = 1; } -static void mips_update_scratchpad( const address_space *space ) +static void mips_update_scratchpad( address_space *space ) { psxcpu_state *psxcpu = get_safe_token(space->cpu); diff --git a/src/emu/cpu/mips/r3000.c b/src/emu/cpu/mips/r3000.c index 3f15bb8ed77..04dbcffda17 100644 --- a/src/emu/cpu/mips/r3000.c +++ b/src/emu/cpu/mips/r3000.c @@ -139,7 +139,7 @@ struct _r3000_state int hasfpu; device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; + address_space *program; /* endian-dependent load/store */ void (*lwl)(r3000_state *r3000, UINT32 op); @@ -187,19 +187,19 @@ static void lwr_le(r3000_state *r3000, UINT32 op); static void swl_le(r3000_state *r3000, UINT32 op); static void swr_le(r3000_state *r3000, UINT32 op); -static UINT8 readcache_be(const address_space *space, offs_t offset); -static UINT16 readcache_be_word(const address_space *space, offs_t offset); -static UINT32 readcache_be_dword(const address_space *space, offs_t offset); -static void writecache_be(const address_space *space, offs_t offset, UINT8 data); -static void writecache_be_word(const address_space *space, offs_t offset, UINT16 data); -static void writecache_be_dword(const address_space *space, offs_t offset, UINT32 data); +static UINT8 readcache_be(address_space *space, offs_t offset); +static UINT16 readcache_be_word(address_space *space, offs_t offset); +static UINT32 readcache_be_dword(address_space *space, offs_t offset); +static void writecache_be(address_space *space, offs_t offset, UINT8 data); +static void writecache_be_word(address_space *space, offs_t offset, UINT16 data); +static void writecache_be_dword(address_space *space, offs_t offset, UINT32 data); -static UINT8 readcache_le(const address_space *space, offs_t offset); -static UINT16 readcache_le_word(const address_space *space, offs_t offset); -static UINT32 readcache_le_dword(const address_space *space, offs_t offset); -static void writecache_le(const address_space *space, offs_t offset, UINT8 data); -static void writecache_le_word(const address_space *space, offs_t offset, UINT16 data); -static void writecache_le_dword(const address_space *space, offs_t offset, UINT32 data); +static UINT8 readcache_le(address_space *space, offs_t offset); +static UINT16 readcache_le_word(address_space *space, offs_t offset); +static UINT32 readcache_le_dword(address_space *space, offs_t offset); +static void writecache_le(address_space *space, offs_t offset, UINT8 data); +static void writecache_le_word(address_space *space, offs_t offset, UINT16 data); +static void writecache_le_dword(address_space *space, offs_t offset, UINT32 data); @@ -891,84 +891,84 @@ static CPU_EXECUTE( r3000 ) CACHE I/O ***************************************************************************/ -static UINT8 readcache_be(const address_space *space, offs_t offset) +static UINT8 readcache_be(address_space *space, offs_t offset) { r3000_state *r3000 = get_safe_token(space->cpu); offset &= 0x1fffffff; return (offset * 4 < r3000->cache_size) ? r3000->cache[BYTE4_XOR_BE(offset)] : 0xff; } -static UINT16 readcache_be_word(const address_space *space, offs_t offset) +static UINT16 readcache_be_word(address_space *space, offs_t offset) { r3000_state *r3000 = get_safe_token(space->cpu); offset &= 0x1fffffff; return (offset * 4 < r3000->cache_size) ? *(UINT16 *)&r3000->cache[WORD_XOR_BE(offset)] : 0xffff; } -static UINT32 readcache_be_dword(const address_space *space, offs_t offset) +static UINT32 readcache_be_dword(address_space *space, offs_t offset) { r3000_state *r3000 = get_safe_token(space->cpu); offset &= 0x1fffffff; return (offset * 4 < r3000->cache_size) ? *(UINT32 *)&r3000->cache[offset] : 0xffffffff; } -static void writecache_be(const address_space *space, offs_t offset, UINT8 data) +static void writecache_be(address_space *space, offs_t offset, UINT8 data) { r3000_state *r3000 = get_safe_token(space->cpu); offset &= 0x1fffffff; if (offset * 4 < r3000->cache_size) r3000->cache[BYTE4_XOR_BE(offset)] = data; } -static void writecache_be_word(const address_space *space, offs_t offset, UINT16 data) +static void writecache_be_word(address_space *space, offs_t offset, UINT16 data) { r3000_state *r3000 = get_safe_token(space->cpu); offset &= 0x1fffffff; if (offset * 4 < r3000->cache_size) *(UINT16 *)&r3000->cache[WORD_XOR_BE(offset)] = data; } -static void writecache_be_dword(const address_space *space, offs_t offset, UINT32 data) +static void writecache_be_dword(address_space *space, offs_t offset, UINT32 data) { r3000_state *r3000 = get_safe_token(space->cpu); offset &= 0x1fffffff; if (offset * 4 < r3000->cache_size) *(UINT32 *)&r3000->cache[offset] = data; } -static UINT8 readcache_le(const address_space *space, offs_t offset) +static UINT8 readcache_le(address_space *space, offs_t offset) { r3000_state *r3000 = get_safe_token(space->cpu); offset &= 0x1fffffff; return (offset * 4 < r3000->cache_size) ? r3000->cache[BYTE4_XOR_LE(offset)] : 0xff; } -static UINT16 readcache_le_word(const address_space *space, offs_t offset) +static UINT16 readcache_le_word(address_space *space, offs_t offset) { r3000_state *r3000 = get_safe_token(space->cpu); offset &= 0x1fffffff; return (offset * 4 < r3000->cache_size) ? *(UINT16 *)&r3000->cache[WORD_XOR_LE(offset)] : 0xffff; } -static UINT32 readcache_le_dword(const address_space *space, offs_t offset) +static UINT32 readcache_le_dword(address_space *space, offs_t offset) { r3000_state *r3000 = get_safe_token(space->cpu); offset &= 0x1fffffff; return (offset * 4 < r3000->cache_size) ? *(UINT32 *)&r3000->cache[offset] : 0xffffffff; } -static void writecache_le(const address_space *space, offs_t offset, UINT8 data) +static void writecache_le(address_space *space, offs_t offset, UINT8 data) { r3000_state *r3000 = get_safe_token(space->cpu); offset &= 0x1fffffff; if (offset * 4 < r3000->cache_size) r3000->cache[BYTE4_XOR_LE(offset)] = data; } -static void writecache_le_word(const address_space *space, offs_t offset, UINT16 data) +static void writecache_le_word(address_space *space, offs_t offset, UINT16 data) { r3000_state *r3000 = get_safe_token(space->cpu); offset &= 0x1fffffff; if (offset * 4 < r3000->cache_size) *(UINT16 *)&r3000->cache[WORD_XOR_LE(offset)] = data; } -static void writecache_le_dword(const address_space *space, offs_t offset, UINT32 data) +static void writecache_le_dword(address_space *space, offs_t offset, UINT32 data) { r3000_state *r3000 = get_safe_token(space->cpu); offset &= 0x1fffffff; diff --git a/src/emu/cpu/mn10200/mn10200.c b/src/emu/cpu/mn10200/mn10200.c index 35f49b7caf2..0c3a1518c6c 100644 --- a/src/emu/cpu/mn10200/mn10200.c +++ b/src/emu/cpu/mn10200/mn10200.c @@ -65,8 +65,8 @@ struct _mn102_info int cycles; legacy_cpu_device *device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; }; static void mn10200_w(mn102_info *mn102, UINT32 adr, UINT32 data, int type); diff --git a/src/emu/cpu/nec/nec.c b/src/emu/cpu/nec/nec.c index 7ce59c8657f..31a5aba0256 100644 --- a/src/emu/cpu/nec/nec.c +++ b/src/emu/cpu/nec/nec.c @@ -135,10 +135,10 @@ typedef struct { offs_t fetch_xor; - UINT8 (*rbyte)(const address_space *, offs_t); - UINT16 (*rword)(const address_space *, offs_t); - void (*wbyte)(const address_space *, offs_t, UINT8); - void (*wword)(const address_space *, offs_t, UINT16); + UINT8 (*rbyte)(address_space *, offs_t); + UINT16 (*rword)(address_space *, offs_t); + void (*wbyte)(address_space *, offs_t, UINT8); + void (*wword)(address_space *, offs_t, UINT16); } memory_interface; @@ -162,8 +162,8 @@ struct _nec_state_t device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; int icount; memory_interface mem; @@ -1153,7 +1153,7 @@ static void configure_memory_8bit(nec_state_t *nec_state) 16-bit memory accessors *****************************************************************************/ -static UINT16 read_word_16le(const address_space *space, offs_t addr) +static UINT16 read_word_16le(address_space *space, offs_t addr) { if (!(addr & 1)) return memory_read_word_16le(space, addr); @@ -1164,7 +1164,7 @@ static UINT16 read_word_16le(const address_space *space, offs_t addr) } } -static void write_word_16le(const address_space *space, offs_t addr, UINT16 data) +static void write_word_16le(address_space *space, offs_t addr, UINT16 data) { if (!(addr & 1)) memory_write_word_16le(space, addr, data); diff --git a/src/emu/cpu/pdp1/pdp1.c b/src/emu/cpu/pdp1/pdp1.c index 7200d42456a..e3c7a4548db 100644 --- a/src/emu/cpu/pdp1/pdp1.c +++ b/src/emu/cpu/pdp1/pdp1.c @@ -418,7 +418,7 @@ struct _pdp1_state int type_20_sbs; legacy_cpu_device *device; - const address_space *program; + address_space *program; int icount; }; diff --git a/src/emu/cpu/pdp1/tx0.c b/src/emu/cpu/pdp1/tx0.c index e880abceba3..13e4784a6d8 100644 --- a/src/emu/cpu/pdp1/tx0.c +++ b/src/emu/cpu/pdp1/tx0.c @@ -65,7 +65,7 @@ struct _tx0_state int icount; legacy_cpu_device *device; - const address_space *program; + address_space *program; }; INLINE tx0_state *get_safe_token(running_device *device) diff --git a/src/emu/cpu/pic16c5x/pic16c5x.c b/src/emu/cpu/pic16c5x/pic16c5x.c index 9f21b9fdad2..3ebe8fa81be 100644 --- a/src/emu/cpu/pic16c5x/pic16c5x.c +++ b/src/emu/cpu/pic16c5x/pic16c5x.c @@ -98,9 +98,9 @@ struct _pic16c5x_state legacy_cpu_device *device; - const address_space *program; - const address_space *data; - const address_space *io; + address_space *program; + address_space *data; + address_space *io; }; INLINE pic16c5x_state *get_safe_token(running_device *device) diff --git a/src/emu/cpu/pic16c62x/pic16c62x.c b/src/emu/cpu/pic16c62x/pic16c62x.c index 5cc4d749586..e0d67b3493c 100644 --- a/src/emu/cpu/pic16c62x/pic16c62x.c +++ b/src/emu/cpu/pic16c62x/pic16c62x.c @@ -88,9 +88,9 @@ struct _pic16c62x_state legacy_cpu_device *device; - const address_space *program; - const address_space *data; - const address_space *io; + address_space *program; + address_space *data; + address_space *io; }; INLINE pic16c62x_state *get_safe_token(running_device *device) diff --git a/src/emu/cpu/powerpc/ppc.c b/src/emu/cpu/powerpc/ppc.c index 6f251107dcc..f06b59feb6b 100644 --- a/src/emu/cpu/powerpc/ppc.c +++ b/src/emu/cpu/powerpc/ppc.c @@ -307,7 +307,7 @@ typedef struct { device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; + address_space *program; // STUFF added for the 6xx series UINT32 dec, dec_frac; @@ -330,20 +330,20 @@ typedef struct { /* PowerPC function pointers for memory accesses/exceptions */ jmp_buf exception_jmpbuf; - UINT8 (*read8)(const address_space *space, offs_t address); - UINT16 (*read16)(const address_space *space, offs_t address); - UINT32 (*read32)(const address_space *space, offs_t address); - UINT64 (*read64)(const address_space *space, offs_t address); - void (*write8)(const address_space *space, offs_t address, UINT8 data); - void (*write16)(const address_space *space, offs_t address, UINT16 data); - void (*write32)(const address_space *space, offs_t address, UINT32 data); - void (*write64)(const address_space *space, offs_t address, UINT64 data); - UINT16 (*read16_unaligned)(const address_space *space, offs_t address); - UINT32 (*read32_unaligned)(const address_space *space, offs_t address); - UINT64 (*read64_unaligned)(const address_space *space, offs_t address); - void (*write16_unaligned)(const address_space *space, offs_t address, UINT16 data); - void (*write32_unaligned)(const address_space *space, offs_t address, UINT32 data); - void (*write64_unaligned)(const address_space *space, offs_t address, UINT64 data); + UINT8 (*read8)(address_space *space, offs_t address); + UINT16 (*read16)(address_space *space, offs_t address); + UINT32 (*read32)(address_space *space, offs_t address); + UINT64 (*read64)(address_space *space, offs_t address); + void (*write8)(address_space *space, offs_t address, UINT8 data); + void (*write16)(address_space *space, offs_t address, UINT16 data); + void (*write32)(address_space *space, offs_t address, UINT32 data); + void (*write64)(address_space *space, offs_t address, UINT64 data); + UINT16 (*read16_unaligned)(address_space *space, offs_t address); + UINT32 (*read32_unaligned)(address_space *space, offs_t address); + UINT64 (*read64_unaligned)(address_space *space, offs_t address); + void (*write16_unaligned)(address_space *space, offs_t address, UINT16 data); + void (*write32_unaligned)(address_space *space, offs_t address, UINT32 data); + void (*write64_unaligned)(address_space *space, offs_t address, UINT64 data); void (* optable19[1024])(UINT32); void (* optable31[1024])(UINT32); @@ -786,14 +786,14 @@ INLINE UINT32 ppc_get_spr(int spr) return 0; } -static UINT8 ppc_read8_translated(const address_space *space, offs_t address); -static UINT16 ppc_read16_translated(const address_space *space, offs_t address); -static UINT32 ppc_read32_translated(const address_space *space, offs_t address); -static UINT64 ppc_read64_translated(const address_space *space, offs_t address); -static void ppc_write8_translated(const address_space *space, offs_t address, UINT8 data); -static void ppc_write16_translated(const address_space *space, offs_t address, UINT16 data); -static void ppc_write32_translated(const address_space *space, offs_t address, UINT32 data); -static void ppc_write64_translated(const address_space *space, offs_t address, UINT64 data); +static UINT8 ppc_read8_translated(address_space *space, offs_t address); +static UINT16 ppc_read16_translated(address_space *space, offs_t address); +static UINT32 ppc_read32_translated(address_space *space, offs_t address); +static UINT64 ppc_read64_translated(address_space *space, offs_t address); +static void ppc_write8_translated(address_space *space, offs_t address, UINT8 data); +static void ppc_write16_translated(address_space *space, offs_t address, UINT16 data); +static void ppc_write32_translated(address_space *space, offs_t address, UINT32 data); +static void ppc_write64_translated(address_space *space, offs_t address, UINT64 data); INLINE void ppc_set_msr(UINT32 value) { diff --git a/src/emu/cpu/powerpc/ppc403.c b/src/emu/cpu/powerpc/ppc403.c index 30265909351..7fb08c4cf46 100644 --- a/src/emu/cpu/powerpc/ppc403.c +++ b/src/emu/cpu/powerpc/ppc403.c @@ -906,7 +906,7 @@ static void ppc403_dma_exec(int ch) /*********************************************************************************/ -static UINT8 ppc403_read8(const address_space *space, UINT32 a) +static UINT8 ppc403_read8(address_space *space, UINT32 a) { if(a >= 0x40000000 && a <= 0x4000000f) /* Serial Port */ return ppc403_spu_r(a); @@ -916,7 +916,7 @@ static UINT8 ppc403_read8(const address_space *space, UINT32 a) #define ppc403_read16 memory_read_word_32be #define ppc403_read32 memory_read_dword_32be -static void ppc403_write8(const address_space *space, UINT32 a, UINT8 d) +static void ppc403_write8(address_space *space, UINT32 a, UINT8 d) { if( a >= 0x40000000 && a <= 0x4000000f ) /* Serial Port */ { @@ -929,24 +929,24 @@ static void ppc403_write8(const address_space *space, UINT32 a, UINT8 d) #define ppc403_write16 memory_write_word_32be #define ppc403_write32 memory_write_dword_32be -static UINT16 ppc403_read16_unaligned(const address_space *space, UINT32 a) +static UINT16 ppc403_read16_unaligned(address_space *space, UINT32 a) { fatalerror("ppc: Unaligned read16 %08X at %08X", a, ppc.pc); return 0; } -static UINT32 ppc403_read32_unaligned(const address_space *space, UINT32 a) +static UINT32 ppc403_read32_unaligned(address_space *space, UINT32 a) { fatalerror("ppc: Unaligned read32 %08X at %08X", a, ppc.pc); return 0; } -static void ppc403_write16_unaligned(const address_space *space, UINT32 a, UINT16 d) +static void ppc403_write16_unaligned(address_space *space, UINT32 a, UINT16 d) { fatalerror("ppc: Unaligned write16 %08X, %04X at %08X", a, d, ppc.pc); } -static void ppc403_write32_unaligned(const address_space *space, UINT32 a, UINT32 d) +static void ppc403_write32_unaligned(address_space *space, UINT32 a, UINT32 d) { fatalerror("ppc: Unaligned write32 %08X, %08X at %08X", a, d, ppc.pc); } diff --git a/src/emu/cpu/powerpc/ppc_mem.c b/src/emu/cpu/powerpc/ppc_mem.c index 2da52291213..94f5bd3d7f3 100644 --- a/src/emu/cpu/powerpc/ppc_mem.c +++ b/src/emu/cpu/powerpc/ppc_mem.c @@ -66,29 +66,29 @@ INLINE void WRITE64(UINT32 a, UINT64 d) /***********************************************************************/ -static UINT16 ppc_read16_unaligned(const address_space *space, UINT32 a) +static UINT16 ppc_read16_unaligned(address_space *space, UINT32 a) { return ((UINT16)ppc.read8(space, a+0) << 8) | ((UINT16)ppc.read8(space, a+1) << 0); } -static UINT32 ppc_read32_unaligned(const address_space *space, UINT32 a) +static UINT32 ppc_read32_unaligned(address_space *space, UINT32 a) { return ((UINT32)ppc.read8(space, a+0) << 24) | ((UINT32)ppc.read8(space, a+1) << 16) | ((UINT32)ppc.read8(space, a+2) << 8) | ((UINT32)ppc.read8(space, a+3) << 0); } -static UINT64 ppc_read64_unaligned(const address_space *space, UINT32 a) +static UINT64 ppc_read64_unaligned(address_space *space, UINT32 a) { return ((UINT64)READ32(space, a+0) << 32) | (UINT64)(READ32(space, a+4)); } -static void ppc_write16_unaligned(const address_space *space, UINT32 a, UINT16 d) +static void ppc_write16_unaligned(address_space *space, UINT32 a, UINT16 d) { ppc.write8(space, a+0, (UINT8)(d >> 8)); ppc.write8(space, a+1, (UINT8)(d)); } -static void ppc_write32_unaligned(const address_space *space, UINT32 a, UINT32 d) +static void ppc_write32_unaligned(address_space *space, UINT32 a, UINT32 d) { ppc.write8(space, a+0, (UINT8)(d >> 24)); ppc.write8(space, a+1, (UINT8)(d >> 16)); @@ -96,7 +96,7 @@ static void ppc_write32_unaligned(const address_space *space, UINT32 a, UINT32 d ppc.write8(space, a+3, (UINT8)(d >> 0)); } -static void ppc_write64_unaligned(const address_space *space, UINT32 a, UINT64 d) +static void ppc_write64_unaligned(address_space *space, UINT32 a, UINT64 d) { ppc.write32(space, a+0, (UINT32)(d >> 32)); ppc.write32(space, a+4, (UINT32)(d)); @@ -306,56 +306,56 @@ static int ppc_translate_address_cb(int space, offs_t *addr) return success; } -static UINT8 ppc_read8_translated(const address_space *space, offs_t address) +static UINT8 ppc_read8_translated(address_space *space, offs_t address) { ppc_translate_address(&address, PPC_TRANSLATE_DATA | PPC_TRANSLATE_READ); return memory_read_byte_64be(space, address); } -static UINT16 ppc_read16_translated(const address_space *space, offs_t address) +static UINT16 ppc_read16_translated(address_space *space, offs_t address) { ppc_translate_address(&address, PPC_TRANSLATE_DATA | PPC_TRANSLATE_READ); return memory_read_word_64be(space, address); } -static UINT32 ppc_read32_translated(const address_space *space, offs_t address) +static UINT32 ppc_read32_translated(address_space *space, offs_t address) { ppc_translate_address(&address, PPC_TRANSLATE_DATA | PPC_TRANSLATE_READ); return memory_read_dword_64be(space, address); } -static UINT64 ppc_read64_translated(const address_space *space, offs_t address) +static UINT64 ppc_read64_translated(address_space *space, offs_t address) { ppc_translate_address(&address, PPC_TRANSLATE_DATA | PPC_TRANSLATE_READ); return memory_read_qword_64be(space, address); } -static void ppc_write8_translated(const address_space *space, offs_t address, UINT8 data) +static void ppc_write8_translated(address_space *space, offs_t address, UINT8 data) { ppc_translate_address(&address, PPC_TRANSLATE_DATA | PPC_TRANSLATE_WRITE); memory_write_byte_64be(space, address, data); } -static void ppc_write16_translated(const address_space *space, offs_t address, UINT16 data) +static void ppc_write16_translated(address_space *space, offs_t address, UINT16 data) { ppc_translate_address(&address, PPC_TRANSLATE_DATA | PPC_TRANSLATE_WRITE); memory_write_word_64be(space, address, data); } -static void ppc_write32_translated(const address_space *space, offs_t address, UINT32 data) +static void ppc_write32_translated(address_space *space, offs_t address, UINT32 data) { ppc_translate_address(&address, PPC_TRANSLATE_DATA | PPC_TRANSLATE_WRITE); memory_write_dword_64be(space, address, data); } -static void ppc_write64_translated(const address_space *space, offs_t address, UINT64 data) +static void ppc_write64_translated(address_space *space, offs_t address, UINT64 data) { ppc_translate_address(&address, PPC_TRANSLATE_DATA | PPC_TRANSLATE_WRITE); memory_write_qword_64be(space, address, data); } #ifndef PPC_DRC -static UINT32 ppc_readop_translated(const address_space *space, offs_t address) +static UINT32 ppc_readop_translated(address_space *space, offs_t address) { ppc_translate_address(&address, PPC_TRANSLATE_CODE | PPC_TRANSLATE_READ); return memory_read_dword_64be(space, address); diff --git a/src/emu/cpu/powerpc/ppccom.h b/src/emu/cpu/powerpc/ppccom.h index 072cc638db8..cb0f2f9d6b2 100644 --- a/src/emu/cpu/powerpc/ppccom.h +++ b/src/emu/cpu/powerpc/ppccom.h @@ -552,7 +552,7 @@ struct _powerpc_state /* internal stuff */ device_irq_callback irq_callback; legacy_cpu_device * device; - const address_space *program; + address_space *program; offs_t codexor; UINT32 irq_pending; UINT32 system_clock; diff --git a/src/emu/cpu/rsp/rsp.h b/src/emu/cpu/rsp/rsp.h index 404b3919123..e98258c4c1f 100644 --- a/src/emu/cpu/rsp/rsp.h +++ b/src/emu/cpu/rsp/rsp.h @@ -210,7 +210,7 @@ struct _rsp_state device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; + address_space *program; int icount; rspimp_state* impstate; diff --git a/src/emu/cpu/s2650/s2650.c b/src/emu/cpu/s2650/s2650.c index f5a119b4b66..cbb811b8d88 100644 --- a/src/emu/cpu/s2650/s2650.c +++ b/src/emu/cpu/s2650/s2650.c @@ -43,8 +43,8 @@ struct _s2650_regs { int icount; device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; }; INLINE s2650_regs *get_safe_token(running_device *device) diff --git a/src/emu/cpu/saturn/saturn.c b/src/emu/cpu/saturn/saturn.c index 8d442e018ae..594d6c1b8ef 100644 --- a/src/emu/cpu/saturn/saturn.c +++ b/src/emu/cpu/saturn/saturn.c @@ -83,7 +83,7 @@ struct _saturn_state int monitor_in; device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; + address_space *program; int icount; }; diff --git a/src/emu/cpu/sc61860/sc61860.c b/src/emu/cpu/sc61860/sc61860.c index 40aad0faffe..c753d601ef5 100644 --- a/src/emu/cpu/sc61860/sc61860.c +++ b/src/emu/cpu/sc61860/sc61860.c @@ -56,7 +56,7 @@ struct _sc61860_state struct { int t2ms, t512ms; int count;} timer; legacy_cpu_device *device; - const address_space *program; + address_space *program; int icount; }; diff --git a/src/emu/cpu/scmp/scmp.c b/src/emu/cpu/scmp/scmp.c index bfbd9d3c55f..73dd02b46a7 100644 --- a/src/emu/cpu/scmp/scmp.c +++ b/src/emu/cpu/scmp/scmp.c @@ -33,8 +33,8 @@ struct _scmp_state UINT8 SR; legacy_cpu_device *device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; int icount; devcb_resolved_write8 flag_out_func; diff --git a/src/emu/cpu/se3208/se3208.c b/src/emu/cpu/se3208/se3208.c index 07b5659d3b8..f1d0418e258 100644 --- a/src/emu/cpu/se3208/se3208.c +++ b/src/emu/cpu/se3208/se3208.c @@ -24,7 +24,7 @@ struct _se3208_state_t device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; + address_space *program; UINT8 IRQ; UINT8 NMI; @@ -65,7 +65,7 @@ INLINE se3208_state_t *get_safe_token(running_device *device) return (se3208_state_t *)downcast<legacy_cpu_device *>(device)->token(); } -INLINE UINT32 read_dword_unaligned(const address_space *space, UINT32 address) +INLINE UINT32 read_dword_unaligned(address_space *space, UINT32 address) { if (address & 3) return memory_read_byte_32le(space,address) | memory_read_byte_32le(space,address+1)<<8 | memory_read_byte_32le(space,address+2)<<16 | memory_read_byte_32le(space,address+3)<<24; @@ -73,7 +73,7 @@ INLINE UINT32 read_dword_unaligned(const address_space *space, UINT32 address) return memory_read_dword_32le(space,address); } -INLINE UINT16 read_word_unaligned(const address_space *space, UINT32 address) +INLINE UINT16 read_word_unaligned(address_space *space, UINT32 address) { if (address & 1) return memory_read_byte_32le(space,address) | memory_read_byte_32le(space,address+1)<<8; @@ -81,7 +81,7 @@ INLINE UINT16 read_word_unaligned(const address_space *space, UINT32 address) return memory_read_word_32le(space,address); } -INLINE void write_dword_unaligned(const address_space *space, UINT32 address, UINT32 data) +INLINE void write_dword_unaligned(address_space *space, UINT32 address, UINT32 data) { if (address & 3) { @@ -96,7 +96,7 @@ INLINE void write_dword_unaligned(const address_space *space, UINT32 address, UI } } -INLINE void write_word_unaligned(const address_space *space, UINT32 address, UINT16 data) +INLINE void write_word_unaligned(address_space *space, UINT32 address, UINT16 data) { if (address & 1) { diff --git a/src/emu/cpu/sh2/sh2comn.h b/src/emu/cpu/sh2/sh2comn.h index b716f67c185..654a3993a0d 100644 --- a/src/emu/cpu/sh2/sh2comn.h +++ b/src/emu/cpu/sh2/sh2comn.h @@ -116,8 +116,8 @@ typedef struct INT8 irq_line_state[17]; device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; - const address_space *internal; + address_space *program; + address_space *internal; UINT32 *m; INT8 nmi_line_state; diff --git a/src/emu/cpu/sh4/sh4comn.h b/src/emu/cpu/sh4/sh4comn.h index b25f7aaeaf3..fcf375a24f8 100644 --- a/src/emu/cpu/sh4/sh4comn.h +++ b/src/emu/cpu/sh4/sh4comn.h @@ -63,9 +63,9 @@ typedef struct INT8 irq_line_state[17]; device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *internal; - const address_space *program; - const address_space *io; + address_space *internal; + address_space *program; + address_space *io; UINT32 *m; INT8 nmi_line_state; diff --git a/src/emu/cpu/sharc/sharc.c b/src/emu/cpu/sharc/sharc.c index cdab5130735..1255795b255 100644 --- a/src/emu/cpu/sharc/sharc.c +++ b/src/emu/cpu/sharc/sharc.c @@ -126,8 +126,8 @@ struct _SHARC_REGS device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; - const address_space *data; + address_space *program; + address_space *data; void (*opcode_handler)(SHARC_REGS *cpustate); int icount; UINT64 opcode; diff --git a/src/emu/cpu/sm8500/sm8500.c b/src/emu/cpu/sm8500/sm8500.c index cf2e33d9109..e548591b584 100644 --- a/src/emu/cpu/sm8500/sm8500.c +++ b/src/emu/cpu/sm8500/sm8500.c @@ -52,7 +52,7 @@ struct _sm8500_state int icount; device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; + address_space *program; UINT8 internal_ram[0x500]; }; diff --git a/src/emu/cpu/spc700/spc700.c b/src/emu/cpu/spc700/spc700.c index 3ede181ec6e..57056ca2679 100644 --- a/src/emu/cpu/spc700/spc700.c +++ b/src/emu/cpu/spc700/spc700.c @@ -88,7 +88,7 @@ typedef struct uint ir; /* Instruction Register */ device_irq_callback int_ack; legacy_cpu_device *device; - const address_space *program; + address_space *program; uint stopped; /* stopped status */ int ICount; uint source; diff --git a/src/emu/cpu/ssem/ssem.c b/src/emu/cpu/ssem/ssem.c index a83e8e71cfb..13cdd4f9420 100644 --- a/src/emu/cpu/ssem/ssem.c +++ b/src/emu/cpu/ssem/ssem.c @@ -22,7 +22,7 @@ struct _ssem_state UINT32 halt; legacy_cpu_device *device; - const address_space *program; + address_space *program; int icount; }; diff --git a/src/emu/cpu/ssp1601/ssp1601.c b/src/emu/cpu/ssp1601/ssp1601.c index 46cb2b9c3cb..c9b48337b89 100644 --- a/src/emu/cpu/ssp1601/ssp1601.c +++ b/src/emu/cpu/ssp1601/ssp1601.c @@ -53,8 +53,8 @@ struct _ssp1601_state_t int g_cycles; legacy_cpu_device *device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; }; INLINE ssp1601_state_t *get_safe_token(running_device *device) diff --git a/src/emu/cpu/superfx/superfx.c b/src/emu/cpu/superfx/superfx.c index e647f873056..be955de4c04 100644 --- a/src/emu/cpu/superfx/superfx.c +++ b/src/emu/cpu/superfx/superfx.c @@ -62,7 +62,7 @@ struct _superfx_state pixelcache_t pixelcache[2]; legacy_cpu_device *device; - const address_space *program; + address_space *program; int icount; }; diff --git a/src/emu/cpu/t11/t11.c b/src/emu/cpu/t11/t11.c index 7627a6350dc..6609df4c70c 100644 --- a/src/emu/cpu/t11/t11.c +++ b/src/emu/cpu/t11/t11.c @@ -34,7 +34,7 @@ struct _t11_state int icount; device_irq_callback irq_callback; legacy_cpu_device * device; - const address_space *program; + address_space *program; }; diff --git a/src/emu/cpu/tlcs90/tlcs90.c b/src/emu/cpu/tlcs90/tlcs90.c index 90546814cfa..4fd481a8b63 100644 --- a/src/emu/cpu/tlcs90/tlcs90.c +++ b/src/emu/cpu/tlcs90/tlcs90.c @@ -32,8 +32,8 @@ typedef struct UINT16 irq_state, irq_mask; device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; int icount; int extra_cycles; // extra cycles for interrupts UINT8 internal_registers[48]; diff --git a/src/emu/cpu/tlcs900/tlcs900.c b/src/emu/cpu/tlcs900/tlcs900.c index 50464b03037..3aae6e2142e 100644 --- a/src/emu/cpu/tlcs900/tlcs900.c +++ b/src/emu/cpu/tlcs900/tlcs900.c @@ -73,7 +73,7 @@ struct _tlcs900_state int regbank; device_irq_callback irqcallback; legacy_cpu_device *device; - const address_space *program; + address_space *program; }; diff --git a/src/emu/cpu/tms0980/tms0980.c b/src/emu/cpu/tms0980/tms0980.c index ee519c105aa..e198ed3d607 100644 --- a/src/emu/cpu/tms0980/tms0980.c +++ b/src/emu/cpu/tms0980/tms0980.c @@ -268,8 +268,8 @@ struct _tms0980_state UINT8 byte_size; /* 8 or 9 bit bytes */ const UINT32 *decode_table; const tms0980_config *config; - const address_space *program; - const address_space *data; + address_space *program; + address_space *data; }; diff --git a/src/emu/cpu/tms32010/tms32010.c b/src/emu/cpu/tms32010/tms32010.c index 7550187f817..8de6af06011 100644 --- a/src/emu/cpu/tms32010/tms32010.c +++ b/src/emu/cpu/tms32010/tms32010.c @@ -98,9 +98,9 @@ struct _tms32010_state int addr_mask; legacy_cpu_device *device; - const address_space *program; - const address_space *data; - const address_space *io; + address_space *program; + address_space *data; + address_space *io; }; INLINE tms32010_state *get_safe_token(running_device *device) diff --git a/src/emu/cpu/tms32025/tms32025.c b/src/emu/cpu/tms32025/tms32025.c index daccc1b0167..1fdca95e213 100644 --- a/src/emu/cpu/tms32025/tms32025.c +++ b/src/emu/cpu/tms32025/tms32025.c @@ -174,9 +174,9 @@ struct _tms32025_state int waiting_for_serial_frame; legacy_cpu_device *device; - const address_space *program; - const address_space *data; - const address_space *io; + address_space *program; + address_space *data; + address_space *io; UINT16 *pgmmap[0x200]; UINT16 *datamap[0x200]; diff --git a/src/emu/cpu/tms32031/tms32031.c b/src/emu/cpu/tms32031/tms32031.c index 07b86529615..0a142775ca2 100644 --- a/src/emu/cpu/tms32031/tms32031.c +++ b/src/emu/cpu/tms32031/tms32031.c @@ -120,7 +120,7 @@ struct _tms32031_state tms32031_iack_func iack_w; device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; + address_space *program; }; INLINE tms32031_state *get_safe_token(running_device *device) diff --git a/src/emu/cpu/tms32051/tms32051.c b/src/emu/cpu/tms32051/tms32051.c index 8c36bffba2c..2a47b6f8171 100644 --- a/src/emu/cpu/tms32051/tms32051.c +++ b/src/emu/cpu/tms32051/tms32051.c @@ -144,8 +144,8 @@ struct _tms32051_state device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; - const address_space *data; + address_space *program; + address_space *data; int icount; }; diff --git a/src/emu/cpu/tms34010/34010gfx.c b/src/emu/cpu/tms34010/34010gfx.c index cfb74e9b666..f3196a9e463 100644 --- a/src/emu/cpu/tms34010/34010gfx.c +++ b/src/emu/cpu/tms34010/34010gfx.c @@ -201,7 +201,7 @@ static int compute_pixblt_b_cycles(int left_partials, int right_partials, int fu /* Shift register handling */ -static void shiftreg_w(const address_space *space, offs_t offset,UINT16 data) +static void shiftreg_w(address_space *space, offs_t offset,UINT16 data) { tms34010_state *tms = get_safe_token(space->cpu); if (tms->config->from_shiftreg) @@ -210,7 +210,7 @@ static void shiftreg_w(const address_space *space, offs_t offset,UINT16 data) logerror("From ShiftReg function not set. PC = %08X\n", tms->pc); } -static UINT16 shiftreg_r(const address_space *space, offs_t offset) +static UINT16 shiftreg_r(address_space *space, offs_t offset) { tms34010_state *tms = get_safe_token(space->cpu); if (tms->config->to_shiftreg) @@ -220,7 +220,7 @@ static UINT16 shiftreg_r(const address_space *space, offs_t offset) return tms->shiftreg[0]; } -static UINT16 dummy_shiftreg_r(const address_space *space, offs_t offset) +static UINT16 dummy_shiftreg_r(address_space *space, offs_t offset) { tms34010_state *tms = get_safe_token(space->cpu); return tms->shiftreg[0]; @@ -1028,8 +1028,8 @@ static void FUNCTION_NAME(pixblt)(tms34010_state *tms, int src_is_linear, int ds if (!P_FLAG(tms)) { int dx, dy, x, y, /*words,*/ yreverse; - void (*word_write)(const address_space *space,offs_t address,UINT16 data); - UINT16 (*word_read)(const address_space *space,offs_t address); + void (*word_write)(address_space *space,offs_t address,UINT16 data); + UINT16 (*word_read)(address_space *space,offs_t address); UINT32 readwrites = 0; UINT32 saddr, daddr; XY dstxy = { 0 }; @@ -1375,8 +1375,8 @@ static void FUNCTION_NAME(pixblt_r)(tms34010_state *tms, int src_is_linear, int if (!P_FLAG(tms)) { int dx, dy, x, y, words, yreverse; - void (*word_write)(const address_space *space,offs_t address,UINT16 data); - UINT16 (*word_read)(const address_space *space,offs_t address); + void (*word_write)(address_space *space,offs_t address,UINT16 data); + UINT16 (*word_read)(address_space *space,offs_t address); UINT32 saddr, daddr; XY dstxy = { 0 }; @@ -1640,8 +1640,8 @@ static void FUNCTION_NAME(pixblt_b)(tms34010_state *tms, int dst_is_linear) if (!P_FLAG(tms)) { int dx, dy, x, y, words, left_partials, right_partials, full_words; - void (*word_write)(const address_space *space,offs_t address,UINT16 data); - UINT16 (*word_read)(const address_space *space,offs_t address); + void (*word_write)(address_space *space,offs_t address,UINT16 data); + UINT16 (*word_read)(address_space *space,offs_t address); UINT32 saddr, daddr; XY dstxy = { 0 }; @@ -1854,8 +1854,8 @@ static void FUNCTION_NAME(fill)(tms34010_state *tms, int dst_is_linear) if (!P_FLAG(tms)) { int dx, dy, x, y, words, left_partials, right_partials, full_words; - void (*word_write)(const address_space *space,offs_t address,UINT16 data); - UINT16 (*word_read)(const address_space *space,offs_t address); + void (*word_write)(address_space *space,offs_t address,UINT16 data); + UINT16 (*word_read)(address_space *space,offs_t address); UINT32 daddr; XY dstxy = { 0 }; diff --git a/src/emu/cpu/tms34010/tms34010.c b/src/emu/cpu/tms34010/tms34010.c index 42320be3c89..2fb1f202e23 100644 --- a/src/emu/cpu/tms34010/tms34010.c +++ b/src/emu/cpu/tms34010/tms34010.c @@ -63,7 +63,7 @@ struct _tms34010_state UINT8 executing; device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; + address_space *program; const tms34010_config *config; screen_device *screen; emu_timer * scantimer; @@ -1556,7 +1556,7 @@ static STATE_POSTLOAD( tms34010_state_postload ) void tms34010_host_w(running_device *cpu, int reg, int data) { - const address_space *space; + address_space *space; tms34010_state *tms = get_safe_token(cpu); unsigned int addr; diff --git a/src/emu/cpu/tms34010/tms34010.h b/src/emu/cpu/tms34010/tms34010.h index b63bf7715a4..22a975778a2 100644 --- a/src/emu/cpu/tms34010/tms34010.h +++ b/src/emu/cpu/tms34010/tms34010.h @@ -198,8 +198,8 @@ struct _tms34010_config int pixperclock; /* pixels per clock */ void (*scanline_callback)(screen_device &screen, bitmap_t *bitmap, int scanline, const tms34010_display_params *params); void (*output_int)(running_device *device, int state); /* output interrupt callback */ - void (*to_shiftreg)(const address_space *space, offs_t, UINT16 *); /* shift register write */ - void (*from_shiftreg)(const address_space *space, offs_t, UINT16 *); /* shift register read */ + void (*to_shiftreg)(address_space *space, offs_t, UINT16 *); /* shift register write */ + void (*from_shiftreg)(address_space *space, offs_t, UINT16 *); /* shift register read */ }; diff --git a/src/emu/cpu/tms57002/tms57002.c b/src/emu/cpu/tms57002/tms57002.c index 6520828199f..ae1c1a5457e 100644 --- a/src/emu/cpu/tms57002/tms57002.c +++ b/src/emu/cpu/tms57002/tms57002.c @@ -104,7 +104,7 @@ typedef struct { cd cache; - const address_space *program, *data; + address_space *program, *data; int icount; int unsupported_inst_warning; } tms57002_t; diff --git a/src/emu/cpu/tms7000/tms7000.c b/src/emu/cpu/tms7000/tms7000.c index 372d4c15bef..c7c3c40d125 100644 --- a/src/emu/cpu/tms7000/tms7000.c +++ b/src/emu/cpu/tms7000/tms7000.c @@ -74,8 +74,8 @@ struct _tms7000_state UINT8 pf[0x100]; /* Perpherial file */ device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; int icount; int div_by_16_trigger; int cycles_per_INT2; diff --git a/src/emu/cpu/tms9900/99xxcore.h b/src/emu/cpu/tms9900/99xxcore.h index 10ece6b3d0e..9f4684da138 100644 --- a/src/emu/cpu/tms9900/99xxcore.h +++ b/src/emu/cpu/tms9900/99xxcore.h @@ -437,8 +437,8 @@ struct _tms99xx_state retreive the value on IC0-IC3 (non-standard behaviour) */ device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; int icount; UINT8 IDLE; /* nonzero if processor is IDLE - i.e waiting for interrupt while writing diff --git a/src/emu/cpu/unsp/unsp.h b/src/emu/cpu/unsp/unsp.h index 14a394469da..cc2eb1df87e 100644 --- a/src/emu/cpu/unsp/unsp.h +++ b/src/emu/cpu/unsp/unsp.h @@ -24,7 +24,7 @@ struct _unsp_state UINT8 saved_sb; legacy_cpu_device *device; - const address_space *program; + address_space *program; int icount; unspimp_state *impstate; diff --git a/src/emu/cpu/upd7810/upd7810.c b/src/emu/cpu/upd7810/upd7810.c index 6b1f67e203e..5a21c3e3dc5 100644 --- a/src/emu/cpu/upd7810/upd7810.c +++ b/src/emu/cpu/upd7810/upd7810.c @@ -500,8 +500,8 @@ struct _upd7810_state UPD7810_CONFIG config; device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; int icount; }; diff --git a/src/emu/cpu/v30mz/v30mz.c b/src/emu/cpu/v30mz/v30mz.c index f62fe584631..5206efc5bc0 100644 --- a/src/emu/cpu/v30mz/v30mz.c +++ b/src/emu/cpu/v30mz/v30mz.c @@ -85,8 +85,8 @@ struct _v30mz_state device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; int icount; UINT32 prefix_base; /* base address of the latest prefix segment */ diff --git a/src/emu/cpu/v60/v60.c b/src/emu/cpu/v60/v60.c index c96e6747777..21c1d741450 100644 --- a/src/emu/cpu/v60/v60.c +++ b/src/emu/cpu/v60/v60.c @@ -79,8 +79,8 @@ struct _v60_state UINT8 nmi_line; device_irq_callback irq_cb; legacy_cpu_device * device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; UINT32 PPC; int icount; int stall_io; diff --git a/src/emu/cpu/v60/v60mem.c b/src/emu/cpu/v60/v60mem.c index fc88294ba3f..ddff7c2be95 100644 --- a/src/emu/cpu/v60/v60mem.c +++ b/src/emu/cpu/v60/v60mem.c @@ -3,15 +3,15 @@ /****************************************************************/ struct cpu_info { - UINT8 (*mr8) (const address_space *space, offs_t address); - void (*mw8) (const address_space *space, offs_t address, UINT8 data); - UINT16 (*mr16)(const address_space *space, offs_t address); - void (*mw16)(const address_space *space, offs_t address, UINT16 data); - UINT32 (*mr32)(const address_space *space, offs_t address); - void (*mw32)(const address_space *space, offs_t address, UINT32 data); - UINT8 (*or8) (const address_space *space, offs_t address); - UINT16 (*or16)(const address_space *space, offs_t address); - UINT32 (*or32)(const address_space *space, offs_t address); + UINT8 (*mr8) (address_space *space, offs_t address); + void (*mw8) (address_space *space, offs_t address, UINT8 data); + UINT16 (*mr16)(address_space *space, offs_t address); + void (*mw16)(address_space *space, offs_t address, UINT16 data); + UINT32 (*mr32)(address_space *space, offs_t address); + void (*mw32)(address_space *space, offs_t address, UINT32 data); + UINT8 (*or8) (address_space *space, offs_t address); + UINT16 (*or16)(address_space *space, offs_t address); + UINT32 (*or32)(address_space *space, offs_t address); UINT32 start_pc; }; @@ -24,7 +24,7 @@ struct cpu_info { #define MemRead8_16 memory_read_byte_16le #define MemWrite8_16 memory_write_byte_16le -static UINT16 MemRead16_16(const address_space *space, offs_t address) +static UINT16 MemRead16_16(address_space *space, offs_t address) { if (!(address & 1)) return memory_read_word_16le(space, address); @@ -35,7 +35,7 @@ static UINT16 MemRead16_16(const address_space *space, offs_t address) } } -static void MemWrite16_16(const address_space *space, offs_t address, UINT16 data) +static void MemWrite16_16(address_space *space, offs_t address, UINT16 data) { if (!(address & 1)) memory_write_word_16le(space, address, data); @@ -46,7 +46,7 @@ static void MemWrite16_16(const address_space *space, offs_t address, UINT16 dat } } -static UINT32 MemRead32_16(const address_space *space, offs_t address) +static UINT32 MemRead32_16(address_space *space, offs_t address) { if (!(address & 1)) { @@ -61,7 +61,7 @@ static UINT32 MemRead32_16(const address_space *space, offs_t address) } } -static void MemWrite32_16(const address_space *space, offs_t address, UINT32 data) +static void MemWrite32_16(address_space *space, offs_t address, UINT32 data) { if (!(address & 1)) { @@ -81,17 +81,17 @@ static void MemWrite32_16(const address_space *space, offs_t address, UINT32 dat /* Opcode accesses for 16-bit data bus, 24-bit address bus (V60) */ /*****************************************************************/ -static UINT8 OpRead8_16(const address_space *space, offs_t address) +static UINT8 OpRead8_16(address_space *space, offs_t address) { return memory_decrypted_read_byte(space, BYTE_XOR_LE(address)); } -static UINT16 OpRead16_16(const address_space *space, offs_t address) +static UINT16 OpRead16_16(address_space *space, offs_t address) { return memory_decrypted_read_byte(space, BYTE_XOR_LE(address)) | (memory_decrypted_read_byte(space, BYTE_XOR_LE(address + 1)) << 8); } -static UINT32 OpRead32_16(const address_space *space, offs_t address) +static UINT32 OpRead32_16(address_space *space, offs_t address) { return memory_decrypted_read_byte(space, BYTE_XOR_LE(address)) | (memory_decrypted_read_byte(space, BYTE_XOR_LE(address + 1)) << 8) | (memory_decrypted_read_byte(space, BYTE_XOR_LE(address + 2)) << 16) | (memory_decrypted_read_byte(space, BYTE_XOR_LE(address + 3)) << 24); @@ -106,7 +106,7 @@ static UINT32 OpRead32_16(const address_space *space, offs_t address) #define MemRead8_32 memory_read_byte_32le #define MemWrite8_32 memory_write_byte_32le -static UINT16 MemRead16_32(const address_space *space, offs_t address) +static UINT16 MemRead16_32(address_space *space, offs_t address) { if (!(address & 1)) return memory_read_word_32le(space, address); @@ -117,7 +117,7 @@ static UINT16 MemRead16_32(const address_space *space, offs_t address) } } -static void MemWrite16_32(const address_space *space, offs_t address, UINT16 data) +static void MemWrite16_32(address_space *space, offs_t address, UINT16 data) { if (!(address & 1)) memory_write_word_32le(space, address, data); @@ -128,7 +128,7 @@ static void MemWrite16_32(const address_space *space, offs_t address, UINT16 dat } } -static UINT32 MemRead32_32(const address_space *space, offs_t address) +static UINT32 MemRead32_32(address_space *space, offs_t address) { if (!(address & 3)) return memory_read_dword_32le(space, address); @@ -145,7 +145,7 @@ static UINT32 MemRead32_32(const address_space *space, offs_t address) } } -static void MemWrite32_32(const address_space *space, offs_t address, UINT32 data) +static void MemWrite32_32(address_space *space, offs_t address, UINT32 data) { if (!(address & 3)) memory_write_dword_32le(space, address, data); @@ -168,17 +168,17 @@ static void MemWrite32_32(const address_space *space, offs_t address, UINT32 dat /* Opcode accesses for 32-bit data bus, 32-bit address bus (V60) */ /*****************************************************************/ -static UINT8 OpRead8_32(const address_space *space, offs_t address) +static UINT8 OpRead8_32(address_space *space, offs_t address) { return memory_decrypted_read_byte(space, BYTE4_XOR_LE(address)); } -static UINT16 OpRead16_32(const address_space *space, offs_t address) +static UINT16 OpRead16_32(address_space *space, offs_t address) { return memory_decrypted_read_byte(space, BYTE4_XOR_LE(address)) | (memory_decrypted_read_byte(space, BYTE4_XOR_LE(address + 1)) << 8); } -static UINT32 OpRead32_32(const address_space *space, offs_t address) +static UINT32 OpRead32_32(address_space *space, offs_t address) { return memory_decrypted_read_byte(space, BYTE4_XOR_LE(address)) | (memory_decrypted_read_byte(space, BYTE4_XOR_LE(address + 1)) << 8) | (memory_decrypted_read_byte(space, BYTE4_XOR_LE(address + 2)) << 16) | (memory_decrypted_read_byte(space, BYTE4_XOR_LE(address + 3)) << 24); diff --git a/src/emu/cpu/v810/v810.c b/src/emu/cpu/v810/v810.c index 431cdde424c..1658ecb9bed 100644 --- a/src/emu/cpu/v810/v810.c +++ b/src/emu/cpu/v810/v810.c @@ -31,8 +31,8 @@ struct _v810_state UINT8 nmi_line; device_irq_callback irq_cb; legacy_cpu_device *device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; UINT32 PPC; int icount; }; diff --git a/src/emu/cpu/z180/z180.c b/src/emu/cpu/z180/z180.c index f44b27e41f6..14bf9ec1f86 100644 --- a/src/emu/cpu/z180/z180.c +++ b/src/emu/cpu/z180/z180.c @@ -140,8 +140,8 @@ struct _z180_state z80_daisy_chain daisy; device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; - const address_space *iospace; + address_space *program; + address_space *iospace; UINT8 rtemp; UINT32 ioltemp; int icount; diff --git a/src/emu/cpu/z8/z8.c b/src/emu/cpu/z8/z8.c index 25ce548e346..835d5d55269 100644 --- a/src/emu/cpu/z8/z8.c +++ b/src/emu/cpu/z8/z8.c @@ -159,9 +159,9 @@ enum typedef struct _z8_state z8_state; struct _z8_state { - const address_space *program; - const address_space *data; - const address_space *io; + address_space *program; + address_space *data; + address_space *io; /* registers */ UINT16 pc; /* program counter */ diff --git a/src/emu/cpu/z8/z8ops.c b/src/emu/cpu/z8/z8ops.c index 6b656cdb9a8..62e82c81da8 100644 --- a/src/emu/cpu/z8/z8ops.c +++ b/src/emu/cpu/z8/z8ops.c @@ -140,7 +140,7 @@ INSTRUCTION( ld_IR2_R1 ) { mode_IR2_R1(load) } INSTRUCTION( ld_R1_IM ) { mode_R1_IM(load) } INSTRUCTION( ld_IR1_IM ) { mode_IR1_IM(load) } -static void load_from_memory(z8_state *cpustate, const address_space *space) +static void load_from_memory(z8_state *cpustate, address_space *space) { UINT8 operands = fetch(cpustate); UINT8 dst = get_working_register(cpustate, operands >> 4); @@ -152,7 +152,7 @@ static void load_from_memory(z8_state *cpustate, const address_space *space) register_write(cpustate, dst, data); } -static void load_to_memory(z8_state *cpustate, const address_space *space) +static void load_to_memory(z8_state *cpustate, address_space *space) { UINT8 operands = fetch(cpustate); UINT8 src = get_working_register(cpustate, operands >> 4); @@ -164,7 +164,7 @@ static void load_to_memory(z8_state *cpustate, const address_space *space) memory_write_byte(cpustate->program, address, data); } -static void load_from_memory_autoinc(z8_state *cpustate, const address_space *space) +static void load_from_memory_autoinc(z8_state *cpustate, address_space *space) { UINT8 operands = fetch(cpustate); UINT8 dst = get_working_register(cpustate, operands >> 4); @@ -180,7 +180,7 @@ static void load_from_memory_autoinc(z8_state *cpustate, const address_space *sp register_pair_write(cpustate, src, address + 1); } -static void load_to_memory_autoinc(z8_state *cpustate, const address_space *space) +static void load_to_memory_autoinc(z8_state *cpustate, address_space *space) { UINT8 operands = fetch(cpustate); UINT8 src = get_working_register(cpustate, operands >> 4); diff --git a/src/emu/cpu/z80/z80.c b/src/emu/cpu/z80/z80.c index 6932ec59959..c4c79a91626 100644 --- a/src/emu/cpu/z80/z80.c +++ b/src/emu/cpu/z80/z80.c @@ -150,8 +150,8 @@ struct _z80_state UINT32 ea; device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; int icount; z80_daisy_chain daisy; UINT8 rtemp; diff --git a/src/emu/cpu/z8000/z8000.c b/src/emu/cpu/z8000/z8000.c index 17869269b5f..9ccb6e4cd6f 100644 --- a/src/emu/cpu/z8000/z8000.c +++ b/src/emu/cpu/z8000/z8000.c @@ -83,8 +83,8 @@ struct _z8000_state int irq_state[2]; /* IRQ line states (NVI, VI) */ device_irq_callback irq_callback; legacy_cpu_device *device; - const address_space *program; - const address_space *io; + address_space *program; + address_space *io; int icount; }; |