diff options
Diffstat (limited to 'src/devices/cpu/tms1000')
-rw-r--r-- | src/devices/cpu/tms1000/tms0980.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/tms1000/tms0980.h | 2 | ||||
-rw-r--r-- | src/devices/cpu/tms1000/tms1000.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/tms1000/tms1000.h | 2 | ||||
-rw-r--r-- | src/devices/cpu/tms1000/tms1100.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/tms1000/tms1100.h | 2 | ||||
-rw-r--r-- | src/devices/cpu/tms1000/tms1k_dasm.cpp | 17 | ||||
-rw-r--r-- | src/devices/cpu/tms1000/tp0320.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/tms1000/tp0320.h | 2 |
9 files changed, 16 insertions, 25 deletions
diff --git a/src/devices/cpu/tms1000/tms0980.cpp b/src/devices/cpu/tms1000/tms0980.cpp index 523844b6366..b3678165d4a 100644 --- a/src/devices/cpu/tms1000/tms0980.cpp +++ b/src/devices/cpu/tms1000/tms0980.cpp @@ -90,10 +90,10 @@ machine_config_constructor tms1980_cpu_device::device_mconfig_additions() const // disasm -offs_t tms0980_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) +offs_t tms0980_cpu_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { extern CPU_DISASSEMBLE(tms0980); - return CPU_DISASSEMBLE_NAME(tms0980)(this, buffer, pc, oprom, opram, options); + return CPU_DISASSEMBLE_NAME(tms0980)(this, stream, pc, oprom, opram, options); } diff --git a/src/devices/cpu/tms1000/tms0980.h b/src/devices/cpu/tms1000/tms0980.h index 921c585769b..afbcaa3647d 100644 --- a/src/devices/cpu/tms1000/tms0980.h +++ b/src/devices/cpu/tms1000/tms0980.h @@ -28,7 +28,7 @@ protected: 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; virtual uint8_t read_k_input() override; virtual void set_cki_bus() override; diff --git a/src/devices/cpu/tms1000/tms1000.cpp b/src/devices/cpu/tms1000/tms1000.cpp index 5948d9753ff..40add17105c 100644 --- a/src/devices/cpu/tms1000/tms1000.cpp +++ b/src/devices/cpu/tms1000/tms1000.cpp @@ -93,10 +93,10 @@ machine_config_constructor tms1000_cpu_device::device_mconfig_additions() const // disasm -offs_t tms1000_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) +offs_t tms1000_cpu_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { extern CPU_DISASSEMBLE(tms1000); - return CPU_DISASSEMBLE_NAME(tms1000)(this, buffer, pc, oprom, opram, options); + return CPU_DISASSEMBLE_NAME(tms1000)(this, stream, pc, oprom, opram, options); } diff --git a/src/devices/cpu/tms1000/tms1000.h b/src/devices/cpu/tms1000/tms1000.h index 7cb5ba66ac6..049b24873fd 100644 --- a/src/devices/cpu/tms1000/tms1000.h +++ b/src/devices/cpu/tms1000/tms1000.h @@ -24,7 +24,7 @@ protected: virtual machine_config_constructor device_mconfig_additions() const 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; }; class tms1070_cpu_device : public tms1000_cpu_device diff --git a/src/devices/cpu/tms1000/tms1100.cpp b/src/devices/cpu/tms1000/tms1100.cpp index 6ef15a98043..93c7c07a69c 100644 --- a/src/devices/cpu/tms1000/tms1100.cpp +++ b/src/devices/cpu/tms1000/tms1100.cpp @@ -49,10 +49,10 @@ tms1370_cpu_device::tms1370_cpu_device(const machine_config &mconfig, const char // disasm -offs_t tms1100_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) +offs_t tms1100_cpu_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { extern CPU_DISASSEMBLE(tms1100); - return CPU_DISASSEMBLE_NAME(tms1100)(this, buffer, pc, oprom, opram, options); + return CPU_DISASSEMBLE_NAME(tms1100)(this, stream, pc, oprom, opram, options); } diff --git a/src/devices/cpu/tms1000/tms1100.h b/src/devices/cpu/tms1000/tms1100.h index e57f880df12..b5df68e40cc 100644 --- a/src/devices/cpu/tms1000/tms1100.h +++ b/src/devices/cpu/tms1000/tms1100.h @@ -22,7 +22,7 @@ protected: // overrides virtual void device_reset() 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; virtual void op_setr() override; virtual void op_rstr() override; diff --git a/src/devices/cpu/tms1000/tms1k_dasm.cpp b/src/devices/cpu/tms1000/tms1k_dasm.cpp index b1c4422d369..8987a666726 100644 --- a/src/devices/cpu/tms1000/tms1k_dasm.cpp +++ b/src/devices/cpu/tms1000/tms1k_dasm.cpp @@ -259,32 +259,23 @@ static offs_t tms1k_dasm(std::ostream &stream, const uint8_t *oprom, const uint8 return pos | s_flags[instr] | DASMFLAG_SUPPORTED; } -static offs_t tms1k_dasm(char *buffer, const uint8_t *oprom, const uint8_t *lut_mnemonic, uint16_t opcode_mask) -{ - std::ostringstream stream; - offs_t result = tms1k_dasm(stream, oprom, lut_mnemonic, opcode_mask); - std::string stream_str = stream.str(); - strcpy(buffer, stream_str.c_str()); - return result; -} - CPU_DISASSEMBLE(tms1000) { - return tms1k_dasm(buffer, oprom, tms1000_mnemonic, 0xff); + return tms1k_dasm(stream, oprom, tms1000_mnemonic, 0xff); } CPU_DISASSEMBLE(tms1100) { - return tms1k_dasm(buffer, oprom, tms1100_mnemonic, 0xff); + return tms1k_dasm(stream, oprom, tms1100_mnemonic, 0xff); } CPU_DISASSEMBLE(tms0980) { - return tms1k_dasm(buffer, oprom, tms0980_mnemonic, 0x1ff); + return tms1k_dasm(stream, oprom, tms0980_mnemonic, 0x1ff); } CPU_DISASSEMBLE(tp0320) { - return tms1k_dasm(buffer, oprom, tp0320_mnemonic, 0x1ff); + return tms1k_dasm(stream, oprom, tp0320_mnemonic, 0x1ff); } diff --git a/src/devices/cpu/tms1000/tp0320.cpp b/src/devices/cpu/tms1000/tp0320.cpp index ab33c3788e2..243ef3bb8e3 100644 --- a/src/devices/cpu/tms1000/tp0320.cpp +++ b/src/devices/cpu/tms1000/tp0320.cpp @@ -58,10 +58,10 @@ machine_config_constructor tp0320_cpu_device::device_mconfig_additions() const // disasm -offs_t tp0320_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) +offs_t tp0320_cpu_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { extern CPU_DISASSEMBLE(tp0320); - return CPU_DISASSEMBLE_NAME(tp0320)(this, buffer, pc, oprom, opram, options); + return CPU_DISASSEMBLE_NAME(tp0320)(this, stream, pc, oprom, opram, options); } diff --git a/src/devices/cpu/tms1000/tp0320.h b/src/devices/cpu/tms1000/tp0320.h index a85fc253cc4..fcff112a900 100644 --- a/src/devices/cpu/tms1000/tp0320.h +++ b/src/devices/cpu/tms1000/tp0320.h @@ -24,7 +24,7 @@ protected: virtual uint32_t decode_fixed(uint16_t op) override { return 0; } // not yet virtual uint32_t decode_micro(uint8_t sel) override; virtual void device_reset() 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; virtual machine_config_constructor device_mconfig_additions() const override; }; |