am dc9ac844: am 2071b983: Merge "debugger.cpp should know the names of the signals it catches."

* commit 'dc9ac8449cee4d6ddb9afa57c730e8b3aedb83a5':
  debugger.cpp should know the names of the signals it catches.
This commit is contained in:
Elliott Hughes 2014-05-17 00:19:59 +00:00 committed by Android Git Automerger
commit 0a26974e52

View File

@ -121,10 +121,6 @@ static void log_signal_summary(int signum, const siginfo_t* info) {
const char* signal_name = "???"; const char* signal_name = "???";
bool has_address = false; bool has_address = false;
switch (signum) { switch (signum) {
case SIGILL:
signal_name = "SIGILL";
has_address = true;
break;
case SIGABRT: case SIGABRT:
signal_name = "SIGABRT"; signal_name = "SIGABRT";
break; break;
@ -136,6 +132,13 @@ static void log_signal_summary(int signum, const siginfo_t* info) {
signal_name = "SIGFPE"; signal_name = "SIGFPE";
has_address = true; has_address = true;
break; break;
case SIGILL:
signal_name = "SIGILL";
has_address = true;
break;
case SIGPIPE:
signal_name = "SIGPIPE";
break;
case SIGSEGV: case SIGSEGV:
signal_name = "SIGSEGV"; signal_name = "SIGSEGV";
has_address = true; has_address = true;
@ -145,8 +148,8 @@ static void log_signal_summary(int signum, const siginfo_t* info) {
signal_name = "SIGSTKFLT"; signal_name = "SIGSTKFLT";
break; break;
#endif #endif
case SIGPIPE: case SIGTRAP:
signal_name = "SIGPIPE"; signal_name = "SIGTRAP";
break; break;
} }