diff options
author | 2015-05-02 19:41:03 +0200 | |
---|---|---|
committer | 2015-05-02 19:41:03 +0200 | |
commit | cc3b682e52bf097d31db78032aad01d6a0b12e94 (patch) | |
tree | 860c97ca011b64c31a5ad277f5cea2b1d86eeaf0 /src/emu/cpu/dsp56k/opcode.c | |
parent | 7df6a23ba2ae1c1df94ed8cc2398f2546f339997 (diff) | |
parent | a649a95488e1fc85813dda747dc74c596496bd1c (diff) |
Merge pull request #1 from mamedev/master
Sync to master
Diffstat (limited to 'src/emu/cpu/dsp56k/opcode.c')
-rw-r--r-- | src/emu/cpu/dsp56k/opcode.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/emu/cpu/dsp56k/opcode.c b/src/emu/cpu/dsp56k/opcode.c index 58ade2b7b30..7943736580c 100644 --- a/src/emu/cpu/dsp56k/opcode.c +++ b/src/emu/cpu/dsp56k/opcode.c @@ -16,7 +16,7 @@ Opcode::~Opcode() } -astring Opcode::disassemble() const +std::string Opcode::disassemble() const { // Duck out early if there isn't a valid op if (!m_instruction) @@ -29,8 +29,8 @@ astring Opcode::disassemble() const return dcString(); // Disassemble what you can. - astring opString = ""; - astring pmString = ""; + std::string opString = ""; + std::string pmString = ""; if (m_instruction) m_instruction->disassemble(opString); if (m_parallelMove) m_parallelMove->disassemble(pmString); @@ -68,11 +68,11 @@ const reg_id& Opcode::instSource() const { return m_instruction->source(); } const reg_id& Opcode::instDestination() const { return m_instruction->destination(); } const size_t Opcode::instAccumulatorBitsModified() const { return m_instruction->accumulatorBitsModified(); } -astring Opcode::dcString() const +std::string Opcode::dcString() const { char tempStr[1024]; sprintf(tempStr, "dc $%x", m_word0); - return astring(tempStr); + return std::string(tempStr); } } |