diff options
Diffstat (limited to 'src/devices/cpu/unsp')
-rw-r--r-- | src/devices/cpu/unsp/unsp.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/unsp/unsp.h | 2 | ||||
-rw-r--r-- | src/devices/cpu/unsp/unspdasm.cpp | 12 |
3 files changed, 4 insertions, 14 deletions
diff --git a/src/devices/cpu/unsp/unsp.cpp b/src/devices/cpu/unsp/unsp.cpp index 11500ba0e48..1d40ba330ee 100644 --- a/src/devices/cpu/unsp/unsp.cpp +++ b/src/devices/cpu/unsp/unsp.cpp @@ -23,10 +23,10 @@ unsp_device::unsp_device(const machine_config &mconfig, const char *tag, device_ } -offs_t unsp_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) +offs_t unsp_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { extern CPU_DISASSEMBLE( unsp ); - return CPU_DISASSEMBLE_NAME(unsp)(this, buffer, pc, oprom, opram, options); + return CPU_DISASSEMBLE_NAME(unsp)(this, stream, pc, oprom, opram, options); } diff --git a/src/devices/cpu/unsp/unsp.h b/src/devices/cpu/unsp/unsp.h index 69e1ad962b0..a9a656478ee 100644 --- a/src/devices/cpu/unsp/unsp.h +++ b/src/devices/cpu/unsp/unsp.h @@ -77,7 +77,7 @@ protected: // device_disasm_interface overrides virtual uint32_t disasm_min_opcode_bytes() const override { return 2; } virtual uint32_t disasm_max_opcode_bytes() const override { return 4; } - 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; private: address_space_config m_program_config; diff --git a/src/devices/cpu/unsp/unspdasm.cpp b/src/devices/cpu/unsp/unspdasm.cpp index 8694b3b433b..68d620fb7b6 100644 --- a/src/devices/cpu/unsp/unspdasm.cpp +++ b/src/devices/cpu/unsp/unspdasm.cpp @@ -46,7 +46,7 @@ static const char *alu[] = #define UNSP_DASM_OK ((OP2X ? 2 : 1) | DASMFLAG_SUPPORTED) -static offs_t internal_disasm_unsp(cpu_device *device, std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, int options) +CPU_DISASSEMBLE(unsp) { uint16_t op = *(uint16_t *)oprom; uint16_t imm16 = *(uint16_t *)(oprom + 2); @@ -258,13 +258,3 @@ static offs_t internal_disasm_unsp(cpu_device *device, std::ostream &stream, off util::stream_format(stream, "<inv>"); return UNSP_DASM_OK; } - - -CPU_DISASSEMBLE(unsp) -{ - std::ostringstream stream; - offs_t result = internal_disasm_unsp(device, stream, pc, oprom, opram, options); - std::string stream_str = stream.str(); - strcpy(buffer, stream_str.c_str()); - return result; -} |