Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 711e776c authored by Christopher Ferris's avatar Christopher Ferris Committed by Gerrit Code Review
Browse files

Merge "Display the map offset for each frame."

parents 300b1a6b 60001733

libbacktrace/Backtrace.cpp

+5 −0
Original line number Diff line number Diff line
@@ -102,6 +102,11 @@ std::string Backtrace::FormatFrameData(const backtrace_frame_data_t* frame) { 
  uintptr_t relative_pc = BacktraceMap::GetRelativePc(frame->map, frame->pc);



  std::string line(StringPrintf("#%02zu pc %" PRIPTR "  %s", frame->num, relative_pc, map_name));

  // Special handling for non-zero offset maps, we need to print that

  // information.

  if (frame->map.offset != 0) {

    line += " (offset " + StringPrintf("0x%" PRIxPTR, frame->map.offset) + ")";

  }

  if (!frame->func_name.empty()) {

    line += " (" + frame->func_name;

    if (frame->func_offset) {

libbacktrace/backtrace_test.cpp

+9 −0
Original line number Diff line number Diff line
@@ -823,6 +823,15 @@ TEST(libbacktrace, format_test) { 
  EXPECT_EQ("#01 pc 00000000123456dc  MapFake (ProcFake+645)",

#else

  EXPECT_EQ("#01 pc 123456dc  MapFake (ProcFake+645)",

#endif

            backtrace->FormatFrameData(&frame));



  // Check a non-zero map offset.

  frame.map.offset = 0x1000;

#if defined(__LP64__)

  EXPECT_EQ("#01 pc 00000000123456dc  MapFake (offset 0x1000) (ProcFake+645)",

#else

  EXPECT_EQ("#01 pc 123456dc  MapFake (offset 0x1000) (ProcFake+645)",

#endif

            backtrace->FormatFrameData(&frame));

}