diff options
Diffstat (limited to 'src/devices/cpu/m6809')
-rw-r--r-- | src/devices/cpu/m6809/6x09dasm.cpp | 21 | ||||
-rw-r--r-- | src/devices/cpu/m6809/hd6309.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/m6809/hd6309.h | 2 | ||||
-rw-r--r-- | src/devices/cpu/m6809/konami.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/m6809/konami.h | 2 | ||||
-rw-r--r-- | src/devices/cpu/m6809/m6809.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/m6809/m6809.h | 2 |
7 files changed, 12 insertions, 27 deletions
diff --git a/src/devices/cpu/m6809/6x09dasm.cpp b/src/devices/cpu/m6809/6x09dasm.cpp index 2efd49e352c..1018db9385c 100644 --- a/src/devices/cpu/m6809/6x09dasm.cpp +++ b/src/devices/cpu/m6809/6x09dasm.cpp @@ -108,7 +108,6 @@ namespace } offs_t disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram); - offs_t disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram); protected: virtual void indirect(std::ostream &stream, uint8_t pb, const uint8_t *opram, int &p) = 0; @@ -180,20 +179,6 @@ const opcodeinfo *m6x09_disassembler_base::fetch_opcode(const uint8_t *oprom, in // disassemble - core of the disassembler //------------------------------------------------- -offs_t m6x09_disassembler_base::disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram) -{ - std::ostringstream stream; - offs_t result = disassemble(stream, pc, oprom, opram); - std::string stream_str = stream.str(); - strcpy(buffer, stream_str.c_str()); - return result; -} - - -//------------------------------------------------- -// disassemble - core of the disassembler -//------------------------------------------------- - offs_t m6x09_disassembler_base::disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram) { uint8_t pb; @@ -1098,7 +1083,7 @@ CPU_DISASSEMBLE(m6809) "A", "B", "CC", "DP", "inv", "inv", "inv", "inv" }; m6x09_disassembler disasm(M6x09_GENERAL, m6809_teregs); - return disasm.disassemble(buffer, pc, oprom, opram); + return disasm.disassemble(stream, pc, oprom, opram); } @@ -1114,7 +1099,7 @@ CPU_DISASSEMBLE(hd6309) "A", "B", "CC", "DP", "0", "0", "E", "F" }; m6x09_disassembler disasm(HD6309_EXCLUSIVE, hd6309_teregs); - return disasm.disassemble(buffer, pc, oprom, opram); + return disasm.disassemble(stream, pc, oprom, opram); } @@ -1562,5 +1547,5 @@ void konami_disassembler::register_register(std::ostream &stream, uint8_t pb) CPU_DISASSEMBLE(konami) { konami_disassembler disasm; - return disasm.disassemble(buffer, pc, oprom, opram); + return disasm.disassemble(stream, pc, oprom, opram); } diff --git a/src/devices/cpu/m6809/hd6309.cpp b/src/devices/cpu/m6809/hd6309.cpp index ef9ff98f4f2..d8227c6162f 100644 --- a/src/devices/cpu/m6809/hd6309.cpp +++ b/src/devices/cpu/m6809/hd6309.cpp @@ -313,10 +313,10 @@ uint32_t hd6309_device::disasm_max_opcode_bytes() const // helper function //------------------------------------------------- -offs_t hd6309_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) +offs_t hd6309_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { extern CPU_DISASSEMBLE( hd6309 ); - return CPU_DISASSEMBLE_NAME(hd6309)(this, buffer, pc, oprom, opram, options); + return CPU_DISASSEMBLE_NAME(hd6309)(this, stream, pc, oprom, opram, options); } diff --git a/src/devices/cpu/m6809/hd6309.h b/src/devices/cpu/m6809/hd6309.h index 852f03d2d0d..f4eae899bfa 100644 --- a/src/devices/cpu/m6809/hd6309.h +++ b/src/devices/cpu/m6809/hd6309.h @@ -44,7 +44,7 @@ protected: // device_disasm_interface overrides virtual uint32_t disasm_min_opcode_bytes() const override; virtual uint32_t disasm_max_opcode_bytes() 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; virtual bool is_6809() override { return false; }; diff --git a/src/devices/cpu/m6809/konami.cpp b/src/devices/cpu/m6809/konami.cpp index 8762d358635..ba6acfe05a5 100644 --- a/src/devices/cpu/m6809/konami.cpp +++ b/src/devices/cpu/m6809/konami.cpp @@ -109,10 +109,10 @@ void konami_cpu_device::device_start() // helper function //------------------------------------------------- -offs_t konami_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) +offs_t konami_cpu_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { extern CPU_DISASSEMBLE( konami ); - return CPU_DISASSEMBLE_NAME(konami)(this, buffer, pc, oprom, opram, options); + return CPU_DISASSEMBLE_NAME(konami)(this, stream, pc, oprom, opram, options); } diff --git a/src/devices/cpu/m6809/konami.h b/src/devices/cpu/m6809/konami.h index ca42bbfb666..2850eff7372 100644 --- a/src/devices/cpu/m6809/konami.h +++ b/src/devices/cpu/m6809/konami.h @@ -46,7 +46,7 @@ protected: virtual void execute_run() override; // device_disasm_interface overrides - 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: typedef m6809_base_device super; diff --git a/src/devices/cpu/m6809/m6809.cpp b/src/devices/cpu/m6809/m6809.cpp index db0cbee9a3c..27b15dc97a5 100644 --- a/src/devices/cpu/m6809/m6809.cpp +++ b/src/devices/cpu/m6809/m6809.cpp @@ -373,10 +373,10 @@ uint32_t m6809_base_device::disasm_max_opcode_bytes() const // helper function //------------------------------------------------- -offs_t m6809_base_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) +offs_t m6809_base_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { extern CPU_DISASSEMBLE( m6809 ); - return CPU_DISASSEMBLE_NAME(m6809)(this, buffer, pc, oprom, opram, options); + return CPU_DISASSEMBLE_NAME(m6809)(this, stream, pc, oprom, opram, options); } diff --git a/src/devices/cpu/m6809/m6809.h b/src/devices/cpu/m6809/m6809.h index b9b6c365f35..73f8477d51e 100644 --- a/src/devices/cpu/m6809/m6809.h +++ b/src/devices/cpu/m6809/m6809.h @@ -77,7 +77,7 @@ protected: // device_disasm_interface overrides virtual uint32_t disasm_min_opcode_bytes() const override; virtual uint32_t disasm_max_opcode_bytes() 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; // device_state_interface overrides virtual void state_import(const device_state_entry &entry) override; |