[lldb] Fix x86 compilation

[tatyana-krasnukha]

source/Plugins/Process/Windows/Common/NativeRegisterContextWindows_i386.h

9 ↗

(On Diff #216852)

These macros are also defined when the compilation target is ARM.
I'd use #if defined(__i386__) || defined(_M_IX86) instead.

[leonid.mashinskiy]

Updated used guarding macros to cut-off ARM and ARM64 architectures as @tatyana-krasnukha mentioned

[tatyana-krasnukha]

Macros __x86_64__ and _M_X64 are more common than AMD-branded, though there is no functional difference (unless using old versions of the Intel compiler).

[tatyana-krasnukha]

A few typos remained after copy-pasting

source/Plugins/Process/Windows/Common/NativeRegisterContextWindows_i386.cpp

279 ↗

(On Diff #217140)

written?

281 ↗

(On Diff #217140)

write

[tatyana-krasnukha]

LGTM

[leonid.mashinskiy]

@tatyana-krasnukha Can you commit this please because I have no commit access

lldb/trunk/source/Plugins/Process/Windows/Common/NativeRegisterContextWindows_WoW64.h

 //===-- NativeRegisterContextWindows_WoW64.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
 //
 //===----------------------------------------------------------------------===//
 
-#if defined(_WIN64)
+#if defined(__x86_64__) || defined(_M_X64)
 #ifndef liblldb_NativeRegisterContextWindows_WoW64_h_
 #define liblldb_NativeRegisterContextWindows_WoW64_h_
 
 #include "Plugins/Process/Utility/RegisterContext_x86.h"
 #include "Plugins/Process/Utility/lldb-x86-register-enums.h"
 
 #include "NativeRegisterContextWindows.h"
 

 
 private:
   bool IsGPR(uint32_t reg_index) const;
 };
 
 } // namespace lldb_private
 
 #endif // liblldb_NativeRegisterContextWindows_WoW64_h_
-#endif // defined(_WIN64)
+#endif // defined(__x86_64__) || defined(_M_X64)

lldb/trunk/source/Plugins/Process/Windows/Common/NativeRegisterContextWindows_WoW64.cpp

 //===-- NativeRegisterContextWindows_WoW64.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(_WIN64)
+#if defined(__x86_64__) || defined(_M_X64)
 
 #include "NativeRegisterContextWindows_WoW64.h"
 
 #include "NativeThreadWindows.h"
 #include "Plugins/Process/Utility/RegisterContextWindows_i386.h"
 #include "ProcessWindowsLog.h"
 #include "lldb/Host/HostInfo.h"
 #include "lldb/Host/HostThread.h"
Status NativeRegisterContextWindows_WoW64::WriteRegister(
   if (!reg_info) {
     error.SetErrorString("reg_info NULL");
     return error;
   }
 
   const uint32_t reg = reg_info->kinds[lldb::eRegisterKindLLDB];
   if (reg == LLDB_INVALID_REGNUM) {
     // This is likely an internal register for lldb use only and should not be
-    // directly queried.
+    // directly written.
     error.SetErrorStringWithFormat("register \"%s\" is an internal-only lldb "
-                                   "register, cannot read directly",
+                                   "register, cannot write directly",
                                    reg_info->name);
     return error;
   }
 
   if (IsGPR(reg))
     return GPRWrite(reg, reg_value);
 
   return Status("unimplemented");
NativeRegisterContextWindows_WoW64::GetWatchpointAddress(uint32_t wp_index) {
   return LLDB_INVALID_ADDRESS;
 }
 
 uint32_t NativeRegisterContextWindows_WoW64::NumSupportedHardwareWatchpoints() {
   // Not implemented
   return 0;
 }
 
-#endif // defined(_WIN64)
+#endif // defined(__x86_64__) || defined(_M_X64)

lldb/trunk/source/Plugins/Process/Windows/Common/NativeRegisterContextWindows_i386.h

 //===-- NativeRegisterContextWindows_i386.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
 //
 //===----------------------------------------------------------------------===//
 
-#if defined(_WIN64)
+#if defined(__i386__) || defined(_M_IX86)
 #ifndef liblldb_NativeRegisterContextWindows_i386_h_
 #define liblldb_NativeRegisterContextWindows_i386_h_
 
 #include "Plugins/Process/Utility/RegisterContext_x86.h"
 #include "Plugins/Process/Utility/lldb-x86-register-enums.h"
 
 #include "NativeRegisterContextWindows.h"
 

 
 private:
   bool IsGPR(uint32_t reg_index) const;
 };
 
 } // namespace lldb_private
 
 #endif // liblldb_NativeRegisterContextWindows_i386_h_
-#endif // defined(_WIN64)
+#endif // defined(__i386__) || defined(_M_IX86)

lldb/trunk/source/Plugins/Process/Windows/Common/NativeRegisterContextWindows_i386.cpp

 //===-- NativeRegisterContextWindows_i386.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(_WIN32) && !defined(_WIN64)
+#if defined(__i386__) || defined(_M_IX86)
 
 #include "NativeRegisterContextWindows_i386.h"
 
 #include "NativeThreadWindows.h"
 #include "Plugins/Process/Utility/RegisterContextWindows_i386.h"
 #include "ProcessWindowsLog.h"
 #include "lldb/Host/HostInfo.h"
 #include "lldb/Host/HostThread.h"
