diff options
Diffstat (limited to 'src/devices/cpu/h8')
-rw-r--r-- | src/devices/cpu/h8/h8.cpp | 13 | ||||
-rw-r--r-- | src/devices/cpu/h8/h8.h | 3 | ||||
-rw-r--r-- | src/devices/cpu/h8/h8h.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/h8/h8h.h | 2 | ||||
-rw-r--r-- | src/devices/cpu/h8/h8s2000.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/h8/h8s2000.h | 2 | ||||
-rw-r--r-- | src/devices/cpu/h8/h8s2600.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/h8/h8s2600.h | 2 |
8 files changed, 12 insertions, 22 deletions
diff --git a/src/devices/cpu/h8/h8.cpp b/src/devices/cpu/h8/h8.cpp index 7a95b59b922..6d62453a2ff 100644 --- a/src/devices/cpu/h8/h8.cpp +++ b/src/devices/cpu/h8/h8.cpp @@ -568,18 +568,9 @@ offs_t h8_device::disassemble_generic(std::ostream &stream, offs_t pc, const uin return e.flags | DASMFLAG_SUPPORTED; } -offs_t h8_device::disassemble_generic(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options, const disasm_entry *table) +offs_t h8_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { - std::ostringstream stream; - offs_t result = disassemble_generic(stream, pc, oprom, opram, options, table); - std::string stream_str = stream.str(); - strcpy(buffer, stream_str.c_str()); - return result; -} - -offs_t h8_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) -{ - return disassemble_generic(buffer, pc, oprom, opram, options, disasm_entries); + return disassemble_generic(stream, pc, oprom, opram, options, disasm_entries); } uint16_t h8_device::read16i(uint32_t adr) diff --git a/src/devices/cpu/h8/h8.h b/src/devices/cpu/h8/h8.h index 735df6f9de9..089cec91fb7 100644 --- a/src/devices/cpu/h8/h8.h +++ b/src/devices/cpu/h8/h8.h @@ -175,7 +175,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; address_space_config program_config, io_config; address_space *program, *io; @@ -209,7 +209,6 @@ protected: static const disasm_entry disasm_entries[]; offs_t disassemble_generic(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options, const disasm_entry *table); - offs_t disassemble_generic(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options, const disasm_entry *table); void disassemble_am(std::ostream &stream, int am, offs_t pc, const uint8_t *oprom, uint32_t opcode, int slot, int offset); virtual void do_exec_full(); diff --git a/src/devices/cpu/h8/h8h.cpp b/src/devices/cpu/h8/h8h.cpp index 1710cb930f6..87ae39a884b 100644 --- a/src/devices/cpu/h8/h8h.cpp +++ b/src/devices/cpu/h8/h8h.cpp @@ -10,9 +10,9 @@ h8h_device::h8h_device(const machine_config &mconfig, device_type type, const ch mode_advanced = true; } -offs_t h8h_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) +offs_t h8h_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { - return disassemble_generic(buffer, pc, oprom, opram, options, disasm_entries); + return disassemble_generic(stream, pc, oprom, opram, options, disasm_entries); } #include "cpu/h8/h8h.hxx" diff --git a/src/devices/cpu/h8/h8h.h b/src/devices/cpu/h8/h8h.h index b4385d96ef6..f634e0aa82a 100644 --- a/src/devices/cpu/h8/h8h.h +++ b/src/devices/cpu/h8/h8h.h @@ -23,7 +23,7 @@ public: protected: static const disasm_entry disasm_entries[]; - 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 do_exec_full() override; virtual void do_exec_partial() override; diff --git a/src/devices/cpu/h8/h8s2000.cpp b/src/devices/cpu/h8/h8s2000.cpp index ff8997e4728..99086cbc95f 100644 --- a/src/devices/cpu/h8/h8s2000.cpp +++ b/src/devices/cpu/h8/h8s2000.cpp @@ -9,9 +9,9 @@ h8s2000_device::h8s2000_device(const machine_config &mconfig, device_type type, has_exr = true; } -offs_t h8s2000_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) +offs_t h8s2000_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { - return disassemble_generic(buffer, pc, oprom, opram, options, disasm_entries); + return disassemble_generic(stream, pc, oprom, opram, options, disasm_entries); } #include "cpu/h8/h8s2000.hxx" diff --git a/src/devices/cpu/h8/h8s2000.h b/src/devices/cpu/h8/h8s2000.h index 24808f8d596..34edb361cd8 100644 --- a/src/devices/cpu/h8/h8s2000.h +++ b/src/devices/cpu/h8/h8s2000.h @@ -25,7 +25,7 @@ public: protected: static const disasm_entry disasm_entries[]; - 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 do_exec_full() override; virtual void do_exec_partial() override; diff --git a/src/devices/cpu/h8/h8s2600.cpp b/src/devices/cpu/h8/h8s2600.cpp index 7717bc2f179..5bd2d7419cc 100644 --- a/src/devices/cpu/h8/h8s2600.cpp +++ b/src/devices/cpu/h8/h8s2600.cpp @@ -8,9 +8,9 @@ h8s2600_device::h8s2600_device(const machine_config &mconfig, device_type type, { } -offs_t h8s2600_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) +offs_t h8s2600_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) { - return disassemble_generic(buffer, pc, oprom, opram, options, disasm_entries); + return disassemble_generic(stream, pc, oprom, opram, options, disasm_entries); } #include "cpu/h8/h8s2600.hxx" diff --git a/src/devices/cpu/h8/h8s2600.h b/src/devices/cpu/h8/h8s2600.h index a7c686e910d..eb2881d66dd 100644 --- a/src/devices/cpu/h8/h8s2600.h +++ b/src/devices/cpu/h8/h8s2600.h @@ -23,7 +23,7 @@ public: protected: static const disasm_entry disasm_entries[]; - 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 do_exec_full() override; virtual void do_exec_partial() override; |