Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-05 08:41:31 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

'void append_indirect(...std::string &)' didn't actually append; changed to 'std::string get_indirect(...'

Browse Source
This commit is contained in:
Nathan Woods 2016-11-18 16:44:30 -05:00
parent 75065cdd9e
commit 47486241b5
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/devices/cpu/tms32031/dis32031.cpp
View File

@ -172,11 +172,11 @@ static void append_indirect(uint8_t ma, int8_t disp, std::ostream &stream)
} }
} }
static void append_indirect(uint8_t ma, int8_t disp, std::string &string) static std::string get_indirect(uint8_t ma, int8_t disp)
{ {
std::ostringstream stream; std::ostringstream stream;
append_indirect(ma, disp, stream); append_indirect(ma, disp, stream);
string = stream.str(); return stream.str();
} }
static void append_immediate(uint16_t data, int is_float, int is_unsigned, std::ostream &stream) static void append_immediate(uint16_t data, int is_float, int is_unsigned, std::ostream &stream)
@ -306,10 +306,8 @@ static void disasm_parallel_3op3op(const char *opstring1, const char *opstring2,
src[1].assign(regname[(op >> 19) & 7]); src[1].assign(regname[(op >> 19) & 7]);
src[2].assign(regname[(op >> 16) & 7]); src[2].assign(regname[(op >> 16) & 7]);
src[3] = get_indirect(op >> 8, 1);
append_indirect(op >> 8, 1, src[3]); src[4] = get_indirect(op, 1);
append_indirect(op, 1, src[4]);
util::stream_format(stream, "%s %s,%s,R%d || %s %s,%s,R%d", util::stream_format(stream, "%s %s,%s,R%d || %s %s,%s,R%d",
opstring1, src[s[0]], src[s[1]], d1, opstring1, src[s[0]], src[s[1]], d1,
@ -322,11 +320,9 @@ static void disasm_parallel_3opstore(const char *opstring1, const char *opstring
int d1 = (op >> 22) & 7; int d1 = (op >> 22) & 7;
int s1 = (op >> 19) & 7; int s1 = (op >> 19) & 7;
int s3 = (op >> 16) & 7; int s3 = (op >> 16) & 7;
std::string dst2, src2;
append_indirect(op >> 8, 1, dst2); std::string dst2 = get_indirect(op >> 8, 1);
std::string src2 = get_indirect(op, 1);
append_indirect(op, 1, src2);
if (!(flags & NOSOURCE1)) if (!(flags & NOSOURCE1))
util::stream_format(stream, "%s R%d,%s,R%d || %s R%d,%s", util::stream_format(stream, "%s R%d,%s,R%d || %s R%d,%s",
@ -343,11 +339,9 @@ static void disasm_parallel_loadload(const char *opstring1, const char *opstring
{ {
int d2 = (op >> 22) & 7; int d2 = (op >> 22) & 7;
int d1 = (op >> 19) & 7; int d1 = (op >> 19) & 7;
std::string src1, src2;
append_indirect(op >> 8, 1, src1); std::string src1 = get_indirect(op >> 8, 1);
std::string src2 = get_indirect(op >> 0, 1);
append_indirect(op, 1, src2);
util::stream_format(stream, "%s %s,R%d || %s %s,R%d", util::stream_format(stream, "%s %s,R%d || %s %s,R%d",
opstring1, src2, d2, opstring1, src2, d2,
@ -359,11 +353,9 @@ static void disasm_parallel_storestore(const char *opstring1, const char *opstri
{ {
int s2 = (op >> 22) & 7; int s2 = (op >> 22) & 7;
int s1 = (op >> 16) & 7; int s1 = (op >> 16) & 7;
std::string dst1, dst2;
append_indirect(op >> 8, 1, dst1); std::string dst1 = get_indirect(op >> 8, 1);
std::string dst2 = get_indirect(op, 1);
append_indirect(op, 1, dst2);
util::stream_format(stream, "%s R%d,%s || %s R%d,%s", util::stream_format(stream, "%s R%d,%s || %s R%d,%s",
opstring1, s2, dst2, opstring1, s2, dst2,