[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

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

[tatyana-krasnukha]

Common/CMakeLists.txt

25

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

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

Common/x64/RegisterContextWindows_x64.h

47

Can you push this inside the include guards please?

Common/x86/RegisterContextWindows_x86.h

51

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.

Common/CMakeLists.txt

   )
 
 # 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)
+  x86/RegisterContextWindows_x86.cpp)

Common/x64/RegisterContextWindows_x64.h

 //
 //===----------------------------------------------------------------------===//
 
+#if defined(__x86_64__) || defined(__amd64__) || defined(_M_X64) || defined(_M_AMD64)
+
 #ifndef liblldb_RegisterContextWindows_x64_H_
 #define liblldb_RegisterContextWindows_x64_H_
 

 }
 
 #endif // #ifndef liblldb_RegisterContextWindows_x64_H_
+
+#endif // defined(__x86_64__) || defined(__amd64__) || defined(_M_X64) || defined(_M_AMD64)

Common/x64/RegisterContextWindows_x64.cpp

 //
 //===----------------------------------------------------------------------===//
 
+#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"

   return ::SetThreadContext(
       wthread.GetHostThread().GetNativeThread().GetSystemHandle(), &m_context);
 }
+
+#endif // defined(__x86_64__) || defined(__amd64__) || defined(_M_X64) || defined(_M_AMD64)

Common/x86/RegisterContextWindows_x86.h

 //
 //===----------------------------------------------------------------------===//
 
+#if defined(__i386__) || defined(_M_IX86)
+
 #ifndef liblldb_RegisterContextWindows_x86_H_
 #define liblldb_RegisterContextWindows_x86_H_
 

 }
 
 #endif // #ifndef liblldb_RegisterContextWindows_x86_H_
+
+#endif // defined(__i386__) || defined(_M_IX86)

Common/x86/RegisterContextWindows_x86.cpp

 //
 //===----------------------------------------------------------------------===//
 
+#if defined(__i386__) || defined(_M_IX86)
+
 #include "lldb/Host/windows/HostThreadWindows.h"
 #include "lldb/Host/windows/windows.h"
 #include "lldb/Utility/RegisterValue.h"

   reg_value.SetUInt32(value);
   return true;
 }
+
+#endif // defined(__i386__) || defined(_M_IX86)