Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 00:39:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

cpu/dsp56156: Updated string formatting code. (#10933)

Browse Source
This commit is contained in:
Erik 2023-02-26 17:46:37 +00:00 committed by GitHub
parent 7db4b4df13
commit 479636d22d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 295 additions and 425 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

663
src/devices/cpu/dsp56156/inst.h
View File

File diff suppressed because it is too large Load Diff

10
src/devices/cpu/dsp56156/opcode.cpp
View File

@ -32,10 +32,8 @@ std::string Opcode::disassemble() const
return dcString();
// Disassemble what you can.
std::string opString = "";
std::string pmString = "";
if (m_instruction) m_instruction->disassemble(opString);
if (m_parallelMove) m_parallelMove->disassemble(pmString);
auto opString = m_instruction ? m_instruction->disassemble() : "";
auto pmString = m_parallelMove ? m_parallelMove->disassemble() : "";
return opString + " " + pmString;
}
@ -73,9 +71,7 @@ size_t Opcode::instAccumulatorBitsModified() const { return m_instruction->accum
std::string Opcode::dcString() const
{
char tempStr[1024];
sprintf(tempStr, "dc $%x", m_word0);
return std::string(tempStr);
return util::string_format("dc $%x", m_word0);
}
}

47
src/devices/cpu/dsp56156/pmove.h
View File

@ -20,7 +20,7 @@ public:
virtual ~ParallelMove() {}
virtual bool decode(const uint16_t word0, const uint16_t word1) = 0;
virtual void disassemble(std::string& retString) const = 0;
virtual std::string disassemble() const = 0;
virtual void evaluate() = 0;
static std::unique_ptr<ParallelMove> decodeParallelMove(const Opcode* opc, const uint16_t word0, const uint16_t word1);
@ -70,9 +70,9 @@ public:
return true;
}
void disassemble(std::string& retString) const override
std::string disassemble() const override
{
retString = m_source + "," + m_destination;
return m_source + "," + m_destination;
}
void evaluate() override {}
@ -112,9 +112,9 @@ public:
return true;
}
void disassemble(std::string& retString) const override
std::string disassemble() const override
{
retString = m_source + "," + m_destination;
return m_source + "," + m_destination;
}
void evaluate() override {}
@ -158,17 +158,14 @@ public:
/* D1 and D2 may not specify the same register : A-142 */
if (r == iR3) return false;
char temp[32];
sprintf(temp, "X:%s,%s", ea1.c_str(), regIdAsString(D1).c_str());
parallelMove = temp;
sprintf(temp, "X:%s,%s", ea2.c_str(), regIdAsString(D2).c_str());
parallelMove2 = temp;
parallelMove = util::string_format("X:%s,%s", ea1, regIdAsString(D1));
parallelMove2 = util::string_format("X:%s,%s", ea2, regIdAsString(D2));
return true;
}
void disassemble(std::string& retString) const override
std::string disassemble() const override
{
retString = parallelMove + " " + parallelMove2;
return parallelMove + " " + parallelMove2;
}
void evaluate() override {}
@ -213,13 +210,13 @@ public:
return true;
}
void disassemble(std::string& retString) const override
std::string disassemble() const override
{
// (?,?) is a parallel nop
if (m_source == iWEIRD && m_destination == iWEIRD)
retString = "";
return "";
else
retString = regIdAsString(m_source) + "," + regIdAsString(m_destination);
return regIdAsString(m_source) + "," + regIdAsString(m_destination);
}
void evaluate() override {}
@ -244,8 +241,6 @@ public:
reg_id r;
reg_id S;
reg_id Dnot;
char parallel_move_str[128];
char parallel_move_str2[128];
if (opDestination() == iA) Dnot = iB;
else Dnot = iA;
@ -254,15 +249,13 @@ public:
decode_RR_table(BITSn(word0,0x00c0), r);
decode_DD_table(BITSn(word0,0x0030), S);
sprintf(parallel_move_str, "%s,X:(R%d)+N%d", regIdAsString(Dnot).c_str(), regIDAsNum(r), regIDAsNum(r));
sprintf(parallel_move_str2, "%s,%s", regIdAsString(S).c_str(), regIdAsString(Dnot).c_str());
pms = parallel_move_str;
pms2 = parallel_move_str2;
pms = util::string_format("%s,X:(R%d)+N%d", regIdAsString(Dnot), regIDAsNum(r), regIDAsNum(r));
pms2 = util::string_format("%s,%s", regIdAsString(S), regIdAsString(Dnot));
return true;
}
void disassemble(std::string& retString) const override
std::string disassemble() const override
{
retString = pms + " " + pms2;
return pms + " " + pms2;
}
void evaluate() override {}
@ -289,9 +282,9 @@ public:
return true;
}
void disassemble(std::string& retString) const override
std::string disassemble() const override
{
retString = m_ea;
return m_ea;
}
void evaluate() override {}
@ -320,9 +313,9 @@ public:
return true;
}
void disassemble(std::string& retString) const override
std::string disassemble() const override
{
retString = m_source + "," + m_destination;
return m_source + "," + m_destination;
}
void evaluate() override {}