From ae4a4581bc0095ba243c734d7429619720ef99d3 Mon Sep 17 00:00:00 2001 From: AJR Date: Mon, 26 Aug 2019 18:58:07 -0400 Subject: se3208: Clean up disassembler and remove unwanted newline (nw) e132xs: Remove unwanted newline in disassembly (nw) --- src/devices/cpu/e132xs/32xsdasm.cpp | 2 +- src/devices/cpu/se3208/se3208dis.cpp | 56 ++++++++++++++++-------------------- 2 files changed, 25 insertions(+), 33 deletions(-) diff --git a/src/devices/cpu/e132xs/32xsdasm.cpp b/src/devices/cpu/e132xs/32xsdasm.cpp index 46550040918..00f24bf99e4 100644 --- a/src/devices/cpu/e132xs/32xsdasm.cpp +++ b/src/devices/cpu/e132xs/32xsdasm.cpp @@ -1644,7 +1644,7 @@ offs_t hyperstone_disassembler::disassemble(std::ostream &stream, offs_t pc, con break; default: - util::stream_format(stream, "Ext. OP $%X @ %X\n", extended_op, pc); + util::stream_format(stream, "Ext. OP $%X @ %X", extended_op, pc); osd_printf_verbose("Illegal Extended Opcode: %X @ %X\n", extended_op, pc); break; } diff --git a/src/devices/cpu/se3208/se3208dis.cpp b/src/devices/cpu/se3208/se3208dis.cpp index 0ce74883cae..6a87ed1f6d7 100644 --- a/src/devices/cpu/se3208/se3208dis.cpp +++ b/src/devices/cpu/se3208/se3208dis.cpp @@ -232,71 +232,63 @@ INST(STSP) INST(PUSH) { uint32_t Set=EXTRACT(Opcode,0,10); - char str[1024]; - strcpy(str,"PUSH "); + stream << "PUSH "; if(Set&(1<<10)) - strcat(str,"%PC-"); + stream << "%PC-"; if(Set&(1<<9)) - strcat(str,"%SR-"); + stream << "%SR-"; if(Set&(1<<8)) - strcat(str,"%ER-"); + stream << "%ER-"; if(Set&(1<<7)) - strcat(str,"%R7-"); + stream << "%R7-"; if(Set&(1<<6)) - strcat(str,"%R6-"); + stream << "%R6-"; if(Set&(1<<5)) - strcat(str,"%R5-"); + stream << "%R5-"; if(Set&(1<<4)) - strcat(str,"%R4-"); + stream << "%R4-"; if(Set&(1<<3)) - strcat(str,"%R3-"); + stream << "%R3-"; if(Set&(1<<2)) - strcat(str,"%R2-"); + stream << "%R2-"; if(Set&(1<<1)) - strcat(str,"%R1-"); + stream << "%R1-"; if(Set&(1<<0)) - strcat(str,"%R0-"); - str[strlen(str)-1]=0; - stream << str; + stream << "%R0-"; return 0; } INST(POP) { uint32_t Set=EXTRACT(Opcode,0,10); - char str[1024]; int Ret=0; - strcpy(str,"POP "); + stream << "POP "; if(Set&(1<<0)) - strcat(str,"%R0-"); + stream << "%R0-"; if(Set&(1<<1)) - strcat(str,"%R1-"); + stream << "%R1-"; if(Set&(1<<2)) - strcat(str,"%R2-"); + stream << "%R2-"; if(Set&(1<<3)) - strcat(str,"%R3-"); + stream << "%R3-"; if(Set&(1<<4)) - strcat(str,"%R4-"); + stream << "%R4-"; if(Set&(1<<5)) - strcat(str,"%R5-"); + stream << "%R5-"; if(Set&(1<<6)) - strcat(str,"%R6-"); + stream << "%R6-"; if(Set&(1<<7)) - strcat(str,"%R7-"); + stream << "%R7-"; if(Set&(1<<8)) - strcat(str,"%ER-"); + stream << "%ER-"; if(Set&(1<<9)) - strcat(str,"%SR-"); + stream << "%SR-"; if(Set&(1<<10)) { - strcat(str,"%PC-"); + stream << "%PC-"; CLRFLAG(FLAG_E); //Clear the flag, this is a ret so disassemble will start a new E block Ret=1; } - str[strlen(str)-1]=0; - if(Ret) - strcat(str,"\n"); - stream << str; return Ret ? STEP_OUT : 0; } -- cgit v1.2.3