diff options
Diffstat (limited to 'src/devices/cpu/sh4')
-rw-r--r-- | src/devices/cpu/sh4/sh4.cpp | 12 | ||||
-rw-r--r-- | src/devices/cpu/sh4/sh4.h | 6 | ||||
-rw-r--r-- | src/devices/cpu/sh4/sh4dasm.cpp | 12 |
3 files changed, 11 insertions, 19 deletions
diff --git a/src/devices/cpu/sh4/sh4.cpp b/src/devices/cpu/sh4/sh4.cpp index 773dc9ae566..1d5c69ad483 100644 --- a/src/devices/cpu/sh4/sh4.cpp +++ b/src/devices/cpu/sh4/sh4.cpp @@ -151,27 +151,27 @@ sh4be_device::sh4be_device(const machine_config &mconfig, const char *tag, devic } -offs_t sh34_base_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) +offs_t sh34_base_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { extern CPU_DISASSEMBLE( sh4 ); - return CPU_DISASSEMBLE_NAME(sh4)(this, buffer, pc, oprom, opram, options); + return CPU_DISASSEMBLE_NAME(sh4)(this, stream, pc, oprom, opram, options); } -offs_t sh3be_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) +offs_t sh3be_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { extern CPU_DISASSEMBLE( sh4be ); - return CPU_DISASSEMBLE_NAME(sh4be)(this, buffer, pc, oprom, opram, options); + return CPU_DISASSEMBLE_NAME(sh4be)(this, stream, pc, oprom, opram, options); } -offs_t sh4be_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) +offs_t sh4be_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { extern CPU_DISASSEMBLE( sh4be ); - return CPU_DISASSEMBLE_NAME(sh4be)(this, buffer, pc, oprom, opram, options); + return CPU_DISASSEMBLE_NAME(sh4be)(this, stream, pc, oprom, opram, options); } diff --git a/src/devices/cpu/sh4/sh4.h b/src/devices/cpu/sh4/sh4.h index 9af8dd3fa1c..7531363c2da 100644 --- a/src/devices/cpu/sh4/sh4.h +++ b/src/devices/cpu/sh4/sh4.h @@ -225,7 +225,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 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; protected: address_space_config m_program_config; @@ -758,7 +758,7 @@ public: protected: virtual void execute_run() override; - 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; }; @@ -776,7 +776,7 @@ public: protected: virtual void execute_run() override; - 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; }; diff --git a/src/devices/cpu/sh4/sh4dasm.cpp b/src/devices/cpu/sh4/sh4dasm.cpp index 2815dc720be..faff895f3a5 100644 --- a/src/devices/cpu/sh4/sh4dasm.cpp +++ b/src/devices/cpu/sh4/sh4dasm.cpp @@ -896,18 +896,10 @@ unsigned DasmSH4(std::ostream &stream, unsigned pc, uint16_t opcode) CPU_DISASSEMBLE(sh4) { - std::ostringstream stream; - offs_t result = DasmSH4(stream, pc, (oprom[1] << 8) | oprom[0]); - std::string stream_str = stream.str(); - strcpy(buffer, stream_str.c_str()); - return result; + return DasmSH4(stream, pc, (oprom[1] << 8) | oprom[0]); } CPU_DISASSEMBLE(sh4be) { - std::ostringstream stream; - offs_t result = DasmSH4(stream, pc, (oprom[0] << 8) | oprom[1]); - std::string stream_str = stream.str(); - strcpy(buffer, stream_str.c_str()); - return result; + return DasmSH4(stream, pc, (oprom[0] << 8) | oprom[1]); } |