Skip to content

Commit

Permalink
[libunwind] reflow some debug logs for better greppability
Browse files Browse the repository at this point in the history
"bad second level page" and "second level compressed unwind table"
can now be grepped for.

(Also remove one of the two spaces between "second" and "level"
in the second message.)
  • Loading branch information
nico committed Jul 4, 2021
1 parent 3f9bf9f commit 7cdd768
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions libunwind/src/UnwindCursor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1737,14 +1737,16 @@ bool UnwindCursor<A, R>::getInfoFromCompactEncodingSection(pint_t pc,
else
funcEnd = firstLevelNextPageFunctionOffset + sects.dso_base;
if (pc < funcStart) {
_LIBUNWIND_DEBUG_LOG("malformed __unwind_info, pc=0x%llX not in second "
"level compressed unwind table. funcStart=0x%llX",
_LIBUNWIND_DEBUG_LOG("malformed __unwind_info, pc=0x%llX "
"not in second level compressed unwind table. "
"funcStart=0x%llX",
(uint64_t) pc, (uint64_t) funcStart);
return false;
}
if (pc > funcEnd) {
_LIBUNWIND_DEBUG_LOG("malformed __unwind_info, pc=0x%llX not in second "
"level compressed unwind table. funcEnd=0x%llX",
_LIBUNWIND_DEBUG_LOG("malformed __unwind_info, pc=0x%llX "
"not in second level compressed unwind table. "
"funcEnd=0x%llX",
(uint64_t) pc, (uint64_t) funcEnd);
return false;
}
Expand All @@ -1764,9 +1766,9 @@ bool UnwindCursor<A, R>::getInfoFromCompactEncodingSection(pint_t pc,
pageEncodingIndex * sizeof(uint32_t));
}
} else {
_LIBUNWIND_DEBUG_LOG("malformed __unwind_info at 0x%0llX bad second "
"level page",
(uint64_t) sects.compact_unwind_section);
_LIBUNWIND_DEBUG_LOG(
"malformed __unwind_info at 0x%0llX bad second level page",
(uint64_t)sects.compact_unwind_section);
return false;
}

Expand Down

0 comments on commit 7cdd768

Please sign in to comment.