[Lldb-commits] [PATCH] D65409: [ProcessWindows] Choose a register context file by prepocessor
Tatyana Krasnukha via Phabricator via lldb-commits
lldb-commits at lists.llvm.org
Mon Jul 29 10:44:51 PDT 2019
tatyana-krasnukha created this revision.
tatyana-krasnukha added reviewers: compnerd, labath.
tatyana-krasnukha added a project: LLDB.
Herald added subscribers: lldb-commits, mgorny.
Replaced Cmake option based check with the preprocessor macro as CMAKE_SYSTEM_PROCESSOR doesn't work as expected on Windows.
https://bugs.llvm.org/show_bug.cgi?id=42724
Repository:
rLLDB LLDB
https://reviews.llvm.org/D65409
Files:
Common/CMakeLists.txt
Common/x64/RegisterContextWindows_x64.cpp
Common/x64/RegisterContextWindows_x64.h
Common/x86/RegisterContextWindows_x86.cpp
Common/x86/RegisterContextWindows_x86.h
Index: Common/x86/RegisterContextWindows_x86.h
===================================================================
--- Common/x86/RegisterContextWindows_x86.h
+++ Common/x86/RegisterContextWindows_x86.h
@@ -6,6 +6,8 @@
//
//===----------------------------------------------------------------------===//
+#if defined(__i386__) || defined(_M_IX86)
+
#ifndef liblldb_RegisterContextWindows_x86_H_
#define liblldb_RegisterContextWindows_x86_H_
@@ -45,3 +47,5 @@
}
#endif // #ifndef liblldb_RegisterContextWindows_x86_H_
+
+#endif // defined(__i386__) || defined(_M_IX86)
Index: Common/x86/RegisterContextWindows_x86.cpp
===================================================================
--- Common/x86/RegisterContextWindows_x86.cpp
+++ 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: Common/x64/RegisterContextWindows_x64.h
===================================================================
--- Common/x64/RegisterContextWindows_x64.h
+++ Common/x64/RegisterContextWindows_x64.h
@@ -6,6 +6,8 @@
//
//===----------------------------------------------------------------------===//
+#if defined(__x86_64__) || defined(__amd64__) || defined(_M_X64) || defined(_M_AMD64)
+
#ifndef liblldb_RegisterContextWindows_x64_H_
#define liblldb_RegisterContextWindows_x64_H_
@@ -41,3 +43,5 @@
}
#endif // #ifndef liblldb_RegisterContextWindows_x64_H_
+
+#endif // defined(__x86_64__) || defined(__amd64__) || defined(_M_X64) || defined(_M_AMD64)
Index: Common/x64/RegisterContextWindows_x64.cpp
===================================================================
--- Common/x64/RegisterContextWindows_x64.cpp
+++ 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)
Index: Common/CMakeLists.txt
===================================================================
--- Common/CMakeLists.txt
+++ Common/CMakeLists.txt
@@ -22,11 +22,7 @@
)
# 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()
+target_sources(lldbPluginProcessWindowsCommon PRIVATE
+ x64/RegisterContextWindows_x64.cpp)
+target_sources(lldbPluginProcessWindowsCommon PRIVATE
+ x86/RegisterContextWindows_x86.cpp)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D65409.212192.patch
Type: text/x-patch
Size: 3406 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20190729/c4dbe921/attachment.bin>
More information about the lldb-commits
mailing list