Skip to content

Commit ec2801a

Browse files
committed
Initialization: move InstructionEmulation to full initialization
The debug server does not need to use the instruction emulation. This helps reduce the size of the final lldb-server binary by another ~100K (~1% savings). llvm-svn: 359832
1 parent 8ab9d5a commit ec2801a

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

lldb/source/API/SystemInitializerFull.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@
4343
#include "Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h"
4444
#include "Plugins/DynamicLoader/Static/DynamicLoaderStatic.h"
4545
#include "Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.h"
46+
#include "Plugins/Instruction/ARM/EmulateInstructionARM.h"
4647
#include "Plugins/Instruction/ARM64/EmulateInstructionARM64.h"
48+
#include "Plugins/Instruction/MIPS/EmulateInstructionMIPS.h"
49+
#include "Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h"
4750
#include "Plugins/Instruction/PPC64/EmulateInstructionPPC64.h"
4851
#include "Plugins/InstrumentationRuntime/ASan/ASanRuntime.h"
4952
#include "Plugins/InstrumentationRuntime/MainThreadChecker/MainThreadCheckerRuntime.h"
@@ -202,8 +205,13 @@ llvm::Error SystemInitializerFull::Initialize() {
202205
SymbolFileSymtab::Initialize();
203206
UnwindAssemblyInstEmulation::Initialize();
204207
UnwindAssembly_x86::Initialize();
208+
209+
EmulateInstructionARM::Initialize();
205210
EmulateInstructionARM64::Initialize();
211+
EmulateInstructionMIPS::Initialize();
212+
EmulateInstructionMIPS64::Initialize();
206213
EmulateInstructionPPC64::Initialize();
214+
207215
SymbolFileDWARFDebugMap::Initialize();
208216
ItaniumABILanguageRuntime::Initialize();
209217
AppleObjCRuntimeV2::Initialize();
@@ -304,8 +312,13 @@ void SystemInitializerFull::Terminate() {
304312
SymbolFileSymtab::Terminate();
305313
UnwindAssembly_x86::Terminate();
306314
UnwindAssemblyInstEmulation::Terminate();
315+
316+
EmulateInstructionARM::Terminate();
307317
EmulateInstructionARM64::Terminate();
318+
EmulateInstructionMIPS::Terminate();
319+
EmulateInstructionMIPS64::Terminate();
308320
EmulateInstructionPPC64::Terminate();
321+
309322
SymbolFileDWARFDebugMap::Terminate();
310323
ItaniumABILanguageRuntime::Terminate();
311324
AppleObjCRuntimeV2::Terminate();

lldb/source/Initialization/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ add_lldb_library(lldbInitialization
1414
LINK_LIBS
1515
lldbCore
1616
lldbHost
17-
lldbPluginInstructionARM
18-
lldbPluginInstructionMIPS
19-
lldbPluginInstructionMIPS64
2017
lldbPluginProcessGDBRemote
2118
${EXTRA_PLUGINS}
2219
${LLDB_SYSTEM_LIBS}

lldb/source/Initialization/SystemInitializerCommon.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88

99
#include "lldb/Initialization/SystemInitializerCommon.h"
1010

11-
#include "Plugins/Instruction/ARM/EmulateInstructionARM.h"
12-
#include "Plugins/Instruction/MIPS/EmulateInstructionMIPS.h"
13-
#include "Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h"
1411
#include "Plugins/Process/gdb-remote/ProcessGDBRemoteLog.h"
1512
#include "lldb/Host/FileSystem.h"
1613
#include "lldb/Host/Host.h"
@@ -99,10 +96,6 @@ llvm::Error SystemInitializerCommon::Initialize() {
9996

10097
process_gdb_remote::ProcessGDBRemoteLog::Initialize();
10198

102-
EmulateInstructionARM::Initialize();
103-
EmulateInstructionMIPS::Initialize();
104-
EmulateInstructionMIPS64::Initialize();
105-
10699
#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
107100
ProcessPOSIXLog::Initialize();
108101
#endif
@@ -117,10 +110,6 @@ void SystemInitializerCommon::Terminate() {
117110
static Timer::Category func_cat(LLVM_PRETTY_FUNCTION);
118111
Timer scoped_timer(func_cat, LLVM_PRETTY_FUNCTION);
119112

120-
EmulateInstructionARM::Terminate();
121-
EmulateInstructionMIPS::Terminate();
122-
EmulateInstructionMIPS64::Terminate();
123-
124113
#if defined(_WIN32)
125114
ProcessWindowsLog::Terminate();
126115
#endif

0 commit comments

Comments
 (0)