summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRolf Eike Beer <eb@emlix.com>2019-11-15 14:38:00 +0100
committerRolf Eike Beer <eb@emlix.com>2019-11-28 15:57:19 +0100
commit79d86b269258024646ff4982a433c371601c125f (patch)
tree3cfaf14882361e6a50aabc5d94e200091e920ded
parentaf1cec2cda61e27b3a7590b4e2fdfb8d750c03e7 (diff)
masm: drop some excessive newlines in debug messages
The current output would look like this (including the blank lines): [20191115 12:32:37.378 UTC 0xc47cb8 default: Generated BaselineJIT code for [20191115 12:32:37.379 UTC 0xc47cb8 default: function expression for source [20191115 12:32:37.379 UTC 0xc47cb8 default: : [20191115 12:32:37.379 UTC 0xc47cb8 default: Code at [0x671068d1, 0x671069bd): [20191115 12:32:37.379 UTC 0xc47cb8 qt.v4.asm: disassembly not available for range 0x671068d1...0x67106997 [20191115 12:32:37.379 UTC 0xc47cb8 qt.v4.asm: Drop 3 of the newlines to make it not beautiful, but at least not totally verbose. Change-Id: I850b7acede33ddbb5f6ab74fd760962ca18988c8 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
-rw-r--r--src/3rdparty/masm/assembler/LinkBuffer.h5
-rw-r--r--src/3rdparty/masm/disassembler/Disassembler.cpp2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/3rdparty/masm/assembler/LinkBuffer.h b/src/3rdparty/masm/assembler/LinkBuffer.h
index 8e9a3d9c7a..632d1fdbc4 100644
--- a/src/3rdparty/masm/assembler/LinkBuffer.h
+++ b/src/3rdparty/masm/assembler/LinkBuffer.h
@@ -315,13 +315,12 @@ inline typename LinkBufferBase<MacroAssembler, ExecutableOffsetCalculator>::Code
va_start(argList, format);
WTF::dataLogFV(format, argList);
va_end(argList);
- dataLogF(":\n");
dataLogF(
#if OS(WINDOWS)
- " Code at [0x%p, 0x%p):\n",
+ ": Code at [0x%p, 0x%p):",
#else
- " Code at [%p, %p):\n",
+ ": Code at [%p, %p):",
#endif
result.code().executableAddress(), static_cast<char*>(result.code().executableAddress()) + result.size());
disassemble(result.code(), m_size, " ", WTF::dataFile());
diff --git a/src/3rdparty/masm/disassembler/Disassembler.cpp b/src/3rdparty/masm/disassembler/Disassembler.cpp
index 3fed2cdab8..50fe2e23d5 100644
--- a/src/3rdparty/masm/disassembler/Disassembler.cpp
+++ b/src/3rdparty/masm/disassembler/Disassembler.cpp
@@ -36,7 +36,7 @@ void disassemble(const MacroAssemblerCodePtr& codePtr, size_t size, const char*
if (tryToDisassemble(codePtr, size, prefix, out))
return;
- out.printf("%sdisassembly not available for range %p...%p\n", prefix, codePtr.executableAddress(), static_cast<char*>(codePtr.executableAddress()) + size);
+ out.printf("%sdisassembly not available for range %p...%p", prefix, codePtr.executableAddress(), static_cast<char*>(codePtr.executableAddress()) + size);
}
} // namespace JSC