This is an archive of the discontinued LLVM Phabricator instance.

Differential D67858

[LLDB] Check for the GCC/MinGW compatible arch defines for windows, in addition to MSVC defines
ClosedPublic

Authored by mstorsjo on Sep 20 2019, 1:25 PM.

Details

Reviewers
compnerd
hhb
labath
Commits
rG2e25c44dc3fa: [LLDB] Check for the GCC/MinGW compatible arch defines for windows, in addition…
rLLDB372483: [LLDB] Check for the GCC/MinGW compatible arch defines for windows, in addition…
rL372483: [LLDB] Check for the GCC/MinGW compatible arch defines for windows, in addition…
Summary

This matches how it is done in all other similar ifdefs throughout lldb (modulo inconsistencies between _M_AMD64 and _M_X64); both MSVC and GCC style arch defines are checked together.

Diff Detail

Repository
rL LLVM

Event Timeline

mstorsjo created this revision.Sep 20 2019, 1:25 PM
Herald added a project: Restricted Project. · View Herald TranscriptSep 20 2019, 1:25 PM
Herald added subscribers: JDevlieghere, abidh. · View Herald Transcript
compnerd accepted this revision.Sep 20 2019, 1:40 PM
This revision is now accepted and ready to land.Sep 20 2019, 1:40 PM
Closed by commit rL372483: [LLDB] Check for the GCC/MinGW compatible arch defines for windows, in addition… (authored by mstorsjo). · Explain WhySep 21 2019, 12:08 PM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptSep 21 2019, 12:08 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

PathSize
lldb/
trunk/
source/
Plugins/
Process/
Windows/
Common/
2 lines
8 lines

Diff 221193

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

Show First 20 Lines • Show All 78 Lines • ▼ Show 20 Linesbool RegisterContextWindows::AddHardwareBreakpoint(uint32_t slot,
bool write) { bool write) {
if (slot >= NUM_HARDWARE_BREAKPOINT_SLOTS) if (slot >= NUM_HARDWARE_BREAKPOINT_SLOTS)
return false; return false;
switch (size) { switch (size) {
case 1: case 1:
case 2: case 2:
case 4: case 4:
#if defined(_M_AMD64) #if defined(__x86_64__) || defined(_M_AMD64)
case 8: case 8:
#endif #endif
break; break;
default: default:
return false; return false;
} }
if (!CacheAllRegisterValues()) if (!CacheAllRegisterValues())
▲ Show 20 Lines • Show All 86 Lines • Show Last 20 Lines

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

Show All 15 Lines
#include "lldb/Utility/State.h" #include "lldb/Utility/State.h"
#include "Plugins/Process/Utility/UnwindLLDB.h" #include "Plugins/Process/Utility/UnwindLLDB.h"
#include "ProcessWindows.h" #include "ProcessWindows.h"
#include "ProcessWindowsLog.h" #include "ProcessWindowsLog.h"
#include "TargetThreadWindows.h" #include "TargetThreadWindows.h"
// TODO support _M_ARM and _M_ARM64 // TODO support _M_ARM and _M_ARM64
#if defined(_M_AMD64) #if defined(__x86_64__) || defined(_M_AMD64)
#include "x64/RegisterContextWindows_x64.h" #include "x64/RegisterContextWindows_x64.h"
#elif defined(_M_IX86) #elif defined(__i386__) || defined(_M_IX86)
#include "x86/RegisterContextWindows_x86.h" #include "x86/RegisterContextWindows_x86.h"
#endif #endif
using namespace lldb; using namespace lldb;
using namespace lldb_private; using namespace lldb_private;
TargetThreadWindows::TargetThreadWindows(ProcessWindows &process, TargetThreadWindows::TargetThreadWindows(ProcessWindows &process,
const HostThread &thread) const HostThread &thread)
Show All 37 Lines if (!m_thread_reg_ctx_sp) {
LLDB_LOG(log, "debugging ARM (NT) targets is currently unsupported"); LLDB_LOG(log, "debugging ARM (NT) targets is currently unsupported");
break; break;
case llvm::Triple::aarch64: case llvm::Triple::aarch64:
LLDB_LOG(log, "debugging ARM64 targets is currently unsupported"); LLDB_LOG(log, "debugging ARM64 targets is currently unsupported");
break; break;
case llvm::Triple::x86: case llvm::Triple::x86:
#if defined(_M_IX86) #if defined(__i386__) || defined(_M_IX86)
m_thread_reg_ctx_sp.reset( m_thread_reg_ctx_sp.reset(
new RegisterContextWindows_x86(*this, concrete_frame_idx)); new RegisterContextWindows_x86(*this, concrete_frame_idx));
#else #else
LLDB_LOG(log, "debugging foreign targets is currently unsupported"); LLDB_LOG(log, "debugging foreign targets is currently unsupported");
#endif #endif
break; break;
case llvm::Triple::x86_64: case llvm::Triple::x86_64:
#if defined(_M_AMD64) #if defined(__x86_64__) || defined(_M_AMD64)
m_thread_reg_ctx_sp.reset( m_thread_reg_ctx_sp.reset(
new RegisterContextWindows_x64(*this, concrete_frame_idx)); new RegisterContextWindows_x64(*this, concrete_frame_idx));
#else #else
LLDB_LOG(log, "debugging foreign targets is currently unsupported"); LLDB_LOG(log, "debugging foreign targets is currently unsupported");
#endif #endif
break; break;
default: default:
▲ Show 20 Lines • Show All 60 Lines • Show Last 20 Lines