From e1d4fb1ebfffffc612d65331f72bb0827d7206d4 Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Thu, 1 Apr 2021 09:01:35 +0200 Subject: [PATCH] [lldb] Fix build errors from 3bea7306e8 The addition of the dummy constructors requires matching changes in os- and arch-specific files, which I forgot about. --- .../Plugins/Process/FreeBSD/NativeRegisterContextFreeBSD_x86_64.cpp | 2 +- lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_arm.cpp | 5 +++-- .../Plugins/Process/Linux/NativeRegisterContextLinux_arm64.cpp | 3 ++- .../Plugins/Process/Linux/NativeRegisterContextLinux_ppc64le.cpp | 3 ++- .../Plugins/Process/Linux/NativeRegisterContextLinux_s390x.cpp | 3 ++- .../Plugins/Process/NetBSD/NativeRegisterContextNetBSD_x86_64.cpp | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lldb/source/Plugins/Process/FreeBSD/NativeRegisterContextFreeBSD_x86_64.cpp b/lldb/source/Plugins/Process/FreeBSD/NativeRegisterContextFreeBSD_x86_64.cpp index d5052e7..9328d60 100644 --- a/lldb/source/Plugins/Process/FreeBSD/NativeRegisterContextFreeBSD_x86_64.cpp +++ b/lldb/source/Plugins/Process/FreeBSD/NativeRegisterContextFreeBSD_x86_64.cpp @@ -260,7 +260,7 @@ NativeRegisterContextFreeBSD_x86_64::NativeRegisterContextFreeBSD_x86_64( const ArchSpec &target_arch, NativeThreadProtocol &native_thread) : NativeRegisterContextRegisterInfo( native_thread, CreateRegisterInfoInterface(target_arch)), - m_regset_offsets({0}) { + NativeRegisterContextDBReg_x86(native_thread), m_regset_offsets({0}) { assert(m_gpr.size() == GetRegisterInfoInterface().GetGPRSize()); std::array first_regnos; diff --git a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_arm.cpp b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_arm.cpp index 2bc2a92..91f8828 100644 --- a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_arm.cpp +++ b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_arm.cpp @@ -56,8 +56,9 @@ NativeRegisterContextLinux::CreateHostNativeRegisterContextLinux( NativeRegisterContextLinux_arm::NativeRegisterContextLinux_arm( const ArchSpec &target_arch, NativeThreadProtocol &native_thread) - : NativeRegisterContextRegisterInfo( - native_thread, new RegisterInfoPOSIX_arm(target_arch)) { + : NativeRegisterContextRegisterInfo(native_thread, + new RegisterInfoPOSIX_arm(target_arch)), + NativeRegisterContextLinux(native_thread) { assert(target_arch.GetMachine() == llvm::Triple::arm); ::memset(&m_fpr, 0, sizeof(m_fpr)); diff --git a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_arm64.cpp b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_arm64.cpp index 09cf72c..506b54e 100644 --- a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_arm64.cpp +++ b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_arm64.cpp @@ -76,7 +76,8 @@ NativeRegisterContextLinux_arm64::NativeRegisterContextLinux_arm64( const ArchSpec &target_arch, NativeThreadProtocol &native_thread, std::unique_ptr register_info_up) : NativeRegisterContextRegisterInfo(native_thread, - register_info_up.release()) { + register_info_up.release()), + NativeRegisterContextLinux(native_thread) { ::memset(&m_fpr, 0, sizeof(m_fpr)); ::memset(&m_gpr_arm64, 0, sizeof(m_gpr_arm64)); ::memset(&m_hwp_regs, 0, sizeof(m_hwp_regs)); diff --git a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_ppc64le.cpp b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_ppc64le.cpp index 4531148..60582e4 100644 --- a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_ppc64le.cpp +++ b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_ppc64le.cpp @@ -128,7 +128,8 @@ NativeRegisterContextLinux::CreateHostNativeRegisterContextLinux( NativeRegisterContextLinux_ppc64le::NativeRegisterContextLinux_ppc64le( const ArchSpec &target_arch, NativeThreadProtocol &native_thread) : NativeRegisterContextRegisterInfo( - native_thread, new RegisterInfoPOSIX_ppc64le(target_arch)) { + native_thread, new RegisterInfoPOSIX_ppc64le(target_arch)), + NativeRegisterContextLinux(native_thread) { if (target_arch.GetMachine() != llvm::Triple::ppc64le) { llvm_unreachable("Unhandled target architecture."); } diff --git a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_s390x.cpp b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_s390x.cpp index beae2da..3c09164 100644 --- a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_s390x.cpp +++ b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_s390x.cpp @@ -110,7 +110,8 @@ CreateRegisterInfoInterface(const ArchSpec &target_arch) { NativeRegisterContextLinux_s390x::NativeRegisterContextLinux_s390x( const ArchSpec &target_arch, NativeThreadProtocol &native_thread) : NativeRegisterContextRegisterInfo( - native_thread, CreateRegisterInfoInterface(target_arch)) { + native_thread, CreateRegisterInfoInterface(target_arch)), + NativeRegisterContextLinux(native_thread) { // Set up data about ranges of valid registers. switch (target_arch.GetMachine()) { case llvm::Triple::systemz: diff --git a/lldb/source/Plugins/Process/NetBSD/NativeRegisterContextNetBSD_x86_64.cpp b/lldb/source/Plugins/Process/NetBSD/NativeRegisterContextNetBSD_x86_64.cpp index ed1884c..4caa548 100644 --- a/lldb/source/Plugins/Process/NetBSD/NativeRegisterContextNetBSD_x86_64.cpp +++ b/lldb/source/Plugins/Process/NetBSD/NativeRegisterContextNetBSD_x86_64.cpp @@ -267,7 +267,7 @@ NativeRegisterContextNetBSD_x86_64::NativeRegisterContextNetBSD_x86_64( const ArchSpec &target_arch, NativeThreadProtocol &native_thread) : NativeRegisterContextRegisterInfo( native_thread, CreateRegisterInfoInterface(target_arch)), - m_regset_offsets({0}) { + NativeRegisterContextDBReg_x86(native_thread), m_regset_offsets({0}) { assert(m_gpr.size() == GetRegisterInfoInterface().GetGPRSize()); std::array first_regnos; -- 2.7.4