summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/z8000
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/cpu/z8000')
-rw-r--r--src/devices/cpu/z8000/8000dasm.cpp12
-rw-r--r--src/devices/cpu/z8000/z8000.cpp4
-rw-r--r--src/devices/cpu/z8000/z8000.h2
3 files changed, 4 insertions, 14 deletions
diff --git a/src/devices/cpu/z8000/8000dasm.cpp b/src/devices/cpu/z8000/8000dasm.cpp
index 1c0bffcd2f1..5a6d6c51596 100644
--- a/src/devices/cpu/z8000/8000dasm.cpp
+++ b/src/devices/cpu/z8000/8000dasm.cpp
@@ -48,7 +48,7 @@ static const char *const ints[4] = {
int z8k_segm; /* Current disassembler mode: 0 - non-segmented, 1 - segmented */
int z8k_segm_mode = Z8K_SEGM_MODE_AUTO; /* User disassembler mode setting: segmented, non-segmented, auto */
-static offs_t internal_disasm_z8000(cpu_device *device, std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, int options)
+CPU_DISASSEMBLE(z8000)
{
int new_pc = pc, i, j, tmp;
const char *src;
@@ -311,13 +311,3 @@ static offs_t internal_disasm_z8000(cpu_device *device, std::ostream &stream, of
}
return (new_pc - pc) | flags | DASMFLAG_SUPPORTED;
}
-
-
-CPU_DISASSEMBLE(z8000)
-{
- std::ostringstream stream;
- offs_t result = internal_disasm_z8000(device, stream, pc, oprom, opram, options);
- std::string stream_str = stream.str();
- strcpy(buffer, stream_str.c_str());
- return result;
-}
diff --git a/src/devices/cpu/z8000/z8000.cpp b/src/devices/cpu/z8000/z8000.cpp
index f94b0c1d09c..be15136f4ff 100644
--- a/src/devices/cpu/z8000/z8000.cpp
+++ b/src/devices/cpu/z8000/z8000.cpp
@@ -61,10 +61,10 @@ z8001_device::z8001_device(const machine_config &mconfig, const char *tag, devic
}
-offs_t z8002_device::disasm_disassemble(char *buffer, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options)
+offs_t z8002_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options)
{
extern CPU_DISASSEMBLE( z8000 );
- return CPU_DISASSEMBLE_NAME(z8000)(this, buffer, pc, oprom, opram, options);
+ return CPU_DISASSEMBLE_NAME(z8000)(this, stream, pc, oprom, opram, options);
}
diff --git a/src/devices/cpu/z8000/z8000.h b/src/devices/cpu/z8000/z8000.h
index 403b3ef729e..410696f500f 100644
--- a/src/devices/cpu/z8000/z8000.h
+++ b/src/devices/cpu/z8000/z8000.h
@@ -74,7 +74,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 6; }
- 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 m_program_config;
address_space_config m_io_config;