1 files changed, 89 insertions, 18 deletions

diff --git a/lldb/source/Plugins/Process/Linux/ProcessMessage.h b/lldb/source/Plugins/Process/Linux/ProcessMessage.h
index b13321ef6f5..5162d30825c 100644
--- a/lldb/source/Plugins/Process/Linux/ProcessMessage.h
+++ b/lldb/source/Plugins/Process/Linux/ProcessMessage.h
@@ -26,63 +26,134 @@ public:
         eExitMessage,
         eLimboMessage,
         eSignalMessage,
+        eSignalDeliveredMessage,
         eTraceMessage,
-        eBreakpointMessage
+        eBreakpointMessage,
+        eCrashMessage
+    };
+
+    enum CrashReason
+    {
+        eInvalidCrashReason,
+
+        // SIGSEGV crash reasons.
+        eInvalidAddress,
+        ePrivilegedAddress,
+
+        // SIGILL crash reasons.
+        eIllegalOpcode,
+        eIllegalOperand,
+        eIllegalAddressingMode,
+        eIllegalTrap,
+        ePrivilegedOpcode,
+        ePrivilegedRegister,
+        eCoprocessorError,
+        eInternalStackError,
+
+        // SIGBUS crash reasons,
+        eIllegalAlignment,
+        eIllegalAddress,
+        eHardwareError,
+
+        // SIGFPE crash reasons,
+        eIntegerDivideByZero,
+        eIntegerOverflow,
+        eFloatDivideByZero,
+        eFloatOverflow,
+        eFloatUnderflow,
+        eFloatInexactResult,
+        eFloatInvalidOperation,
+        eFloatSubscriptRange
     };
 
     ProcessMessage()
-        : m_kind(eInvalidMessage),
-          m_tid(LLDB_INVALID_PROCESS_ID),
-          m_data(0) { }
+        : m_tid(LLDB_INVALID_PROCESS_ID),
+          m_kind(eInvalidMessage),
+          m_crash_reason(eInvalidCrashReason),
+          m_status(0),
+          m_addr(0) { }
 
     Kind GetKind() const { return m_kind; }
 
     lldb::tid_t GetTID() const { return m_tid; }
 
-    static ProcessMessage Exit(lldb::tid_t tid, int status) {
-        return ProcessMessage(tid, eExitMessage, status);
-    }
-
+    /// Indicates that the thread @p tid is about to exit with status @p status.
     static ProcessMessage Limbo(lldb::tid_t tid, int status) {
         return ProcessMessage(tid, eLimboMessage, status);
     }
 
+    /// Indicates that the thread @p tid had the signal @p signum delivered.
     static ProcessMessage Signal(lldb::tid_t tid, int signum) {
         return ProcessMessage(tid, eSignalMessage, signum);
     }
 
+    /// Indicates that a signal @p signum generated by the debugging process was
+    /// delivered to the thread @p tid.
+    static ProcessMessage SignalDelivered(lldb::tid_t tid, int signum) {
+        return ProcessMessage(tid, eSignalDeliveredMessage, signum);
+    }
+
+    /// Indicates that the thread @p tid encountered a trace point.
     static ProcessMessage Trace(lldb::tid_t tid) {
         return ProcessMessage(tid, eTraceMessage);
     }
 
+    /// Indicates that the thread @p tid encountered a break point.
     static ProcessMessage Break(lldb::tid_t tid) {
         return ProcessMessage(tid, eBreakpointMessage);
     }
 
+    /// Indicates that the thread @p tid crashed.
+    static ProcessMessage Crash(lldb::pid_t pid, CrashReason reason,
+                                int signo, lldb::addr_t fault_addr) {
+        ProcessMessage message(pid, eCrashMessage, signo, fault_addr);
+        message.m_crash_reason = reason;
+        return message;
+    }
+
     int GetExitStatus() const {
         assert(GetKind() == eExitMessage || GetKind() == eLimboMessage);
-        return m_data;
+        return m_status;
     }
 
     int GetSignal() const {
-        assert(GetKind() == eSignalMessage);
-        return m_data;
+        assert(GetKind() == eSignalMessage || GetKind() == eCrashMessage ||
+               GetKind() == eSignalDeliveredMessage);
+        return m_status;
     }
 
     int GetStopStatus() const {
         assert(GetKind() == eSignalMessage);
-        return m_data;
+        return m_status;
+    }
+
+    CrashReason GetCrashReason() const {
+        assert(GetKind() == eCrashMessage);
+        return m_crash_reason;
     }
 
+    lldb::addr_t GetFaultAddress() const {
+        assert(GetKind() == eCrashMessage);
+        return m_addr;
+    }
+
+    static const char *
+    GetCrashReasonString(CrashReason reason);
+
 private:
-    ProcessMessage(lldb::tid_t tid, Kind kind, int data = 0)
-        : m_kind(kind),
-          m_tid(tid),
-          m_data(data) { }
+    ProcessMessage(lldb::tid_t tid, Kind kind, 
+                   int status = 0, lldb::addr_t addr = 0)
+        : m_tid(tid),
+          m_kind(kind),
+          m_crash_reason(eInvalidCrashReason),
+          m_status(status),
+          m_addr(addr) { }
 
-    Kind m_kind;
     lldb::tid_t m_tid;
-    int m_data;
+    Kind        m_kind         : 8;
+    CrashReason m_crash_reason : 8;
+    int m_status;
+    lldb::addr_t m_addr;
 };
 
 #endif // #ifndef liblldb_ProcessMessage_H_