This revision was automatically updated to reflect the committed changes.
Closed by commit rL367414: [ProcessWindows] Choose a register context file by
preprocessor (authored by tkrasnukha, committed by ).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.
Changed prior to commit:
https://reviews.llvm.org/D65409?vs=212363&id=212553#toc
Repository:
rL LLVM
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D65409/new/
https://reviews.llvm.org/D65409
Files:
lldb/trunk/source/Plugins/Process/Windows/Common/CMakeLists.txt
lldb/trunk/source/Plugins/Process/Windows/Common/x64/RegisterContextWindows_x64.cpp
lldb/trunk/source/Plugins/Process/Windows/Common/x64/RegisterContextWindows_x64.h
lldb/trunk/source/Plugins/Process/Windows/Common/x86/RegisterContextWindows_x86.cpp
lldb/trunk/source/Plugins/Process/Windows/Common/x86/RegisterContextWindows_x86.h
Index: lldb/trunk/source/Plugins/Process/Windows/Common/CMakeLists.txt
===================================================================
--- lldb/trunk/source/Plugins/Process/Windows/Common/CMakeLists.txt
+++ lldb/trunk/source/Plugins/Process/Windows/Common/CMakeLists.txt
@@ -7,6 +7,9 @@
ProcessWindowsLog.cpp
RegisterContextWindows.cpp
TargetThreadWindows.cpp
+ x64/RegisterContextWindows_x64.cpp
+ x86/RegisterContextWindows_x86.cpp
+ # TODO add support for ARM (NT) and ARM64
LINK_LIBS
lldbCore
@@ -20,13 +23,3 @@
LINK_COMPONENTS
Support
)
-
-# TODO add support for ARM (NT) and ARM64
-# TODO build these unconditionally as we cannot do cross-debugging or WoW
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64")
- target_sources(lldbPluginProcessWindowsCommon PRIVATE
- x64/RegisterContextWindows_x64.cpp)
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i?86|X86")
- target_sources(lldbPluginProcessWindowsCommon PRIVATE
- x86/RegisterContextWindows_x86.cpp)
-endif()
Index: lldb/trunk/source/Plugins/Process/Windows/Common/x86/RegisterContextWindows_x86.cpp
===================================================================
--- lldb/trunk/source/Plugins/Process/Windows/Common/x86/RegisterContextWindows_x86.cpp
+++ lldb/trunk/source/Plugins/Process/Windows/Common/x86/RegisterContextWindows_x86.cpp
@@ -6,6 +6,8 @@
//
//===----------------------------------------------------------------------===//
+#if defined(__i386__) || defined(_M_IX86)
+
#include "lldb/Host/windows/HostThreadWindows.h"
#include "lldb/Host/windows/windows.h"
#include "lldb/Utility/RegisterValue.h"
@@ -282,3 +284,5 @@
reg_value.SetUInt32(value);
return true;
}
+
+#endif // defined(__i386__) || defined(_M_IX86)
Index: lldb/trunk/source/Plugins/Process/Windows/Common/x86/RegisterContextWindows_x86.h
===================================================================
--- lldb/trunk/source/Plugins/Process/Windows/Common/x86/RegisterContextWindows_x86.h
+++ lldb/trunk/source/Plugins/Process/Windows/Common/x86/RegisterContextWindows_x86.h
@@ -9,6 +9,8 @@
#ifndef liblldb_RegisterContextWindows_x86_H_
#define liblldb_RegisterContextWindows_x86_H_
+#if defined(__i386__) || defined(_M_IX86)
+
#include "RegisterContextWindows.h"
#include "lldb/lldb-forward.h"
@@ -44,4 +46,6 @@
};
}
+#endif // defined(__i386__) || defined(_M_IX86)
+
#endif // #ifndef liblldb_RegisterContextWindows_x86_H_
Index: lldb/trunk/source/Plugins/Process/Windows/Common/x64/RegisterContextWindows_x64.h
===================================================================
--- lldb/trunk/source/Plugins/Process/Windows/Common/x64/RegisterContextWindows_x64.h
+++ lldb/trunk/source/Plugins/Process/Windows/Common/x64/RegisterContextWindows_x64.h
@@ -9,6 +9,8 @@
#ifndef liblldb_RegisterContextWindows_x64_H_
#define liblldb_RegisterContextWindows_x64_H_
+#if defined(__x86_64__) || defined(__amd64__) || defined(_M_X64) || defined(_M_AMD64)
+
#include "RegisterContextWindows.h"
#include "lldb/lldb-forward.h"
@@ -40,4 +42,6 @@
};
}
+#endif // defined(__x86_64__) || defined(__amd64__) || defined(_M_X64) || defined(_M_AMD64)
+
#endif // #ifndef liblldb_RegisterContextWindows_x64_H_
Index: lldb/trunk/source/Plugins/Process/Windows/Common/x64/RegisterContextWindows_x64.cpp
===================================================================
--- lldb/trunk/source/Plugins/Process/Windows/Common/x64/RegisterContextWindows_x64.cpp
+++ lldb/trunk/source/Plugins/Process/Windows/Common/x64/RegisterContextWindows_x64.cpp
@@ -6,6 +6,8 @@
//
//===----------------------------------------------------------------------===//
+#if defined(__x86_64__) || defined(__amd64__) || defined(_M_X64) || defined(_M_AMD64)
+
#include "lldb/Host/windows/HostThreadWindows.h"
#include "lldb/Host/windows/windows.h"
#include "lldb/Utility/RegisterValue.h"
@@ -534,3 +536,5 @@
return ::SetThreadContext(
wthread.GetHostThread().GetNativeThread().GetSystemHandle(), &m_context);
}
+
+#endif // defined(__x86_64__) || defined(__amd64__) || defined(_M_X64) || defined(_M_AMD64)
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
