diff options
author | 2016-01-20 21:42:13 +0100 | |
---|---|---|
committer | 2016-01-20 21:42:13 +0100 | |
commit | 4e8e3066f847cc0fa11539f4d9ab8a63f70ca475 (patch) | |
tree | 25d48b50f2b89dd5b9e7dbbfeeb85c534ec6852a /src/devices/cpu/nec | |
parent | 3a8ccb89b426509be06089a19c51ecf55567ed1b (diff) |
reverting:
SHA-1: 1f90ceab075c4869298e963bf0a14a0aac2f1caa
* tags are now strings (nw)
fix start project for custom builds in Visual Studio (nw)
Diffstat (limited to 'src/devices/cpu/nec')
-rw-r--r-- | src/devices/cpu/nec/nec.cpp | 10 | ||||
-rw-r--r-- | src/devices/cpu/nec/nec.h | 10 | ||||
-rw-r--r-- | src/devices/cpu/nec/v25.cpp | 6 | ||||
-rw-r--r-- | src/devices/cpu/nec/v25.h | 6 | ||||
-rw-r--r-- | src/devices/cpu/nec/v53.cpp | 6 | ||||
-rw-r--r-- | src/devices/cpu/nec/v53.h | 6 |
6 files changed, 22 insertions, 22 deletions
diff --git a/src/devices/cpu/nec/nec.cpp b/src/devices/cpu/nec/nec.cpp index f285dc124c5..42ef74df7d5 100644 --- a/src/devices/cpu/nec/nec.cpp +++ b/src/devices/cpu/nec/nec.cpp @@ -122,7 +122,7 @@ const device_type V33A =&device_creator<v33a_device>; -nec_common_device::nec_common_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, bool is_16bit, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type) +nec_common_device::nec_common_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, bool is_16bit, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_LITTLE, is_16bit ? 16 : 8, 20, 0) , m_io_config("io", ENDIANNESS_LITTLE, is_16bit ? 16 : 8, 16, 0) @@ -134,13 +134,13 @@ nec_common_device::nec_common_device(const machine_config &mconfig, device_type } -v20_device::v20_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +v20_device::v20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : nec_common_device(mconfig, V20, "V20", tag, owner, clock, "v20", __FILE__, false, 0, 4, 4, V20_TYPE) { } -v30_device::v30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +v30_device::v30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : nec_common_device(mconfig, V30, "V30", tag, owner, clock, "v30", __FILE__, true, BYTE_XOR_LE(0), 6, 2, V30_TYPE) { } @@ -149,13 +149,13 @@ v30_device::v30_device(const machine_config &mconfig, std::string tag, device_t /* FIXME: Need information about prefetch size and cycles for V33. * complete guess below, nbbatman will not work * properly without. */ -v33_device::v33_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +v33_device::v33_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : nec_common_device(mconfig, V33, "V33", tag, owner, clock, "v33", __FILE__, true, BYTE_XOR_LE(0), 6, 1, V33_TYPE) { } -v33a_device::v33a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +v33a_device::v33a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : nec_common_device(mconfig, V33A, "V33A", tag, owner, clock, "v33A", __FILE__, true, BYTE_XOR_LE(0), 6, 1, V33_TYPE) { } diff --git a/src/devices/cpu/nec/nec.h b/src/devices/cpu/nec/nec.h index ff0021fcc86..c0c1fa82327 100644 --- a/src/devices/cpu/nec/nec.h +++ b/src/devices/cpu/nec/nec.h @@ -23,7 +23,7 @@ class nec_common_device : public cpu_device { public: // construction/destruction - nec_common_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, bool is_16bit, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type); + nec_common_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, bool is_16bit, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type); protected: // device-level overrides @@ -399,27 +399,27 @@ union necbasicregs class v20_device : public nec_common_device { public: - v20_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + v20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class v30_device : public nec_common_device { public: - v30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + v30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class v33_device : public nec_common_device { public: - v33_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + v33_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class v33a_device : public nec_common_device { public: - v33a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + v33a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/cpu/nec/v25.cpp b/src/devices/cpu/nec/v25.cpp index 1680219979a..c5e62446cb0 100644 --- a/src/devices/cpu/nec/v25.cpp +++ b/src/devices/cpu/nec/v25.cpp @@ -49,7 +49,7 @@ const device_type V25 = &device_creator<v25_device>; const device_type V35 = &device_creator<v35_device>; -v25_common_device::v25_common_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, bool is_16bit, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type) +v25_common_device::v25_common_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, bool is_16bit, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__) , m_program_config("program", ENDIANNESS_LITTLE, is_16bit ? 16 : 8, 20, 0) , m_io_config("io", ENDIANNESS_LITTLE, is_16bit ? 16 : 8, 17, 0) @@ -63,13 +63,13 @@ v25_common_device::v25_common_device(const machine_config &mconfig, device_type } -v25_device::v25_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +v25_device::v25_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : v25_common_device(mconfig, V25, "V25", tag, owner, clock, "v25", false, 0, 4, 4, V20_TYPE) { } -v35_device::v35_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +v35_device::v35_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : v25_common_device(mconfig, V35, "V35", tag, owner, clock, "v35", true, BYTE_XOR_LE(0), 6, 2, V30_TYPE) { } diff --git a/src/devices/cpu/nec/v25.h b/src/devices/cpu/nec/v25.h index 4a7129e531a..1cd5ab91012 100644 --- a/src/devices/cpu/nec/v25.h +++ b/src/devices/cpu/nec/v25.h @@ -32,7 +32,7 @@ class v25_common_device : public cpu_device { public: // construction/destruction - v25_common_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, bool is_16bit, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type); + v25_common_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, bool is_16bit, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type); // static configuration helpers static void set_decryption_table(device_t &device, const UINT8 *decryption_table) { downcast<v25_common_device &>(device).m_v25v35_decryptiontable = decryption_table; } @@ -440,14 +440,14 @@ union internalram class v25_device : public v25_common_device { public: - v25_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + v25_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class v35_device : public v25_common_device { public: - v35_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + v35_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/cpu/nec/v53.cpp b/src/devices/cpu/nec/v53.cpp index 2eb90940d99..23e0dec6991 100644 --- a/src/devices/cpu/nec/v53.cpp +++ b/src/devices/cpu/nec/v53.cpp @@ -526,7 +526,7 @@ machine_config_constructor v53_base_device::device_mconfig_additions() const } -v53_base_device::v53_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type) +v53_base_device::v53_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type) : nec_common_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__, true, fetch_xor, prefetch_size, prefetch_cycles, chip_type), m_io_space_config( "io", ENDIANNESS_LITTLE, 16, 16, 0, ADDRESS_MAP_NAME( v53_internal_port_map ) ), m_v53tcu(*this, "pit"), @@ -566,13 +566,13 @@ v53_base_device::v53_base_device(const machine_config &mconfig, device_type type } -v53_device::v53_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +v53_device::v53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : v53_base_device(mconfig, V53, "V53", tag, owner, clock, "v53", BYTE_XOR_LE(0), 6, 1, V33_TYPE) { } -v53a_device::v53a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +v53a_device::v53a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : v53_base_device(mconfig, V53A, "V53A", tag, owner, clock, "v53a", BYTE_XOR_LE(0), 6, 1, V33_TYPE) { } diff --git a/src/devices/cpu/nec/v53.h b/src/devices/cpu/nec/v53.h index 0a922b20c4b..6afdd1c4f39 100644 --- a/src/devices/cpu/nec/v53.h +++ b/src/devices/cpu/nec/v53.h @@ -107,7 +107,7 @@ class v53_base_device : public nec_common_device { public: - v53_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type); + v53_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, offs_t fetch_xor, UINT8 prefetch_size, UINT8 prefetch_cycles, UINT32 chip_type); DECLARE_WRITE8_MEMBER(BSEL_w); DECLARE_WRITE8_MEMBER(BADR_w); @@ -296,13 +296,13 @@ protected: class v53_device : public v53_base_device { public: - v53_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + v53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; class v53a_device : public v53_base_device { public: - v53a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + v53a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; extern const device_type V53; |