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

Commit fc57108b authored by Christopher Ferris's avatar Christopher Ferris Committed by Automerger Merge Worker
Browse files

Merge "Update for new TRAP_PERF value." am: 64a0c467 am: 43fee18c am: 4dd2ca5d 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1753116

Change-Id: I2266c91543c2d4fdb22b57136bebe870c91ded59
parents 47eb7688 4dd2ca5d

debuggerd/libdebuggerd/utility.cpp

+3 −1
Original line number Diff line number Diff line
@@ -402,6 +402,8 @@ const char* get_sigcode(const siginfo_t* si) { 
        case TRAP_HWBKPT: return "TRAP_HWBKPT";

        case TRAP_UNK:

          return "TRAP_UNDIAGNOSED";

        case TRAP_PERF:

          return "TRAP_PERF";

      }

      if ((si->si_code & 0xff) == SIGTRAP) {

        switch ((si->si_code >> 8) & 0xff) {
@@ -423,7 +425,7 @@ const char* get_sigcode(const siginfo_t* si) { 
            return "PTRACE_EVENT_STOP";

        }

      }

      static_assert(NSIGTRAP == TRAP_UNK, "missing TRAP_* si_code");

      static_assert(NSIGTRAP == TRAP_PERF, "missing TRAP_* si_code");

      break;

  }

  // Then the other codes...