NativeRegisterContextWindows_i386::GPRWrite(const uint32_t reg,
 
   return SetThreadContextHelper(thread_handle, &tls_context);
 }
 
 Status
 NativeRegisterContextWindows_i386::ReadRegister(const RegisterInfo *reg_info,
                                                 RegisterValue &reg_value) {
   Status error;
-  Log *log = ProcessWindowsLog::GetLogIfAny(WINDOWS_LOG_REGISTERS);
 
   if (!reg_info) {
     error.SetErrorString("reg_info NULL");
     return error;
   }
 
   const uint32_t reg = reg_info->kinds[lldb::eRegisterKindLLDB];
   if (reg == LLDB_INVALID_REGNUM) {
     // This is likely an internal register for lldb use only and should not be
     // directly queried.
     error.SetErrorStringWithFormat("register \"%s\" is an internal-only lldb "
                                    "register, cannot read directly",
                                    reg_info->name);
     return error;
   }
 
   if (IsGPR(reg))
     return GPRRead(reg, reg_value);
 
   return Status("unimplemented");
 }
 
 Status NativeRegisterContextWindows_i386::WriteRegister(
     const RegisterInfo *reg_info, const RegisterValue &reg_value) {
-  Log *log = ProcessWindowsLog::GetLogIfAny(WINDOWS_LOG_REGISTERS);
   Status error;
 
   if (!reg_info) {
     error.SetErrorString("reg_info NULL");
     return error;
   }
 
   const uint32_t reg = reg_info->kinds[lldb::eRegisterKindLLDB];
   if (reg == LLDB_INVALID_REGNUM) {
     // This is likely an internal register for lldb use only and should not be
-    // directly queried.
+    // directly written.
     error.SetErrorStringWithFormat("register \"%s\" is an internal-only lldb "
-                                   "register, cannot read directly",
+                                   "register, cannot write directly",
                                    reg_info->name);
     return error;
   }
 
   if (IsGPR(reg))
-    return GPRRead(reg, reg_value);
+    return GPRWrite(reg, reg_value);
 
   return Status("unimplemented");
 }
 
-Status NativeRegisterContextWindows_x86_64::ReadAllRegisterValues(
+Status NativeRegisterContextWindows_i386::ReadAllRegisterValues(
     lldb::DataBufferSP &data_sp) {
   const size_t data_size = REG_CONTEXT_SIZE;
   data_sp = std::make_shared<DataBufferHeap>(data_size, 0);
   ::CONTEXT tls_context;
   Status error =
       GetThreadContextHelper(GetThreadHandle(), &tls_context, CONTEXT_ALL);
   if (error.Fail())
     return error;

lldb/trunk/source/Plugins/Process/Windows/Common/NativeRegisterContextWindows_x86_64.h

 //===-- NativeRegisterContextWindows_x86_64.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
 //
 //===----------------------------------------------------------------------===//
 
-#if defined(_WIN64)
+#if defined(__x86_64__) || defined(_M_X64)
 #ifndef liblldb_NativeRegisterContextWindows_x86_64_h_
 #define liblldb_NativeRegisterContextWindows_x86_64_h_
 
 #include "Plugins/Process/Utility/RegisterContext_x86.h"
 #include "Plugins/Process/Utility/lldb-x86-register-enums.h"
 
 #include "NativeRegisterContextWindows.h"
 
private:
   bool IsGPR(uint32_t reg_index) const;
 
   bool IsFPR(uint32_t reg_index) const;
 };
 
 } // namespace lldb_private
 
 #endif // liblldb_NativeRegisterContextWindows_x86_64_h_
-#endif // defined(_WIN64)
+#endif // defined(__x86_64__) || defined(_M_X64)

lldb/trunk/source/Plugins/Process/Windows/Common/NativeRegisterContextWindows_x86_64.cpp

 //===-- NativeRegisterContextWindows_x86_64.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(_WIN64)
+#if defined(__x86_64__) || defined(_M_X64)
 
 #include "NativeRegisterContextWindows_x86_64.h"
 #include "NativeRegisterContextWindows_WoW64.h"
 #include "NativeThreadWindows.h"
 #include "Plugins/Process/Utility/RegisterContextWindows_i386.h"
 #include "Plugins/Process/Utility/RegisterContextWindows_x86_64.h"
 #include "ProcessWindowsLog.h"
 #include "lldb/Host/HostInfo.h"
Status NativeRegisterContextWindows_x86_64::WriteRegister(
   if (!reg_info) {
     error.SetErrorString("reg_info NULL");
     return error;
   }
 
   const uint32_t reg = reg_info->kinds[lldb::eRegisterKindLLDB];
   if (reg == LLDB_INVALID_REGNUM) {
     // This is likely an internal register for lldb use only and should not be
-    // directly queried.
+    // directly written.
     error.SetErrorStringWithFormat("register \"%s\" is an internal-only lldb "
-                                   "register, cannot read directly",
+                                   "register, cannot write directly",
                                    reg_info->name);
     return error;
   }
 
   if (IsGPR(reg))
     return GPRWrite(reg, reg_value);
 
   if (IsFPR(reg))

 }
 
 uint32_t
 NativeRegisterContextWindows_x86_64::NumSupportedHardwareWatchpoints() {
   // Not implemented
   return 0;
 }
 
-#endif // defined(_WIN64)
+#endif // defined(__x86_64__) || defined(_M_X64)