diff options
Diffstat (limited to 'src/devices/cpu/nec/nec.cpp')
-rw-r--r-- | src/devices/cpu/nec/nec.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/devices/cpu/nec/nec.cpp b/src/devices/cpu/nec/nec.cpp index 6738a89f467..33c68acbd69 100644 --- a/src/devices/cpu/nec/nec.cpp +++ b/src/devices/cpu/nec/nec.cpp @@ -107,10 +107,10 @@ #include "emu.h" #include "debugger.h" -typedef UINT8 BOOLEAN; -typedef UINT8 BYTE; -typedef UINT16 WORD; -typedef UINT32 DWORD; +typedef uint8_t BOOLEAN; +typedef uint8_t BYTE; +typedef uint16_t WORD; +typedef uint32_t DWORD; #include "nec.h" #include "necpriv.h" @@ -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, 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) +nec_common_device::nec_common_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source, bool is_16bit, offs_t fetch_xor, uint8_t prefetch_size, uint8_t prefetch_cycles, uint32_t 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, const char *tag, device_t *owner, UINT32 clock) +v20_device::v20_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t 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, const char *tag, device_t *owner, UINT32 clock) +v30_device::v30_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : nec_common_device(mconfig, V30, "V30", tag, owner, clock, "v30", __FILE__, true, BYTE_XOR_LE(0), 6, 2, V30_TYPE) { } @@ -149,19 +149,19 @@ v30_device::v30_device(const machine_config &mconfig, const char *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, const char *tag, device_t *owner, UINT32 clock) +v33_device::v33_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t 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, const char *tag, device_t *owner, UINT32 clock) +v33a_device::v33a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : nec_common_device(mconfig, V33A, "V33A", tag, owner, clock, "v33A", __FILE__, true, BYTE_XOR_LE(0), 6, 1, V33_TYPE) { } -offs_t nec_common_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) +offs_t nec_common_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { extern CPU_DISASSEMBLE( nec ); return CPU_DISASSEMBLE_NAME(nec)(this, buffer, pc, oprom, opram, options); @@ -207,15 +207,15 @@ void nec_common_device::do_prefetch(int previous_ICount) } -UINT8 nec_common_device::fetch() +uint8_t nec_common_device::fetch() { prefetch(); return m_direct->read_byte((Sreg(PS)<<4)+m_ip++, m_fetch_xor); } -UINT16 nec_common_device::fetchword() +uint16_t nec_common_device::fetchword() { - UINT16 r = FETCH(); + uint16_t r = FETCH(); r |= (FETCH()<<8); return r; } @@ -225,9 +225,9 @@ UINT16 nec_common_device::fetchword() #include "necea.h" #include "necmodrm.h" -static UINT8 parity_table[256]; +static uint8_t parity_table[256]; -UINT8 nec_common_device::fetchop() +uint8_t nec_common_device::fetchop() { prefetch(); return m_direct->read_byte(( Sreg(PS)<<4)+m_ip++, m_fetch_xor); @@ -269,7 +269,7 @@ void nec_common_device::device_reset() void nec_common_device::nec_interrupt(unsigned int_num, int/*INTSOURCES*/ source) { - UINT32 dest_seg, dest_off; + uint32_t dest_seg, dest_off; i_pushf(); m_TF = m_IF = 0; @@ -304,7 +304,7 @@ void nec_common_device::external_int() { /* the actual vector is retrieved after pushing flags */ /* and clearing the IF */ - nec_interrupt((UINT32)-1, INT_IRQ); + nec_interrupt((uint32_t)-1, INT_IRQ); m_irq_state = CLEAR_LINE; m_pending_irq &= ~INT_IRQ; } @@ -440,7 +440,7 @@ void nec_common_device::device_start() void nec_common_device::state_string_export(const device_state_entry &entry, std::string &str) const { - UINT16 flags = CompressFlags(); + uint16_t flags = CompressFlags(); switch (entry.index()) { |