maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "Initialization: move InstructionEmulation to full initialization" 

This change is bogus. lldb-server definitely uses instruction emulation
on some architectures.

llvm-svn: 359862
This commit is contained in:
Pavel Labath 2019-05-03 07:11:43 +00:00
parent d2c82e8ad0
commit 759ab93e04
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lldb/source/API/SystemInitializerFull.cpp
View File

@ -43,10 +43,7 @@
#include "Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h" #include "Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h"
#include "Plugins/DynamicLoader/Static/DynamicLoaderStatic.h" #include "Plugins/DynamicLoader/Static/DynamicLoaderStatic.h"
#include "Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.h" #include "Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.h"
#include "Plugins/Instruction/ARM/EmulateInstructionARM.h"
#include "Plugins/Instruction/ARM64/EmulateInstructionARM64.h" #include "Plugins/Instruction/ARM64/EmulateInstructionARM64.h"
#include "Plugins/Instruction/MIPS/EmulateInstructionMIPS.h"
#include "Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h"
#include "Plugins/Instruction/PPC64/EmulateInstructionPPC64.h" #include "Plugins/Instruction/PPC64/EmulateInstructionPPC64.h"
#include "Plugins/InstrumentationRuntime/ASan/ASanRuntime.h" #include "Plugins/InstrumentationRuntime/ASan/ASanRuntime.h"
#include "Plugins/InstrumentationRuntime/MainThreadChecker/MainThreadCheckerRuntime.h" #include "Plugins/InstrumentationRuntime/MainThreadChecker/MainThreadCheckerRuntime.h"
@ -205,13 +202,8 @@ llvm::Error SystemInitializerFull::Initialize() {
SymbolFileSymtab::Initialize(); SymbolFileSymtab::Initialize();
UnwindAssemblyInstEmulation::Initialize(); UnwindAssemblyInstEmulation::Initialize();
UnwindAssembly_x86::Initialize(); UnwindAssembly_x86::Initialize();
EmulateInstructionARM::Initialize();
EmulateInstructionARM64::Initialize(); EmulateInstructionARM64::Initialize();
EmulateInstructionMIPS::Initialize();
EmulateInstructionMIPS64::Initialize();
EmulateInstructionPPC64::Initialize(); EmulateInstructionPPC64::Initialize();
SymbolFileDWARFDebugMap::Initialize(); SymbolFileDWARFDebugMap::Initialize();
ItaniumABILanguageRuntime::Initialize(); ItaniumABILanguageRuntime::Initialize();
AppleObjCRuntimeV2::Initialize(); AppleObjCRuntimeV2::Initialize();
@ -312,13 +304,8 @@ void SystemInitializerFull::Terminate() {
SymbolFileSymtab::Terminate(); SymbolFileSymtab::Terminate();
UnwindAssembly_x86::Terminate(); UnwindAssembly_x86::Terminate();
UnwindAssemblyInstEmulation::Terminate(); UnwindAssemblyInstEmulation::Terminate();
EmulateInstructionARM::Terminate();
EmulateInstructionARM64::Terminate(); EmulateInstructionARM64::Terminate();
EmulateInstructionMIPS::Terminate();
EmulateInstructionMIPS64::Terminate();
EmulateInstructionPPC64::Terminate(); EmulateInstructionPPC64::Terminate();
SymbolFileDWARFDebugMap::Terminate(); SymbolFileDWARFDebugMap::Terminate();
ItaniumABILanguageRuntime::Terminate(); ItaniumABILanguageRuntime::Terminate();
AppleObjCRuntimeV2::Terminate(); AppleObjCRuntimeV2::Terminate();

3
lldb/source/Initialization/CMakeLists.txt
View File

@ -14,6 +14,9 @@ add_lldb_library(lldbInitialization
LINK_LIBS LINK_LIBS
lldbCore lldbCore
lldbHost lldbHost
lldbPluginInstructionARM
lldbPluginInstructionMIPS
lldbPluginInstructionMIPS64
lldbPluginProcessGDBRemote lldbPluginProcessGDBRemote
${EXTRA_PLUGINS} ${EXTRA_PLUGINS}
${LLDB_SYSTEM_LIBS} ${LLDB_SYSTEM_LIBS}

11
lldb/source/Initialization/SystemInitializerCommon.cpp
View File

@ -8,6 +8,9 @@
#include "lldb/Initialization/SystemInitializerCommon.h" #include "lldb/Initialization/SystemInitializerCommon.h"
#include "Plugins/Instruction/ARM/EmulateInstructionARM.h"
#include "Plugins/Instruction/MIPS/EmulateInstructionMIPS.h"
#include "Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h"
#include "Plugins/Process/gdb-remote/ProcessGDBRemoteLog.h" #include "Plugins/Process/gdb-remote/ProcessGDBRemoteLog.h"
#include "lldb/Host/FileSystem.h" #include "lldb/Host/FileSystem.h"
#include "lldb/Host/Host.h" #include "lldb/Host/Host.h"
@ -96,6 +99,10 @@ llvm::Error SystemInitializerCommon::Initialize() {
process_gdb_remote::ProcessGDBRemoteLog::Initialize(); process_gdb_remote::ProcessGDBRemoteLog::Initialize();
EmulateInstructionARM::Initialize();
EmulateInstructionMIPS::Initialize();
EmulateInstructionMIPS64::Initialize();
#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
ProcessPOSIXLog::Initialize(); ProcessPOSIXLog::Initialize();
#endif #endif
@ -110,6 +117,10 @@ void SystemInitializerCommon::Terminate() {
static Timer::Category func_cat(LLVM_PRETTY_FUNCTION); static Timer::Category func_cat(LLVM_PRETTY_FUNCTION);
Timer scoped_timer(func_cat, LLVM_PRETTY_FUNCTION); Timer scoped_timer(func_cat, LLVM_PRETTY_FUNCTION);
EmulateInstructionARM::Terminate();
EmulateInstructionMIPS::Terminate();
EmulateInstructionMIPS64::Terminate();
#if defined(_WIN32) #if defined(_WIN32)
ProcessWindowsLog::Terminate(); ProcessWindowsLog::Terminate();
#endif #endif