1 files changed, 40 insertions, 16 deletions

diff --git a/lldb/source/Plugins/Process/Windows/MiniDump/ThreadWinMiniDump.cpp b/lldb/source/Plugins/Process/Windows/MiniDump/ThreadWinMiniDump.cpp
index 37edddabbf0..ddcd15b1ae1 100644
--- a/lldb/source/Plugins/Process/Windows/MiniDump/ThreadWinMiniDump.cpp
+++ b/lldb/source/Plugins/Process/Windows/MiniDump/ThreadWinMiniDump.cpp
@@ -9,12 +9,16 @@
 
 #include "ThreadWinMiniDump.h"
 
-// Windows includes
+#include "lldb/Host/HostInfo.h"
 #include "lldb/Host/windows/windows.h"
 #include <DbgHelp.h>
 
 #include "ProcessWinMiniDump.h"
-#include "RegisterContextWindowsMiniDump.h"
+#if defined(_WIN64)
+#include "x64/RegisterContextWindowsMiniDump_x64.h"
+#else
+#include "x86/RegisterContextWindowsMiniDump_x86.h"
+#endif
 
 using namespace lldb;
 using namespace lldb_private;
@@ -22,9 +26,15 @@ using namespace lldb_private;
 // This is a minimal implementation in order to get something running.  It will
 // be fleshed out as more mini-dump functionality is added.
 
+class ThreadWinMiniDump::Data {
+  public:
+    Data() : m_context(nullptr) {}
+    const CONTEXT *m_context;
+};
+
 ThreadWinMiniDump::ThreadWinMiniDump(lldb_private::Process &process, lldb::tid_t tid) :
     Thread(process, tid),
-    m_thread_name()
+    m_data(new Data)
 {
 }
 
@@ -50,7 +60,26 @@ lldb::RegisterContextSP
 ThreadWinMiniDump::CreateRegisterContextForFrame(lldb_private::StackFrame *frame)
 {
     const uint32_t concrete_frame_idx = (frame) ? frame->GetConcreteFrameIndex() : 0;
-    RegisterContextSP reg_ctx_sp(new RegisterContextWindowsMiniDump(*this, concrete_frame_idx));
+    RegisterContextSP reg_ctx_sp;
+    ArchSpec arch = HostInfo::GetArchitecture();
+    switch (arch.GetMachine())
+    {
+        case llvm::Triple::x86:
+#if defined(_WIN64)
+            // FIXME: This is a Wow64 process, create a RegisterContextWindows_Wow64
+#else
+            reg_ctx_sp.reset(new RegisterContextWindowsMiniDump_x86(*this, concrete_frame_idx, m_data->m_context));
+#endif
+            break;
+        case llvm::Triple::x86_64:
+#if defined(_WIN64)
+            reg_ctx_sp.reset(new RegisterContextWindowsMiniDump_x64(*this, concrete_frame_idx, m_data->m_context));
+#else
+            // LLDB is 32-bit, but the target process is 64-bit.  We probably can't debug this.
+#endif
+        default:
+            break;
+    }
     return reg_ctx_sp;
 }
 
@@ -59,22 +88,17 @@ ThreadWinMiniDump::ClearStackFrames()
 {
 }
 
-const char *
-ThreadWinMiniDump::GetName()
-{
-    return m_thread_name.empty() ? nullptr : m_thread_name.c_str();
-}
-
 void
-ThreadWinMiniDump::SetName(const char *name)
+ThreadWinMiniDump::SetContext(const void *context)
 {
-    if (name && name[0])
-        m_thread_name.assign(name);
-    else
-        m_thread_name.clear();
+    if (m_data)
+    {
+        m_data->m_context = static_cast<const CONTEXT *>(context);
+    }
 }
 
-bool ThreadWinMiniDump::CalculateStopInfo()
+bool
+ThreadWinMiniDump::CalculateStopInfo()
 {
     return false;
 }