ARMv7: partial disasm functionality, bugfix

This commit is contained in:
Nekotekina
2015-02-05 02:52:47 +03:00
parent e3f55a75a3
commit 819c955cca
9 changed files with 651 additions and 100 deletions
+5 -1
View File
@@ -112,7 +112,11 @@ struct FileListener : LogListener
if (msg.mType == Log::TTY)
{
text = fmt::escape(text) + "\n";
text = fmt::escape(text);
if (text[text.length() - 1] != '\n')
{
text += '\n';
}
}
}
mFile.Write(text);
+2 -2
View File
@@ -355,7 +355,7 @@ std::string fmt::escape(std::string source)
{ "\a", "\\a" },
{ "\b", "\\b" },
{ "\f", "\\f" },
{ "\n", "\\n" },
{ "\n", "\\n\n" },
{ "\r", "\\r" },
{ "\t", "\\t" },
{ "\v", "\\v" },
@@ -365,7 +365,7 @@ std::string fmt::escape(std::string source)
for (char c = 0; c < 32; c++)
{
source = fmt::replace_all(source, std::string(1, c), fmt::Format("\\x%02X", c));
if (c != '\n') source = fmt::replace_all(source, std::string(1, c), fmt::Format("\\x%02X", c));
}
return source;