diff options
Diffstat (limited to 'src/devices/cpu/m68000/m68kcpu.cpp')
-rw-r--r-- | src/devices/cpu/m68000/m68kcpu.cpp | 208 |
1 files changed, 104 insertions, 104 deletions
diff --git a/src/devices/cpu/m68000/m68kcpu.cpp b/src/devices/cpu/m68000/m68kcpu.cpp index b142337ae42..8bacd096a35 100644 --- a/src/devices/cpu/m68000/m68kcpu.cpp +++ b/src/devices/cpu/m68000/m68kcpu.cpp @@ -41,7 +41,7 @@ extern void m68881_mmu_ops(m68000_base_device *m68k); /* ======================================================================== */ /* Used by shift & rotate instructions */ -const UINT8 m68ki_shift_8_table[65] = +const uint8_t m68ki_shift_8_table[65] = { 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, @@ -50,7 +50,7 @@ const UINT8 m68ki_shift_8_table[65] = 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; -const UINT16 m68ki_shift_16_table[65] = +const uint16_t m68ki_shift_16_table[65] = { 0x0000, 0x8000, 0xc000, 0xe000, 0xf000, 0xf800, 0xfc00, 0xfe00, 0xff00, 0xff80, 0xffc0, 0xffe0, 0xfff0, 0xfff8, 0xfffc, 0xfffe, 0xffff, 0xffff, @@ -61,7 +61,7 @@ const UINT16 m68ki_shift_16_table[65] = 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff }; -const UINT32 m68ki_shift_32_table[65] = +const uint32_t m68ki_shift_32_table[65] = { 0x00000000, 0x80000000, 0xc0000000, 0xe0000000, 0xf0000000, 0xf8000000, 0xfc000000, 0xfe000000, 0xff000000, 0xff800000, 0xffc00000, 0xffe00000, @@ -80,7 +80,7 @@ const UINT32 m68ki_shift_32_table[65] = /* Number of clock cycles to use for exception processing. * I used 4 for any vectors that are undocumented for processing times. */ -const UINT8 m68ki_exception_cycle_table[7][256] = +const uint8_t m68ki_exception_cycle_table[7][256] = { { /* 000 */ 40, /* 0: Reset - Initial Stack Pointer */ @@ -595,7 +595,7 @@ const UINT8 m68ki_exception_cycle_table[7][256] = }, }; -const UINT8 m68ki_ea_idx_cycle_table[64] = +const uint8_t m68ki_ea_idx_cycle_table[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* ..01.000 no memory indirect, base nullptr */ @@ -637,9 +637,9 @@ const UINT8 m68ki_ea_idx_cycle_table[64] = static void set_irq_line(m68000_base_device *m68k, int irqline, int state) { - UINT32 old_level = m68k->int_level; - UINT32 vstate = m68k->virq_state; - UINT32 blevel; + uint32_t old_level = m68k->int_level; + uint32_t vstate = m68k->virq_state; + uint32_t blevel; if(state == ASSERT_LINE) vstate |= 1 << irqline; @@ -676,7 +676,7 @@ void m68000_base_device::postload() static void m68k_cause_bus_error(m68000_base_device *m68k) { - UINT32 sr; + uint32_t sr; sr = m68ki_init_exception(m68k); @@ -712,9 +712,9 @@ bool m68000_base_device::memory_translate(address_spacenum space, int intention, if ((space == AS_PROGRAM) && ((pmmu_enabled) || (CPU_TYPE_IS_040_PLUS(cpu_type)))) { // FIXME: mmu_tmp_sr will be overwritten in pmmu_translate_addr_with_fc - UINT16 temp_mmu_tmp_sr = mmu_tmp_sr; + uint16_t temp_mmu_tmp_sr = mmu_tmp_sr; int mode = s_flag ? FUNCTION_CODE_SUPERVISOR_PROGRAM : FUNCTION_CODE_USER_PROGRAM; -// UINT32 va=address; +// uint32_t va=address; if (CPU_TYPE_IS_040_PLUS(cpu_type)) { @@ -822,7 +822,7 @@ inline void m68000_base_device::cpu_execute(void) run_mode = RUN_MODE_NORMAL; // save CPU address registers values at start of instruction int i; - UINT32 tmp_dar[16]; + uint32_t tmp_dar[16]; for (i = 15; i >= 0; i--) { @@ -842,7 +842,7 @@ inline void m68000_base_device::cpu_execute(void) if (mmu_tmp_buserror_occurred) { - UINT32 sr; + uint32_t sr; mmu_tmp_buserror_occurred = 0; @@ -916,7 +916,7 @@ inline void m68000_base_device::cpu_execute(void) void m68000_base_device::init_cpu_common(void) { - static UINT32 emulation_initialized = 0; + static uint32_t emulation_initialized = 0; //this = device;//deviceparam; program = &space(AS_PROGRAM); @@ -1140,7 +1140,7 @@ void m68000_base_device::state_export(const device_state_entry &entry) void m68000_base_device::state_string_export(const device_state_entry &entry, std::string &str) const { - UINT16 sr; + uint16_t sr; switch (entry.index()) { @@ -1217,7 +1217,7 @@ void m68000_base_device::set_instruction_hook(read32_delegate ihook) * 8-bit data memory interface ****************************************************************************/ -UINT16 m68000_base_device::m68008_read_immediate_16(offs_t address) +uint16_t m68000_base_device::m68008_read_immediate_16(offs_t address) { return (m_odirect->read_byte(address) << 8) | (m_odirect->read_byte(address + 1)); } @@ -1244,19 +1244,19 @@ void m68000_base_device::init8(address_space &space, address_space &ospace) * 16-bit data memory interface ****************************************************************************/ -UINT16 m68000_base_device::read_immediate_16(offs_t address) +uint16_t m68000_base_device::read_immediate_16(offs_t address) { return m_odirect->read_word((address), opcode_xor); } -UINT16 m68000_base_device::simple_read_immediate_16(offs_t address) +uint16_t m68000_base_device::simple_read_immediate_16(offs_t address) { return m_odirect->read_word(address); } -void m68000_base_device::m68000_write_byte(offs_t address, UINT8 data) +void m68000_base_device::m68000_write_byte(offs_t address, uint8_t data) { - static const UINT16 masks[] = {0xff00, 0x00ff}; + static const uint16_t masks[] = {0xff00, 0x00ff}; m_space->write_word(address & ~1, data | (data << 8), masks[address & 1]); } @@ -1306,7 +1306,7 @@ void m68000_base_device::init32(address_space &space, address_space &ospace) } /* interface for 32-bit data bus with PMMU (68EC020, 68020) */ -UINT8 m68000_base_device::read_byte_32_mmu(offs_t address) +uint8_t m68000_base_device::read_byte_32_mmu(offs_t address) { if (pmmu_enabled) { @@ -1319,7 +1319,7 @@ UINT8 m68000_base_device::read_byte_32_mmu(offs_t address) return m_space->read_byte(address); } -void m68000_base_device::write_byte_32_mmu(offs_t address, UINT8 data) +void m68000_base_device::write_byte_32_mmu(offs_t address, uint8_t data) { if (pmmu_enabled) { @@ -1332,7 +1332,7 @@ void m68000_base_device::write_byte_32_mmu(offs_t address, UINT8 data) m_space->write_byte(address, data); } -UINT16 m68000_base_device::read_immediate_16_mmu(offs_t address) +uint16_t m68000_base_device::read_immediate_16_mmu(offs_t address) { if (pmmu_enabled) { @@ -1346,19 +1346,19 @@ UINT16 m68000_base_device::read_immediate_16_mmu(offs_t address) } /* potentially misaligned 16-bit reads with a 32-bit data bus (and 24-bit address bus) */ -UINT16 m68000_base_device::readword_d32_mmu(offs_t address) +uint16_t m68000_base_device::readword_d32_mmu(offs_t address) { - UINT16 result; + uint16_t result; if (pmmu_enabled) { - UINT32 address0 = pmmu_translate_addr(this, address); + uint32_t address0 = pmmu_translate_addr(this, address); if (mmu_tmp_buserror_occurred) { return ~0; } else if (WORD_ALIGNED(address)) { return m_space->read_word(address0); } else { - UINT32 address1 = pmmu_translate_addr(this, address + 1); + uint32_t address1 = pmmu_translate_addr(this, address + 1); if (mmu_tmp_buserror_occurred) { return ~0; } else { @@ -1375,18 +1375,18 @@ UINT16 m68000_base_device::readword_d32_mmu(offs_t address) } /* potentially misaligned 16-bit writes with a 32-bit data bus (and 24-bit address bus) */ -void m68000_base_device::writeword_d32_mmu(offs_t address, UINT16 data) +void m68000_base_device::writeword_d32_mmu(offs_t address, uint16_t data) { if (pmmu_enabled) { - UINT32 address0 = pmmu_translate_addr(this, address); + uint32_t address0 = pmmu_translate_addr(this, address); if (mmu_tmp_buserror_occurred) { return; } else if (WORD_ALIGNED(address)) { m_space->write_word(address0, data); return; } else { - UINT32 address1 = pmmu_translate_addr(this, address + 1); + uint32_t address1 = pmmu_translate_addr(this, address + 1); if (mmu_tmp_buserror_occurred) { return; } else { @@ -1407,13 +1407,13 @@ void m68000_base_device::writeword_d32_mmu(offs_t address, UINT16 data) } /* potentially misaligned 32-bit reads with a 32-bit data bus (and 24-bit address bus) */ -UINT32 m68000_base_device::readlong_d32_mmu(offs_t address) +uint32_t m68000_base_device::readlong_d32_mmu(offs_t address) { - UINT32 result; + uint32_t result; if (pmmu_enabled) { - UINT32 address0 = pmmu_translate_addr(this, address); + uint32_t address0 = pmmu_translate_addr(this, address); if (mmu_tmp_buserror_occurred) { return ~0; } else if ((address +3) & 0xfc) { @@ -1422,15 +1422,15 @@ UINT32 m68000_base_device::readlong_d32_mmu(offs_t address) } else if (DWORD_ALIGNED(address)) { // 0 return m_space->read_dword(address0); } else { - UINT32 address2 = pmmu_translate_addr(this, address+2); + uint32_t address2 = pmmu_translate_addr(this, address+2); if (mmu_tmp_buserror_occurred) { return ~0; } else if (WORD_ALIGNED(address)) { // 2 result = m_space->read_word(address0) << 16; return result | m_space->read_word(address2); } else { - UINT32 address1 = pmmu_translate_addr(this, address+1); - UINT32 address3 = pmmu_translate_addr(this, address+3); + uint32_t address1 = pmmu_translate_addr(this, address+1); + uint32_t address3 = pmmu_translate_addr(this, address+3); if (mmu_tmp_buserror_occurred) { return ~0; } else { @@ -1455,11 +1455,11 @@ UINT32 m68000_base_device::readlong_d32_mmu(offs_t address) } /* potentially misaligned 32-bit writes with a 32-bit data bus (and 24-bit address bus) */ -void m68000_base_device::writelong_d32_mmu(offs_t address, UINT32 data) +void m68000_base_device::writelong_d32_mmu(offs_t address, uint32_t data) { if (pmmu_enabled) { - UINT32 address0 = pmmu_translate_addr(this, address); + uint32_t address0 = pmmu_translate_addr(this, address); if (mmu_tmp_buserror_occurred) { return; } else if ((address +3) & 0xfc) { @@ -1469,7 +1469,7 @@ void m68000_base_device::writelong_d32_mmu(offs_t address, UINT32 data) m_space->write_dword(address0, data); return; } else { - UINT32 address2 = pmmu_translate_addr(this, address+2); + uint32_t address2 = pmmu_translate_addr(this, address+2); if (mmu_tmp_buserror_occurred) { return; } else if (WORD_ALIGNED(address)) { // 2 @@ -1477,8 +1477,8 @@ void m68000_base_device::writelong_d32_mmu(offs_t address, UINT32 data) m_space->write_word(address2, data); return; } else { - UINT32 address1 = pmmu_translate_addr(this, address+1); - UINT32 address3 = pmmu_translate_addr(this, address+3); + uint32_t address1 = pmmu_translate_addr(this, address+1); + uint32_t address3 = pmmu_translate_addr(this, address+3); if (mmu_tmp_buserror_occurred) { return; } else { @@ -1526,7 +1526,7 @@ void m68000_base_device::init32mmu(address_space &space, address_space &ospace) /* interface for 32-bit data bus with PMMU (68EC020, 68020) */ -UINT8 m68000_base_device::read_byte_32_hmmu(offs_t address) +uint8_t m68000_base_device::read_byte_32_hmmu(offs_t address) { if (hmmu_enabled) { @@ -1536,7 +1536,7 @@ UINT8 m68000_base_device::read_byte_32_hmmu(offs_t address) return m_space->read_byte(address); } -void m68000_base_device::write_byte_32_hmmu(offs_t address, UINT8 data) +void m68000_base_device::write_byte_32_hmmu(offs_t address, uint8_t data) { if (hmmu_enabled) { @@ -1546,7 +1546,7 @@ void m68000_base_device::write_byte_32_hmmu(offs_t address, UINT8 data) m_space->write_byte(address, data); } -UINT16 m68000_base_device::read_immediate_16_hmmu(offs_t address) +uint16_t m68000_base_device::read_immediate_16_hmmu(offs_t address) { if (hmmu_enabled) { @@ -1557,9 +1557,9 @@ UINT16 m68000_base_device::read_immediate_16_hmmu(offs_t address) } /* potentially misaligned 16-bit reads with a 32-bit data bus (and 24-bit address bus) */ -UINT16 m68000_base_device::readword_d32_hmmu(offs_t address) +uint16_t m68000_base_device::readword_d32_hmmu(offs_t address) { - UINT16 result; + uint16_t result; if (hmmu_enabled) { @@ -1573,7 +1573,7 @@ UINT16 m68000_base_device::readword_d32_hmmu(offs_t address) } /* potentially misaligned 16-bit writes with a 32-bit data bus (and 24-bit address bus) */ -void m68000_base_device::writeword_d32_hmmu(offs_t address, UINT16 data) +void m68000_base_device::writeword_d32_hmmu(offs_t address, uint16_t data) { if (hmmu_enabled) { @@ -1590,9 +1590,9 @@ void m68000_base_device::writeword_d32_hmmu(offs_t address, UINT16 data) } /* potentially misaligned 32-bit reads with a 32-bit data bus (and 24-bit address bus) */ -UINT32 m68000_base_device::readlong_d32_hmmu(offs_t address) +uint32_t m68000_base_device::readlong_d32_hmmu(offs_t address) { - UINT32 result; + uint32_t result; if (hmmu_enabled) { @@ -1612,7 +1612,7 @@ UINT32 m68000_base_device::readlong_d32_hmmu(offs_t address) } /* potentially misaligned 32-bit writes with a 32-bit data bus (and 24-bit address bus) */ -void m68000_base_device::writelong_d32_hmmu(offs_t address, UINT32 data) +void m68000_base_device::writelong_d32_hmmu(offs_t address, uint32_t data) { if (hmmu_enabled) { @@ -1660,7 +1660,7 @@ void m68000_base_device::set_reset_callback(write_line_delegate callback) // fault_addr = address to indicate fault at // rw = 0 for read, 1 for write // fc = 3-bit function code of access (usually you'd just put what m68k_get_fc() returns here) -void m68000_base_device::set_buserror_details(UINT32 fault_addr, UINT8 rw, UINT8 fc) +void m68000_base_device::set_buserror_details(uint32_t fault_addr, uint8_t rw, uint8_t fc) { aerr_address = fault_addr; aerr_write_mode = rw; @@ -1682,7 +1682,7 @@ void m68000_base_device::set_tas_write_callback(write8_delegate callback) tas_write_callback = callback; } -UINT16 m68000_base_device::get_fc() +uint16_t m68000_base_device::get_fc() { return mmu_tmp_fc; } @@ -1693,7 +1693,7 @@ UINT16 m68000_base_device::get_fc() void m68000_base_device::define_state(void) { - UINT32 addrmask = (cpu_type & MASK_24BIT_SPACE) ? 0xffffff : 0xffffffff; + uint32_t addrmask = (cpu_type & MASK_24BIT_SPACE) ? 0xffffff : 0xffffffff; state_add(STATE_GENPC, "PC", pc).mask(addrmask).callimport(); state_add(STATE_GENPCBASE, "CURPC", ppc).mask(addrmask).callimport().noshow(); @@ -2178,33 +2178,33 @@ CPU_DISASSEMBLE( dasm_coldfire ) return m68k_disassemble_raw(buffer, pc, oprom, opram, M68K_CPU_TYPE_COLDFIRE); } -offs_t m68000_base_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) { return CPU_DISASSEMBLE_NAME(dasm_m68000)(this, buffer, pc, oprom, opram, options); } -offs_t m68000_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) { return CPU_DISASSEMBLE_NAME(dasm_m68000)(this, buffer, pc, oprom, opram, options); } -offs_t m68301_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) { return CPU_DISASSEMBLE_NAME(dasm_m68000)(this, buffer, pc, oprom, opram, options); } -offs_t m68008_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) { return CPU_DISASSEMBLE_NAME(dasm_m68008)(this, buffer, pc, oprom, opram, options); } -offs_t m68008plcc_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) { return CPU_DISASSEMBLE_NAME(dasm_m68008)(this, buffer, pc, oprom, opram, options); } -offs_t m68010_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) { return CPU_DISASSEMBLE_NAME(dasm_m68010)(this, buffer, pc, oprom, opram, options); } -offs_t m68ec020_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) { return CPU_DISASSEMBLE_NAME(dasm_m68020)(this, buffer, pc, oprom, opram, options); } -offs_t m68020_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) { return CPU_DISASSEMBLE_NAME(dasm_m68020)(this, buffer, pc, oprom, opram, options); } -offs_t m68020fpu_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) { return CPU_DISASSEMBLE_NAME(dasm_m68020)(this, buffer, pc, oprom, opram, options); } -offs_t m68020pmmu_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) { return CPU_DISASSEMBLE_NAME(dasm_m68020)(this, buffer, pc, oprom, opram, options); } -offs_t m68020hmmu_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) { return CPU_DISASSEMBLE_NAME(dasm_m68020)(this, buffer, pc, oprom, opram, options); } -offs_t m68ec030_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) { return CPU_DISASSEMBLE_NAME(dasm_m68ec030)(this, buffer, pc, oprom, opram, options); } -offs_t m68030_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) { return CPU_DISASSEMBLE_NAME(dasm_m68030)(this, buffer, pc, oprom, opram, options); } -offs_t m68ec040_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) { return CPU_DISASSEMBLE_NAME(dasm_m68ec040)(this, buffer, pc, oprom, opram, options); } -offs_t m68lc040_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) { return CPU_DISASSEMBLE_NAME(dasm_m68lc040)(this, buffer, pc, oprom, opram, options); } -offs_t m68040_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) { return CPU_DISASSEMBLE_NAME(dasm_m68040)(this, buffer, pc, oprom, opram, options); } -offs_t scc68070_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) { return CPU_DISASSEMBLE_NAME(dasm_m68000)(this, buffer, pc, oprom, opram, options); } -offs_t fscpu32_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) { return CPU_DISASSEMBLE_NAME(dasm_fscpu32)(this, buffer, pc, oprom, opram, options); } -offs_t mcf5206e_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) { return CPU_DISASSEMBLE_NAME(dasm_coldfire)(this, buffer, pc, oprom, opram, options); } +offs_t m68000_base_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { return CPU_DISASSEMBLE_NAME(dasm_m68000)(this, buffer, pc, oprom, opram, options); } +offs_t m68000_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { return CPU_DISASSEMBLE_NAME(dasm_m68000)(this, buffer, pc, oprom, opram, options); } +offs_t m68301_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { return CPU_DISASSEMBLE_NAME(dasm_m68000)(this, buffer, pc, oprom, opram, options); } +offs_t m68008_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { return CPU_DISASSEMBLE_NAME(dasm_m68008)(this, buffer, pc, oprom, opram, options); } +offs_t m68008plcc_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { return CPU_DISASSEMBLE_NAME(dasm_m68008)(this, buffer, pc, oprom, opram, options); } +offs_t m68010_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { return CPU_DISASSEMBLE_NAME(dasm_m68010)(this, buffer, pc, oprom, opram, options); } +offs_t m68ec020_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { return CPU_DISASSEMBLE_NAME(dasm_m68020)(this, buffer, pc, oprom, opram, options); } +offs_t m68020_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { return CPU_DISASSEMBLE_NAME(dasm_m68020)(this, buffer, pc, oprom, opram, options); } +offs_t m68020fpu_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { return CPU_DISASSEMBLE_NAME(dasm_m68020)(this, buffer, pc, oprom, opram, options); } +offs_t m68020pmmu_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { return CPU_DISASSEMBLE_NAME(dasm_m68020)(this, buffer, pc, oprom, opram, options); } +offs_t m68020hmmu_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { return CPU_DISASSEMBLE_NAME(dasm_m68020)(this, buffer, pc, oprom, opram, options); } +offs_t m68ec030_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { return CPU_DISASSEMBLE_NAME(dasm_m68ec030)(this, buffer, pc, oprom, opram, options); } +offs_t m68030_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { return CPU_DISASSEMBLE_NAME(dasm_m68030)(this, buffer, pc, oprom, opram, options); } +offs_t m68ec040_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { return CPU_DISASSEMBLE_NAME(dasm_m68ec040)(this, buffer, pc, oprom, opram, options); } +offs_t m68lc040_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { return CPU_DISASSEMBLE_NAME(dasm_m68lc040)(this, buffer, pc, oprom, opram, options); } +offs_t m68040_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { return CPU_DISASSEMBLE_NAME(dasm_m68040)(this, buffer, pc, oprom, opram, options); } +offs_t scc68070_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { return CPU_DISASSEMBLE_NAME(dasm_m68000)(this, buffer, pc, oprom, opram, options); } +offs_t fscpu32_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { return CPU_DISASSEMBLE_NAME(dasm_fscpu32)(this, buffer, pc, oprom, opram, options); } +offs_t mcf5206e_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { return CPU_DISASSEMBLE_NAME(dasm_coldfire)(this, buffer, pc, oprom, opram, options); } /* Service an interrupt request and start exception processing */ -void m68000_base_device::m68ki_exception_interrupt(m68000_base_device *m68k, UINT32 int_level) +void m68000_base_device::m68ki_exception_interrupt(m68000_base_device *m68k, uint32_t int_level) { - UINT32 vector; - UINT32 sr; - UINT32 new_pc; + uint32_t vector; + uint32_t sr; + uint32_t new_pc; if(CPU_TYPE_IS_000(cpu_type)) { @@ -2267,7 +2267,7 @@ const device_type M68K = &device_creator<m68000_base_device>; // h6280_device - constructor //------------------------------------------------- -m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : cpu_device(mconfig, M68K, "M68K", tag, owner, clock, "m68k", __FILE__), m_program_config("program", ENDIANNESS_BIG, 16, 24), m_oprogram_config("decrypted_opcodes", ENDIANNESS_BIG, 16, 24) @@ -2278,8 +2278,8 @@ m68000_base_device::m68000_base_device(const machine_config &mconfig, const char -m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, UINT32 clock, - const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source) +m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, uint32_t clock, + const device_type type, uint32_t prg_data_width, uint32_t prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source), m_program_config("program", ENDIANNESS_BIG, prg_data_width, prg_address_bits, 0, internal_map), m_oprogram_config("decrypted_opcodes", ENDIANNESS_BIG, prg_data_width, prg_address_bits, 0, internal_map) @@ -2288,8 +2288,8 @@ m68000_base_device::m68000_base_device(const machine_config &mconfig, const char } -m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, UINT32 clock, - const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, const char *shortname, const char *source) +m68000_base_device::m68000_base_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, uint32_t clock, + const device_type type, uint32_t prg_data_width, uint32_t prg_address_bits, const char *shortname, const char *source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source), m_program_config("program", ENDIANNESS_BIG, prg_data_width, prg_address_bits), m_oprogram_config("decrypted_opcodes", ENDIANNESS_BIG, prg_data_width, prg_address_bits) @@ -2504,12 +2504,12 @@ const device_type SCC68070 = &device_creator<scc68070_device>; const device_type FSCPU32 = &device_creator<fscpu32_device>; const device_type MCF5206E = &device_creator<mcf5206e_device>; -m68000_device::m68000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +m68000_device::m68000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m68000_base_device(mconfig, "M68000", tag, owner, clock, M68000, 16,24, "m68000", __FILE__) { } -m68000_device::m68000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +m68000_device::m68000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) : m68000_base_device(mconfig, "M68000", tag, owner, clock, M68000, 16,24, shortname, source) { } @@ -2519,8 +2519,8 @@ void m68000_device::device_start() init_cpu_m68000(); } -m68000_device::m68000_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, UINT32 clock, - const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source) +m68000_device::m68000_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, uint32_t clock, + const device_type type, uint32_t prg_data_width, uint32_t prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source) : m68000_base_device(mconfig, name, tag, owner, clock, type, prg_data_width, prg_address_bits, internal_map, shortname, source) { } @@ -2529,7 +2529,7 @@ m68000_device::m68000_device(const machine_config &mconfig, const char *name, co -m68301_device::m68301_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +m68301_device::m68301_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m68000_base_device(mconfig, "M68301", tag, owner, clock, M68301, 16,24, "m68301", __FILE__) { } @@ -2547,7 +2547,7 @@ void m68301_device::device_start() /* m68008_device */ -m68008_device::m68008_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +m68008_device::m68008_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m68000_base_device(mconfig, "M68008", tag, owner, clock, M68008, 8,20, "m68008", __FILE__) { } @@ -2558,7 +2558,7 @@ void m68008_device::device_start() } -m68008plcc_device::m68008plcc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +m68008plcc_device::m68008plcc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m68000_base_device(mconfig, "M68008PLCC", tag, owner, clock, M68008, 8,22, "m68008plcc", __FILE__) { } @@ -2570,7 +2570,7 @@ void m68008plcc_device::device_start() -m68010_device::m68010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +m68010_device::m68010_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m68000_base_device(mconfig, "M68010", tag, owner, clock, M68010, 16,24, "m68010", __FILE__) { } @@ -2582,7 +2582,7 @@ void m68010_device::device_start() -m68020_device::m68020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +m68020_device::m68020_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m68000_base_device(mconfig, "M68020", tag, owner, clock, M68020, 32,32, "m68020", __FILE__) { } @@ -2593,7 +2593,7 @@ void m68020_device::device_start() } -m68020fpu_device::m68020fpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +m68020fpu_device::m68020fpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m68000_base_device(mconfig, "M68020FPU", tag, owner, clock, M68020, 32,32, "m68020fpu", __FILE__) { } @@ -2604,7 +2604,7 @@ void m68020fpu_device::device_start() } // 68020 with 68851 PMMU -m68020pmmu_device::m68020pmmu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +m68020pmmu_device::m68020pmmu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m68000_base_device(mconfig, "M68020PMMU", tag, owner, clock, M68020PMMU, 32,32, "m68020pmmu", __FILE__) { } @@ -2629,7 +2629,7 @@ bool m68020hmmu_device::memory_translate(address_spacenum space, int intention, // 68020 with Apple HMMU & 68881 FPU // case CPUINFO_FCT_TRANSLATE: info->translate = CPU_TRANSLATE_NAME(m68khmmu); break; -m68020hmmu_device::m68020hmmu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +m68020hmmu_device::m68020hmmu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m68000_base_device(mconfig, "M68020HMMU", tag, owner, clock, M68020HMMU, 32,32, "m68020hmmu", __FILE__) { } @@ -2640,7 +2640,7 @@ void m68020hmmu_device::device_start() } -m68ec020_device::m68ec020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +m68ec020_device::m68ec020_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m68000_base_device(mconfig, "M68EC020", tag, owner, clock, M68EC020, 32,24, "m68ec020", __FILE__) { } @@ -2650,7 +2650,7 @@ void m68ec020_device::device_start() init_cpu_m68ec020(); } -m68030_device::m68030_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +m68030_device::m68030_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m68000_base_device(mconfig, "M68030", tag, owner, clock, M68030, 32,32, "m68030", __FILE__) { } @@ -2660,7 +2660,7 @@ void m68030_device::device_start() init_cpu_m68030(); } -m68ec030_device::m68ec030_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +m68ec030_device::m68ec030_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m68000_base_device(mconfig, "M68EC030", tag, owner, clock, M68EC030, 32,32, "m68ec030", __FILE__) { } @@ -2670,7 +2670,7 @@ void m68ec030_device::device_start() init_cpu_m68ec030(); } -m68040_device::m68040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +m68040_device::m68040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m68000_base_device(mconfig, "M68040", tag, owner, clock, M68040, 32,32, "m68040", __FILE__) { } @@ -2683,7 +2683,7 @@ void m68040_device::device_start() -m68ec040_device::m68ec040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +m68ec040_device::m68ec040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m68000_base_device(mconfig, "M68EC040", tag, owner, clock, M68EC040, 32,32, "m68ec040", __FILE__) { } @@ -2695,7 +2695,7 @@ void m68ec040_device::device_start() -m68lc040_device::m68lc040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +m68lc040_device::m68lc040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m68000_base_device(mconfig, "M68LC040", tag, owner, clock, M68LC040, 32,32, "m68lc040", __FILE__) { } @@ -2706,7 +2706,7 @@ void m68lc040_device::device_start() } -scc68070_device::scc68070_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +scc68070_device::scc68070_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m68000_base_device(mconfig, "SCC68070", tag, owner, clock, SCC68070, 16,32, "scc68070", __FILE__) { } @@ -2717,13 +2717,13 @@ void scc68070_device::device_start() } -fscpu32_device::fscpu32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +fscpu32_device::fscpu32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m68000_base_device(mconfig, "Freescale CPU32 Core", tag, owner, clock, FSCPU32, 32,32, "fscpu32", __FILE__) { } -fscpu32_device::fscpu32_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, UINT32 clock, - const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source) +fscpu32_device::fscpu32_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, uint32_t clock, + const device_type type, uint32_t prg_data_width, uint32_t prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source) : m68000_base_device(mconfig, name, tag, owner, clock, type, prg_data_width, prg_address_bits, internal_map, shortname, source) { } @@ -2736,7 +2736,7 @@ void fscpu32_device::device_start() -mcf5206e_device::mcf5206e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +mcf5206e_device::mcf5206e_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : m68000_base_device(mconfig, "MCF5206E", tag, owner, clock, MCF5206E, 32,32, "mcf5206e", __FILE__) { } |