diff options
Diffstat (limited to 'src/devices/cpu/cop400')
-rw-r--r-- | src/devices/cpu/cop400/cop400.cpp | 8 | ||||
-rw-r--r-- | src/devices/cpu/cop400/cop400.h | 2 | ||||
-rw-r--r-- | src/devices/cpu/cop400/cop410ds.cpp | 12 | ||||
-rw-r--r-- | src/devices/cpu/cop400/cop420ds.cpp | 12 | ||||
-rw-r--r-- | src/devices/cpu/cop400/cop440ds.cpp | 12 |
5 files changed, 8 insertions, 38 deletions
diff --git a/src/devices/cpu/cop400/cop400.cpp b/src/devices/cpu/cop400/cop400.cpp index 58a5c672a35..fd0164f83a1 100644 --- a/src/devices/cpu/cop400/cop400.cpp +++ b/src/devices/cpu/cop400/cop400.cpp @@ -1171,7 +1171,7 @@ void cop400_cpu_device::state_string_export(const device_state_entry &entry, std } -offs_t cop400_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) +offs_t cop400_cpu_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { extern CPU_DISASSEMBLE( cop410 ); extern CPU_DISASSEMBLE( cop420 ); @@ -1179,15 +1179,15 @@ offs_t cop400_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const uint if ( m_featuremask & COP444_FEATURE ) { - return CPU_DISASSEMBLE_NAME(cop444)(this, buffer, pc, oprom, opram, options); + return CPU_DISASSEMBLE_NAME(cop444)(this, stream, pc, oprom, opram, options); } if ( m_featuremask & COP420_FEATURE ) { - return CPU_DISASSEMBLE_NAME(cop420)(this, buffer, pc, oprom, opram, options); + return CPU_DISASSEMBLE_NAME(cop420)(this, stream, pc, oprom, opram, options); } - return CPU_DISASSEMBLE_NAME(cop410)(this, buffer, pc, oprom, opram, options); + return CPU_DISASSEMBLE_NAME(cop410)(this, stream, pc, oprom, opram, options); } READ8_MEMBER( cop400_cpu_device::microbus_rd ) diff --git a/src/devices/cpu/cop400/cop400.h b/src/devices/cpu/cop400/cop400.h index 6788d52c2a2..bace4710008 100644 --- a/src/devices/cpu/cop400/cop400.h +++ b/src/devices/cpu/cop400/cop400.h @@ -169,7 +169,7 @@ protected: // device_disasm_interface overrides virtual uint32_t disasm_min_opcode_bytes() const override { return 1; } virtual uint32_t disasm_max_opcode_bytes() const override { return 2; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) override; + virtual offs_t disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) override; address_space_config m_program_config; address_space_config m_data_config; diff --git a/src/devices/cpu/cop400/cop410ds.cpp b/src/devices/cpu/cop400/cop410ds.cpp index 1c28ea070bf..b6f6f4d06f4 100644 --- a/src/devices/cpu/cop400/cop410ds.cpp +++ b/src/devices/cpu/cop400/cop410ds.cpp @@ -10,7 +10,7 @@ #include "emu.h" -static offs_t internal_disasm_cop410(cpu_device *device, std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, int options) +CPU_DISASSEMBLE(cop410) { uint8_t opcode = oprom[0]; uint8_t next_opcode = oprom[1]; @@ -348,13 +348,3 @@ static offs_t internal_disasm_cop410(cpu_device *device, std::ostream &stream, o return bytes | flags | DASMFLAG_SUPPORTED; } - - -CPU_DISASSEMBLE(cop410) -{ - std::ostringstream stream; - offs_t result = internal_disasm_cop410(device, stream, pc, oprom, opram, options); - std::string stream_str = stream.str(); - strcpy(buffer, stream_str.c_str()); - return result; -} diff --git a/src/devices/cpu/cop400/cop420ds.cpp b/src/devices/cpu/cop400/cop420ds.cpp index bf032238687..7c337edb0a1 100644 --- a/src/devices/cpu/cop400/cop420ds.cpp +++ b/src/devices/cpu/cop400/cop420ds.cpp @@ -10,7 +10,7 @@ #include "emu.h" -static offs_t internal_disasm_cop420(cpu_device *device, std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, int options) +CPU_DISASSEMBLE(cop420) { uint8_t opcode = oprom[0]; uint8_t next_opcode = oprom[1]; @@ -396,13 +396,3 @@ static offs_t internal_disasm_cop420(cpu_device *device, std::ostream &stream, o return bytes | flags | DASMFLAG_SUPPORTED; } - - -CPU_DISASSEMBLE(cop420) -{ - std::ostringstream stream; - offs_t result = internal_disasm_cop420(device, stream, pc, oprom, opram, options); - std::string stream_str = stream.str(); - strcpy(buffer, stream_str.c_str()); - return result; -} diff --git a/src/devices/cpu/cop400/cop440ds.cpp b/src/devices/cpu/cop400/cop440ds.cpp index 0150e20ea76..5f7517fca05 100644 --- a/src/devices/cpu/cop400/cop440ds.cpp +++ b/src/devices/cpu/cop400/cop440ds.cpp @@ -10,7 +10,7 @@ #include "emu.h" -static offs_t internal_disasm_cop444(cpu_device *device, std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, int options) +CPU_DISASSEMBLE(cop444) { uint8_t opcode = oprom[0]; uint8_t next_opcode = oprom[1]; @@ -413,13 +413,3 @@ static offs_t internal_disasm_cop444(cpu_device *device, std::ostream &stream, o return bytes | flags | DASMFLAG_SUPPORTED; } - - -CPU_DISASSEMBLE(cop444) -{ - std::ostringstream stream; - offs_t result = internal_disasm_cop444(device, stream, pc, oprom, opram, options); - std::string stream_str = stream.str(); - strcpy(buffer, stream_str.c_str()); - return result; -} |