summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2008-12-17 05:42:57 +0000
committer R. Belmont <rb6502@users.noreply.github.com>2008-12-17 05:42:57 +0000
commitab8b93e1d1ced7de5fc96148db3a0eb219d29bd0 (patch)
treed41cefe843da3f749da5d086e0d83d0e2b6892f5
parent84afc85712f9db075d1a23af74908b26a189b9e3 (diff)
Improved 64-bit fix.
-rw-r--r--src/emu/cpuexec.h19
1 files changed, 2 insertions, 17 deletions
diff --git a/src/emu/cpuexec.h b/src/emu/cpuexec.h
index 5efbe38de5d..ed50050c2eb 100644
--- a/src/emu/cpuexec.h
+++ b/src/emu/cpuexec.h
@@ -74,17 +74,10 @@ struct _cpu_config
CPU DEVICE CONFIGURATION MACROS
***************************************************************************/
-#ifdef PTR64
#define MDRV_CPU_ADD(_tag, _type, _clock) \
MDRV_DEVICE_ADD(_tag, CPU) \
- MDRV_DEVICE_CONFIG_DATA64(cpu_config, type, CPU_##_type) \
+ MDRV_DEVICE_CONFIG_DATAPTR(cpu_config, type, CPU_##_type) \
MDRV_DEVICE_CONFIG_DATA32(cpu_config, clock, _clock)
-#else
-#define MDRV_CPU_ADD(_tag, _type, _clock) \
- MDRV_DEVICE_ADD(_tag, CPU) \
- MDRV_DEVICE_CONFIG_DATA32(cpu_config, type, CPU_##_type) \
- MDRV_DEVICE_CONFIG_DATA32(cpu_config, clock, _clock)
-#endif
#define MDRV_CPU_REMOVE(_tag) \
MDRV_DEVICE_REMOVE(_tag, CPU)
@@ -92,19 +85,11 @@ struct _cpu_config
#define MDRV_CPU_MODIFY(_tag) \
MDRV_DEVICE_MODIFY(_tag, CPU)
-#ifdef PTR64
-#define MDRV_CPU_REPLACE(_tag, _type, _clock) \
- MDRV_DEVICE_REMOVE(_tag, CPU) \
- MDRV_DEVICE_ADD(_tag, CPU) \
- MDRV_DEVICE_CONFIG_DATA64(cpu_config, type, CPU_##_type) \
- MDRV_DEVICE_CONFIG_DATA32(cpu_config, clock, _clock)
-#else
#define MDRV_CPU_REPLACE(_tag, _type, _clock) \
MDRV_DEVICE_REMOVE(_tag, CPU) \
MDRV_DEVICE_ADD(_tag, CPU) \
- MDRV_DEVICE_CONFIG_DATA32(cpu_config, type, CPU_##_type) \
+ MDRV_DEVICE_CONFIG_DATAPTR(cpu_config, type, CPU_##_type) \
MDRV_DEVICE_CONFIG_DATA32(cpu_config, clock, _clock)
-#endif
#define MDRV_CPU_FLAGS(_flags) \
MDRV_DEVICE_CONFIG_DATA32(cpu_config, flags, _flags)