llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-lldb Author: Dmitry Vasilyev (slydiman) <details> <summary>Changes</summary> --- Full diff: https://github.com/llvm/llvm-project/pull/137267.diff 2 Files Affected: - (modified) lldb/tools/lldb-server/CMakeLists.txt (+1) - (modified) lldb/tools/lldb-server/SystemInitializerLLGS.cpp (+11-4) ``````````diff diff --git a/lldb/tools/lldb-server/CMakeLists.txt b/lldb/tools/lldb-server/CMakeLists.txt index 0135b367fcc21..6eb0e478a23a9 100644 --- a/lldb/tools/lldb-server/CMakeLists.txt +++ b/lldb/tools/lldb-server/CMakeLists.txt @@ -55,6 +55,7 @@ add_lldb_tool(lldb-server lldbVersion ${LLDB_PLUGINS} lldbPluginInstructionARM + lldbPluginInstructionARM64 lldbPluginInstructionLoongArch lldbPluginInstructionMIPS lldbPluginInstructionMIPS64 diff --git a/lldb/tools/lldb-server/SystemInitializerLLGS.cpp b/lldb/tools/lldb-server/SystemInitializerLLGS.cpp index 5b280d6cf5280..7784bc637c843 100644 --- a/lldb/tools/lldb-server/SystemInitializerLLGS.cpp +++ b/lldb/tools/lldb-server/SystemInitializerLLGS.cpp @@ -24,6 +24,7 @@ using HostObjectFile = ObjectFileELF; #if defined(__arm64__) || defined(__aarch64__) || defined(_M_ARM64) #define LLDB_TARGET_ARM64 +#include "Plugins/Instruction/ARM64/EmulateInstructionARM64.h" #endif #if defined(__arm__) || defined(__arm) || defined(_ARM) || defined(_M_ARM) || \ @@ -62,13 +63,16 @@ llvm::Error SystemInitializerLLGS::Initialize() { HostObjectFile::Initialize(); -#if defined(LLDB_TARGET_ARM) || defined(LLDB_TARGET_ARM64) +#if defined(LLDB_TARGET_ARM) EmulateInstructionARM::Initialize(); #endif +#if defined(LLDB_TARGET_ARM64) + EmulateInstructionARM64::Initialize(); +#endif #if defined(LLDB_TARGET_LoongArch) EmulateInstructionLoongArch::Initialize(); #endif -#if defined(LLDB_TARGET_MIPS) || defined(LLDB_TARGET_MIPS64) +#if defined(LLDB_TARGET_MIPS) EmulateInstructionMIPS::Initialize(); #endif #if defined(LLDB_TARGET_MIPS64) @@ -84,13 +88,16 @@ llvm::Error SystemInitializerLLGS::Initialize() { void SystemInitializerLLGS::Terminate() { HostObjectFile::Terminate(); -#if defined(LLDB_TARGET_ARM) || defined(LLDB_TARGET_ARM64) +#if defined(LLDB_TARGET_ARM) EmulateInstructionARM::Terminate(); #endif +#if defined(LLDB_TARGET_ARM64) + EmulateInstructionARM64::Terminate(); +#endif #if defined(LLDB_TARGET_LoongArch) EmulateInstructionLoongArch::Terminate(); #endif -#if defined(LLDB_TARGET_MIPS) || defined(LLDB_TARGET_MIPS64) +#if defined(LLDB_TARGET_MIPS) EmulateInstructionMIPS::Terminate(); #endif #if defined(LLDB_TARGET_MIPS64) `````````` </details> https://github.com/llvm/llvm-project/pull/137267 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
