se3208: Clean up disassembler and remove unwanted newline (nw)

e132xs: Remove unwanted newline in disassembly (nw)
This commit is contained in:
AJR 2019-08-26 18:58:07 -04:00
parent 23abdbc7a9
commit ae4a4581bc
2 changed files with 25 additions and 33 deletions

View File

@ -1644,7 +1644,7 @@ offs_t hyperstone_disassembler::disassemble(std::ostream &stream, offs_t pc, con
break; break;
default: 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); osd_printf_verbose("Illegal Extended Opcode: %X @ %X\n", extended_op, pc);
break; break;
} }

View File

@ -232,71 +232,63 @@ INST(STSP)
INST(PUSH) INST(PUSH)
{ {
uint32_t Set=EXTRACT(Opcode,0,10); uint32_t Set=EXTRACT(Opcode,0,10);
char str[1024]; stream << "PUSH ";
strcpy(str,"PUSH ");
if(Set&(1<<10)) if(Set&(1<<10))
strcat(str,"%PC-"); stream << "%PC-";
if(Set&(1<<9)) if(Set&(1<<9))
strcat(str,"%SR-"); stream << "%SR-";
if(Set&(1<<8)) if(Set&(1<<8))
strcat(str,"%ER-"); stream << "%ER-";
if(Set&(1<<7)) if(Set&(1<<7))
strcat(str,"%R7-"); stream << "%R7-";
if(Set&(1<<6)) if(Set&(1<<6))
strcat(str,"%R6-"); stream << "%R6-";
if(Set&(1<<5)) if(Set&(1<<5))
strcat(str,"%R5-"); stream << "%R5-";
if(Set&(1<<4)) if(Set&(1<<4))
strcat(str,"%R4-"); stream << "%R4-";
if(Set&(1<<3)) if(Set&(1<<3))
strcat(str,"%R3-"); stream << "%R3-";
if(Set&(1<<2)) if(Set&(1<<2))
strcat(str,"%R2-"); stream << "%R2-";
if(Set&(1<<1)) if(Set&(1<<1))
strcat(str,"%R1-"); stream << "%R1-";
if(Set&(1<<0)) if(Set&(1<<0))
strcat(str,"%R0-"); stream << "%R0-";
str[strlen(str)-1]=0;
stream << str;
return 0; return 0;
} }
INST(POP) INST(POP)
{ {
uint32_t Set=EXTRACT(Opcode,0,10); uint32_t Set=EXTRACT(Opcode,0,10);
char str[1024];
int Ret=0; int Ret=0;
strcpy(str,"POP "); stream << "POP ";
if(Set&(1<<0)) if(Set&(1<<0))
strcat(str,"%R0-"); stream << "%R0-";
if(Set&(1<<1)) if(Set&(1<<1))
strcat(str,"%R1-"); stream << "%R1-";
if(Set&(1<<2)) if(Set&(1<<2))
strcat(str,"%R2-"); stream << "%R2-";
if(Set&(1<<3)) if(Set&(1<<3))
strcat(str,"%R3-"); stream << "%R3-";
if(Set&(1<<4)) if(Set&(1<<4))
strcat(str,"%R4-"); stream << "%R4-";
if(Set&(1<<5)) if(Set&(1<<5))
strcat(str,"%R5-"); stream << "%R5-";
if(Set&(1<<6)) if(Set&(1<<6))
strcat(str,"%R6-"); stream << "%R6-";
if(Set&(1<<7)) if(Set&(1<<7))
strcat(str,"%R7-"); stream << "%R7-";
if(Set&(1<<8)) if(Set&(1<<8))
strcat(str,"%ER-"); stream << "%ER-";
if(Set&(1<<9)) if(Set&(1<<9))
strcat(str,"%SR-"); stream << "%SR-";
if(Set&(1<<10)) 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 CLRFLAG(FLAG_E); //Clear the flag, this is a ret so disassemble will start a new E block
Ret=1; Ret=1;
} }
str[strlen(str)-1]=0;
if(Ret)
strcat(str,"\n");
stream << str;
return Ret ? STEP_OUT : 0; return Ret ? STEP_OUT : 0;
} }