summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2017-06-28 17:22:36 +0200
committer Olivier Galibert <galibert@pobox.com>2017-07-03 08:03:57 +0200
commitcb1930f6e6a6b460577f01207888eab402469e9f (patch)
tree8ba301ba20e7c13b8643424aa7ce25a1efc99f05 /src/devices/cpu
parent5945fba012ae4758c6e2b18cdecef145699d2da3 (diff)
Rename AS_DECRYPTED_OPCODES to AS_OPCODES [O. Galibert]
Diffstat (limited to 'src/devices/cpu')
-rw-r--r--src/devices/cpu/i86/i186.cpp2
-rw-r--r--src/devices/cpu/i86/i286.cpp2
-rw-r--r--src/devices/cpu/i86/i86.cpp4
-rw-r--r--src/devices/cpu/m6502/deco16.cpp2
-rw-r--r--src/devices/cpu/m6502/m6502.cpp4
-rw-r--r--src/devices/cpu/m6502/n2a03.cpp2
-rw-r--r--src/devices/cpu/m6800/m6800.cpp4
-rw-r--r--src/devices/cpu/m68000/m68kcpu.cpp4
-rw-r--r--src/devices/cpu/m6809/m6809.cpp4
-rw-r--r--src/devices/cpu/mcs40/mcs40.cpp4
-rw-r--r--src/devices/cpu/sh2/sh2.cpp4
-rw-r--r--src/devices/cpu/z180/z180.cpp4
-rw-r--r--src/devices/cpu/z80/z80.cpp4
13 files changed, 22 insertions, 22 deletions
diff --git a/src/devices/cpu/i86/i186.cpp b/src/devices/cpu/i86/i186.cpp
index 0f3edc7a801..e3ece9dbe1c 100644
--- a/src/devices/cpu/i86/i186.cpp
+++ b/src/devices/cpu/i86/i186.cpp
@@ -156,7 +156,7 @@ const address_space_config *i80186_cpu_device::memory_space_config(address_space
{
case AS_PROGRAM: return &m_program_config;
case AS_IO: return &m_io_config;
- case AS_DECRYPTED_OPCODES: return has_configured_map(AS_DECRYPTED_OPCODES) ? &m_opcodes_config : nullptr;
+ case AS_OPCODES: return has_configured_map(AS_OPCODES) ? &m_opcodes_config : nullptr;
default: return nullptr;
}
}
diff --git a/src/devices/cpu/i86/i286.cpp b/src/devices/cpu/i86/i286.cpp
index f871a8c17cd..2a2b8d5d1bb 100644
--- a/src/devices/cpu/i86/i286.cpp
+++ b/src/devices/cpu/i86/i286.cpp
@@ -288,7 +288,7 @@ const address_space_config *i80286_cpu_device::memory_space_config(address_space
{
case AS_PROGRAM: return &m_program_config;
case AS_IO: return &m_io_config;
- case AS_DECRYPTED_OPCODES: return has_configured_map(AS_DECRYPTED_OPCODES) ? &m_opcodes_config : nullptr;
+ case AS_OPCODES: return has_configured_map(AS_OPCODES) ? &m_opcodes_config : nullptr;
default: return nullptr;
}
}
diff --git a/src/devices/cpu/i86/i86.cpp b/src/devices/cpu/i86/i86.cpp
index 2288ab63194..0a11d31352d 100644
--- a/src/devices/cpu/i86/i86.cpp
+++ b/src/devices/cpu/i86/i86.cpp
@@ -118,7 +118,7 @@ const address_space_config *i8086_cpu_device::memory_space_config(address_spacen
{
case AS_PROGRAM: return &m_program_config;
case AS_IO: return &m_io_config;
- case AS_DECRYPTED_OPCODES: return has_configured_map(AS_DECRYPTED_OPCODES) ? &m_opcodes_config : nullptr;
+ case AS_OPCODES: return has_configured_map(AS_OPCODES) ? &m_opcodes_config : nullptr;
default: return nullptr;
}
}
@@ -392,7 +392,7 @@ void i8086_common_cpu_device::state_string_export(const device_state_entry &entr
void i8086_common_cpu_device::device_start()
{
m_program = &space(AS_PROGRAM);
- m_opcodes = has_space(AS_DECRYPTED_OPCODES) ? &space(AS_DECRYPTED_OPCODES) : m_program;
+ m_opcodes = has_space(AS_OPCODES) ? &space(AS_OPCODES) : m_program;
m_direct = &m_program->direct();
m_direct_opcodes = &m_opcodes->direct();
m_io = &space(AS_IO);
diff --git a/src/devices/cpu/m6502/deco16.cpp b/src/devices/cpu/m6502/deco16.cpp
index 66404758eb5..a73f8e12db0 100644
--- a/src/devices/cpu/m6502/deco16.cpp
+++ b/src/devices/cpu/m6502/deco16.cpp
@@ -46,7 +46,7 @@ const address_space_config *deco16_device::memory_space_config(address_spacenum
{
case AS_PROGRAM: return &program_config;
case AS_IO: return &io_config;
- case AS_DECRYPTED_OPCODES: return has_configured_map(AS_DECRYPTED_OPCODES) ? &sprogram_config : nullptr;
+ case AS_OPCODES: return has_configured_map(AS_OPCODES) ? &sprogram_config : nullptr;
default: return nullptr;
}
}
diff --git a/src/devices/cpu/m6502/m6502.cpp b/src/devices/cpu/m6502/m6502.cpp
index ea3f2662fca..a3e889bea2f 100644
--- a/src/devices/cpu/m6502/m6502.cpp
+++ b/src/devices/cpu/m6502/m6502.cpp
@@ -42,7 +42,7 @@ void m6502_device::device_start()
void m6502_device::init()
{
mintf->program = &space(AS_PROGRAM);
- mintf->sprogram = has_space(AS_DECRYPTED_OPCODES) ? &space(AS_DECRYPTED_OPCODES) : mintf->program;
+ mintf->sprogram = has_space(AS_OPCODES) ? &space(AS_OPCODES) : mintf->program;
mintf->direct = &mintf->program->direct();
mintf->sdirect = &mintf->sprogram->direct();
@@ -407,7 +407,7 @@ const address_space_config *m6502_device::memory_space_config(address_spacenum s
switch(spacenum)
{
case AS_PROGRAM: return &program_config;
- case AS_DECRYPTED_OPCODES: return has_configured_map(AS_DECRYPTED_OPCODES) ? &sprogram_config : nullptr;
+ case AS_OPCODES: return has_configured_map(AS_OPCODES) ? &sprogram_config : nullptr;
default: return nullptr;
}
}
diff --git a/src/devices/cpu/m6502/n2a03.cpp b/src/devices/cpu/m6502/n2a03.cpp
index 40cdba9f44a..ff180a8adea 100644
--- a/src/devices/cpu/m6502/n2a03.cpp
+++ b/src/devices/cpu/m6502/n2a03.cpp
@@ -124,7 +124,7 @@ const address_space_config *n2a03_device::memory_space_config(address_spacenum s
switch(spacenum)
{
case AS_PROGRAM: return &m_program_config;
- case AS_DECRYPTED_OPCODES: return has_configured_map(AS_DECRYPTED_OPCODES) ? &sprogram_config : nullptr;
+ case AS_OPCODES: return has_configured_map(AS_OPCODES) ? &sprogram_config : nullptr;
default: return nullptr;
}
}
diff --git a/src/devices/cpu/m6800/m6800.cpp b/src/devices/cpu/m6800/m6800.cpp
index fd7242b0d16..33d34350716 100644
--- a/src/devices/cpu/m6800/m6800.cpp
+++ b/src/devices/cpu/m6800/m6800.cpp
@@ -363,7 +363,7 @@ const address_space_config *m6800_cpu_device::memory_space_config(address_spacen
switch(spacenum)
{
case AS_PROGRAM: return &m_program_config;
- case AS_DECRYPTED_OPCODES: return has_configured_map(AS_DECRYPTED_OPCODES) ? &m_decrypted_opcodes_config : nullptr;
+ case AS_OPCODES: return has_configured_map(AS_OPCODES) ? &m_decrypted_opcodes_config : nullptr;
default: return nullptr;
}
}
@@ -459,7 +459,7 @@ void m6800_cpu_device::device_start()
{
m_program = &space(AS_PROGRAM);
m_direct = &m_program->direct();
- m_decrypted_opcodes = has_space(AS_DECRYPTED_OPCODES) ? &space(AS_DECRYPTED_OPCODES) : m_program;
+ m_decrypted_opcodes = has_space(AS_OPCODES) ? &space(AS_OPCODES) : m_program;
m_decrypted_opcodes_direct = &m_decrypted_opcodes->direct();
m_pc.d = 0;
diff --git a/src/devices/cpu/m68000/m68kcpu.cpp b/src/devices/cpu/m68000/m68kcpu.cpp
index 0de7af11c00..77ed9ff89c7 100644
--- a/src/devices/cpu/m68000/m68kcpu.cpp
+++ b/src/devices/cpu/m68000/m68kcpu.cpp
@@ -920,7 +920,7 @@ void m68000_base_device::init_cpu_common(void)
//this = device;//deviceparam;
program = &space(AS_PROGRAM);
- oprogram = has_space(AS_DECRYPTED_OPCODES) ? &space(AS_DECRYPTED_OPCODES) : program;
+ oprogram = has_space(AS_OPCODES) ? &space(AS_OPCODES) : program;
int_ack_callback = device_irq_acknowledge_delegate(FUNC(m68000_base_device::standard_irq_callback_member), this);
/* disable all MMUs */
@@ -2488,7 +2488,7 @@ const address_space_config *m68000_base_device::memory_space_config(address_spac
switch(spacenum)
{
case AS_PROGRAM: return &m_program_config;
- case AS_DECRYPTED_OPCODES: return has_configured_map(AS_DECRYPTED_OPCODES) ? &m_oprogram_config : nullptr;
+ case AS_OPCODES: return has_configured_map(AS_OPCODES) ? &m_oprogram_config : nullptr;
default: return nullptr;
}
}
diff --git a/src/devices/cpu/m6809/m6809.cpp b/src/devices/cpu/m6809/m6809.cpp
index f1f8e387ca2..b6e66f82a0b 100644
--- a/src/devices/cpu/m6809/m6809.cpp
+++ b/src/devices/cpu/m6809/m6809.cpp
@@ -131,7 +131,7 @@ void m6809_base_device::device_start()
m_mintf = new mi_default;
m_mintf->m_program = &space(AS_PROGRAM);
- m_mintf->m_sprogram = has_space(AS_DECRYPTED_OPCODES) ? &space(AS_DECRYPTED_OPCODES) : m_mintf->m_program;
+ m_mintf->m_sprogram = has_space(AS_OPCODES) ? &space(AS_OPCODES) : m_mintf->m_program;
m_mintf->m_direct = &m_mintf->m_program->direct();
m_mintf->m_sdirect = &m_mintf->m_sprogram->direct();
@@ -297,7 +297,7 @@ const address_space_config *m6809_base_device::memory_space_config(address_space
switch(spacenum)
{
case AS_PROGRAM: return &m_program_config;
- case AS_DECRYPTED_OPCODES: return has_configured_map(AS_DECRYPTED_OPCODES) ? &m_sprogram_config : nullptr;
+ case AS_OPCODES: return has_configured_map(AS_OPCODES) ? &m_sprogram_config : nullptr;
default: return nullptr;
}
}
diff --git a/src/devices/cpu/mcs40/mcs40.cpp b/src/devices/cpu/mcs40/mcs40.cpp
index e3768f4e6a9..4608545b33a 100644
--- a/src/devices/cpu/mcs40/mcs40.cpp
+++ b/src/devices/cpu/mcs40/mcs40.cpp
@@ -133,7 +133,7 @@ void mcs40_cpu_device_base::device_start()
m_program = &space(AS_PROGRAM);
m_data = &space(AS_DATA);
m_io = &space(AS_IO);
- m_opcodes = &space(AS_DECRYPTED_OPCODES);
+ m_opcodes = &space(AS_OPCODES);
m_direct = &m_opcodes->direct();
m_sync_cb.resolve_safe();
@@ -330,7 +330,7 @@ address_space_config const *mcs40_cpu_device_base::memory_space_config(address_s
case AS_PROGRAM: return &m_program_config;
case AS_DATA: return &m_data_config;
case AS_IO: return &m_io_config;
- case AS_DECRYPTED_OPCODES: return &m_opcodes_config;
+ case AS_OPCODES: return &m_opcodes_config;
default: return nullptr;
}
}
diff --git a/src/devices/cpu/sh2/sh2.cpp b/src/devices/cpu/sh2/sh2.cpp
index 1877196a013..ea79565f4cc 100644
--- a/src/devices/cpu/sh2/sh2.cpp
+++ b/src/devices/cpu/sh2/sh2.cpp
@@ -224,7 +224,7 @@ const address_space_config *sh2_device::memory_space_config(address_spacenum spa
switch(spacenum)
{
case AS_PROGRAM: return &m_program_config;
- case AS_DECRYPTED_OPCODES: return has_configured_map(AS_DECRYPTED_OPCODES) ? &m_decrypted_program_config : nullptr;
+ case AS_OPCODES: return has_configured_map(AS_OPCODES) ? &m_decrypted_program_config : nullptr;
default: return nullptr;
}
}
@@ -2347,7 +2347,7 @@ void sh2_device::device_start()
m_ftcsr_read_cb.bind_relative_to(*owner());
m_program = &space(AS_PROGRAM);
- m_decrypted_program = has_space(AS_DECRYPTED_OPCODES) ? &space(AS_DECRYPTED_OPCODES) : &space(AS_PROGRAM);
+ m_decrypted_program = has_space(AS_OPCODES) ? &space(AS_OPCODES) : &space(AS_PROGRAM);
m_direct = &m_decrypted_program->direct();
m_internal = &space(AS_PROGRAM);
diff --git a/src/devices/cpu/z180/z180.cpp b/src/devices/cpu/z180/z180.cpp
index 2c54402ce1e..a80e4850e29 100644
--- a/src/devices/cpu/z180/z180.cpp
+++ b/src/devices/cpu/z180/z180.cpp
@@ -785,7 +785,7 @@ const address_space_config *z180_device::memory_space_config(address_spacenum sp
{
case AS_PROGRAM: return &m_program_config;
case AS_IO: return &m_io_config;
- case AS_DECRYPTED_OPCODES: return has_configured_map(AS_DECRYPTED_OPCODES) ? &m_decrypted_opcodes_config : nullptr;
+ case AS_OPCODES: return has_configured_map(AS_OPCODES) ? &m_decrypted_opcodes_config : nullptr;
default: return nullptr;
}
}
@@ -1998,7 +1998,7 @@ void z180_device::device_start()
m_program = &space(AS_PROGRAM);
m_direct = &m_program->direct();
- m_oprogram = has_space(AS_DECRYPTED_OPCODES) ? &space(AS_DECRYPTED_OPCODES) : m_program;
+ m_oprogram = has_space(AS_OPCODES) ? &space(AS_OPCODES) : m_program;
m_odirect = &m_oprogram->direct();
m_iospace = &space(AS_IO);
diff --git a/src/devices/cpu/z80/z80.cpp b/src/devices/cpu/z80/z80.cpp
index e1a04daf7db..4be4da50e8c 100644
--- a/src/devices/cpu/z80/z80.cpp
+++ b/src/devices/cpu/z80/z80.cpp
@@ -3406,7 +3406,7 @@ void z80_device::device_start()
m_ea = 0;
m_program = &space(AS_PROGRAM);
- m_decrypted_opcodes = has_space(AS_DECRYPTED_OPCODES) ? &space(AS_DECRYPTED_OPCODES) : m_program;
+ m_decrypted_opcodes = has_space(AS_OPCODES) ? &space(AS_OPCODES) : m_program;
m_direct = &m_program->direct();
m_decrypted_opcodes_direct = &m_decrypted_opcodes->direct();
m_io = &space(AS_IO);
@@ -3713,7 +3713,7 @@ const address_space_config *z80_device::memory_space_config(address_spacenum spa
{
case AS_PROGRAM: return &m_program_config;
case AS_IO: return &m_io_config;
- case AS_DECRYPTED_OPCODES: return has_configured_map(AS_DECRYPTED_OPCODES) ? &m_decrypted_opcodes_config : nullptr;
+ case AS_OPCODES: return has_configured_map(AS_OPCODES) ? &m_decrypted_opcodes_config : nullptr;
default: return nullptr;
}
}