[ProcessWindows] Choose a register context file by prepocessor

[tatyana-krasnukha]

Summary

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

[xbolva00]

Common/CMakeLists.txt

25 ↗

(On Diff #212192)

Maybe add FIXME or TODO to revisit state of https://gitlab.kitware.com/cmake/cmake/issues/15170 ?

[tatyana-krasnukha]

Common/CMakeLists.txt

25 ↗

(On Diff #212192)

I'm not sure we should rollback to that approach also due to the comment

# TODO build these unconditionally as we cannot do cross-debugging or WoW

[compnerd]

Common/CMakeLists.txt

28 ↗

(On Diff #212192)

At this point, I would say its better to just merge it into the main source list.

Common/x64/RegisterContextWindows_x64.h

47 ↗

(On Diff #212192)

Can you push this inside the include guards please?

Common/x86/RegisterContextWindows_x86.h

51 ↗

(On Diff #212192)

Can you sink the check here inside the include guards please?

[labath]

The change looks fine to me. I also agree with @compnerd's comments.

[tatyana-krasnukha]

Addressed comments

[tatyana-krasnukha]

I wonder if directories x86 and x64 are needed. Should I remove them to make hierarchy consistent with D63165?

[labath]

In D65409#1606619, @tatyana-krasnukha wrote:

I wonder if directories x86 and x64 are needed. Should I remove them to make hierarchy consistent with D63165?

I don't have any opinion on that.

lldb/trunk/source/Plugins/Process/Windows/Common/CMakeLists.txt

 
 add_lldb_library(lldbPluginProcessWindowsCommon PLUGIN
   DebuggerThread.cpp
   LocalDebugDelegate.cpp
   ProcessDebugger.cpp
   ProcessWindows.cpp
   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
     lldbHost
     lldbInterpreter
     lldbPluginDynamicLoaderWindowsDYLD
     lldbSymbol
     lldbTarget
     ws2_32
     rpcrt4
   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()

lldb/trunk/source/Plugins/Process/Windows/Common/x64/RegisterContextWindows_x64.h

 //===-- RegisterContextWindows_x64.h ----------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #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"
 
 namespace lldb_private {
 
 class Thread;
 
 class RegisterContextWindows_x64 : public RegisterContextWindows {
public:
   bool ReadRegister(const RegisterInfo *reg_info,
                     RegisterValue &reg_value) override;
 
   bool WriteRegister(const RegisterInfo *reg_info,
                      const RegisterValue &reg_value) override;
 };
 }
 
+#endif // defined(__x86_64__) || defined(__amd64__) || defined(_M_X64) || defined(_M_AMD64)
+
 #endif // #ifndef liblldb_RegisterContextWindows_x64_H_

lldb/trunk/source/Plugins/Process/Windows/Common/x64/RegisterContextWindows_x64.cpp

 //===-- RegisterContextWindows_x64.cpp --------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
+#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"
 #include "lldb/Utility/Status.h"
 #include "lldb/lldb-private-types.h"
 
 #include "RegisterContextWindows_x64.h"
 #include "Plugins/Process/Utility/RegisterContext_x86.h"
case lldb_xmm15_x86_64:
     break;
   }
 
   // Physically update the registers in the target process.
   TargetThreadWindows &wthread = static_cast<TargetThreadWindows &>(m_thread);
   return ::SetThreadContext(
       wthread.GetHostThread().GetNativeThread().GetSystemHandle(), &m_context);
 }
+
+#endif // defined(__x86_64__) || defined(__amd64__) || defined(_M_X64) || defined(_M_AMD64)

lldb/trunk/source/Plugins/Process/Windows/Common/x86/RegisterContextWindows_x86.h

 //===-- RegisterContextWindows_x86.h ----------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef liblldb_RegisterContextWindows_x86_H_
 #define liblldb_RegisterContextWindows_x86_H_
 
+#if defined(__i386__) || defined(_M_IX86)
+
 #include "RegisterContextWindows.h"
 #include "lldb/lldb-forward.h"
 
 namespace lldb_private {
 
 class Thread;
 
 class RegisterContextWindows_x86 : public RegisterContextWindows {
bool WriteRegister(const RegisterInfo *reg_info,
                      const RegisterValue &reg_value) override;
 
 private:
   bool ReadRegisterHelper(DWORD flags_required, const char *reg_name,
                           DWORD value, RegisterValue &reg_value) const;
 };
 }
 
+#endif // defined(__i386__) || defined(_M_IX86)
+
 #endif // #ifndef liblldb_RegisterContextWindows_x86_H_

lldb/trunk/source/Plugins/Process/Windows/Common/x86/RegisterContextWindows_x86.cpp

 //===-- RegisterContextWindows_x86.cpp --------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
+#if defined(__i386__) || defined(_M_IX86)
+
 #include "lldb/Host/windows/HostThreadWindows.h"
 #include "lldb/Host/windows/windows.h"
 #include "lldb/Utility/RegisterValue.h"
 #include "lldb/Utility/Status.h"
 #include "lldb/lldb-private-types.h"
 
 #include "ProcessWindowsLog.h"
 #include "RegisterContextWindows_x86.h"
bool RegisterContextWindows_x86::ReadRegisterHelper(
   if ((m_context.ContextFlags & flags_required) != flags_required) {
     LLDB_LOG(log, "Thread context doesn't have {0}", reg_name);
     return false;
   }
   LLDB_LOG(log, "Read value {0:x} from {1}", value, reg_name);
   reg_value.SetUInt32(value);
   return true;
 }
+
+#endif // defined(__i386__) || defined(_M_IX86)