summaryrefslogtreecommitdiffstats
path: root/lldb/source
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/source')
-rw-r--r--lldb/source/Core/PluginManager.cpp52
-rw-r--r--lldb/source/Plugins/ArchDefaultUnwindPlan/x86/ArchDefaultUnwindPlan-x86.h2
-rw-r--r--lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp4
-rw-r--r--lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h8
-rw-r--r--lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp4
-rw-r--r--lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.h8
-rw-r--r--lldb/source/Symbol/FuncUnwinders.cpp4
-rw-r--r--lldb/source/Symbol/UnwindTable.cpp4
-rw-r--r--lldb/source/Target/UnwindAssembly.cpp (renamed from lldb/source/Target/UnwindAssemblyProfiler.cpp)18
9 files changed, 52 insertions, 52 deletions
diff --git a/lldb/source/Core/PluginManager.cpp b/lldb/source/Core/PluginManager.cpp
index 8efeedce52b..fae963330c8 100644
--- a/lldb/source/Core/PluginManager.cpp
+++ b/lldb/source/Core/PluginManager.cpp
@@ -1558,11 +1558,11 @@ PluginManager::GetSymbolVendorCreateCallbackForPluginName (const char *name)
}
-#pragma mark UnwindAssemblyProfiler
+#pragma mark UnwindAssembly
-struct UnwindAssemblyProfilerInstance
+struct UnwindAssemblyInstance
{
- UnwindAssemblyProfilerInstance() :
+ UnwindAssemblyInstance() :
name(),
description(),
create_callback(NULL)
@@ -1571,22 +1571,22 @@ struct UnwindAssemblyProfilerInstance
std::string name;
std::string description;
- UnwindAssemblyProfilerCreateInstance create_callback;
+ UnwindAssemblyCreateInstance create_callback;
};
-typedef std::vector<UnwindAssemblyProfilerInstance> UnwindAssemblyProfilerInstances;
+typedef std::vector<UnwindAssemblyInstance> UnwindAssemblyInstances;
static Mutex &
-GetUnwindAssemblyProfilerMutex ()
+GetUnwindAssemblyMutex ()
{
static Mutex g_instances_mutex (Mutex::eMutexTypeRecursive);
return g_instances_mutex;
}
-static UnwindAssemblyProfilerInstances &
-GetUnwindAssemblyProfilerInstances ()
+static UnwindAssemblyInstances &
+GetUnwindAssemblyInstances ()
{
- static UnwindAssemblyProfilerInstances g_instances;
+ static UnwindAssemblyInstances g_instances;
return g_instances;
}
@@ -1595,32 +1595,32 @@ PluginManager::RegisterPlugin
(
const char *name,
const char *description,
- UnwindAssemblyProfilerCreateInstance create_callback
+ UnwindAssemblyCreateInstance create_callback
)
{
if (create_callback)
{
- UnwindAssemblyProfilerInstance instance;
+ UnwindAssemblyInstance instance;
assert (name && name[0]);
instance.name = name;
if (description && description[0])
instance.description = description;
instance.create_callback = create_callback;
- Mutex::Locker locker (GetUnwindAssemblyProfilerMutex ());
- GetUnwindAssemblyProfilerInstances ().push_back (instance);
+ Mutex::Locker locker (GetUnwindAssemblyMutex ());
+ GetUnwindAssemblyInstances ().push_back (instance);
}
return false;
}
bool
-PluginManager::UnregisterPlugin (UnwindAssemblyProfilerCreateInstance create_callback)
+PluginManager::UnregisterPlugin (UnwindAssemblyCreateInstance create_callback)
{
if (create_callback)
{
- Mutex::Locker locker (GetUnwindAssemblyProfilerMutex ());
- UnwindAssemblyProfilerInstances &instances = GetUnwindAssemblyProfilerInstances ();
+ Mutex::Locker locker (GetUnwindAssemblyMutex ());
+ UnwindAssemblyInstances &instances = GetUnwindAssemblyInstances ();
- UnwindAssemblyProfilerInstances::iterator pos, end = instances.end();
+ UnwindAssemblyInstances::iterator pos, end = instances.end();
for (pos = instances.begin(); pos != end; ++ pos)
{
if (pos->create_callback == create_callback)
@@ -1633,27 +1633,27 @@ PluginManager::UnregisterPlugin (UnwindAssemblyProfilerCreateInstance create_cal
return false;
}
-UnwindAssemblyProfilerCreateInstance
-PluginManager::GetUnwindAssemblyProfilerCreateCallbackAtIndex (uint32_t idx)
+UnwindAssemblyCreateInstance
+PluginManager::GetUnwindAssemblyCreateCallbackAtIndex (uint32_t idx)
{
- Mutex::Locker locker (GetUnwindAssemblyProfilerMutex ());
- UnwindAssemblyProfilerInstances &instances = GetUnwindAssemblyProfilerInstances ();
+ Mutex::Locker locker (GetUnwindAssemblyMutex ());
+ UnwindAssemblyInstances &instances = GetUnwindAssemblyInstances ();
if (idx < instances.size())
return instances[idx].create_callback;
return NULL;
}
-UnwindAssemblyProfilerCreateInstance
-PluginManager::GetUnwindAssemblyProfilerCreateCallbackForPluginName (const char *name)
+UnwindAssemblyCreateInstance
+PluginManager::GetUnwindAssemblyCreateCallbackForPluginName (const char *name)
{
if (name && name[0])
{
llvm::StringRef name_sref(name);
- Mutex::Locker locker (GetUnwindAssemblyProfilerMutex ());
- UnwindAssemblyProfilerInstances &instances = GetUnwindAssemblyProfilerInstances ();
+ Mutex::Locker locker (GetUnwindAssemblyMutex ());
+ UnwindAssemblyInstances &instances = GetUnwindAssemblyInstances ();
- UnwindAssemblyProfilerInstances::iterator pos, end = instances.end();
+ UnwindAssemblyInstances::iterator pos, end = instances.end();
for (pos = instances.begin(); pos != end; ++ pos)
{
if (name_sref.equals (pos->name))
diff --git a/lldb/source/Plugins/ArchDefaultUnwindPlan/x86/ArchDefaultUnwindPlan-x86.h b/lldb/source/Plugins/ArchDefaultUnwindPlan/x86/ArchDefaultUnwindPlan-x86.h
index 7938ef05978..53b37dfc829 100644
--- a/lldb/source/Plugins/ArchDefaultUnwindPlan/x86/ArchDefaultUnwindPlan-x86.h
+++ b/lldb/source/Plugins/ArchDefaultUnwindPlan/x86/ArchDefaultUnwindPlan-x86.h
@@ -104,4 +104,4 @@ private:
} // namespace lldb_private
-#endif // liblldb_UnwindAssemblyProfiler_x86_h_
+#endif // liblldb_UnwindAssembly_x86_h_
diff --git a/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp b/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp
index 966b526d6c0..1379cd4ce12 100644
--- a/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp
+++ b/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp
@@ -21,7 +21,7 @@
#include "lldb/Target/RegisterContext.h"
#include "lldb/Target/Thread.h"
#include "lldb/Target/Target.h"
-#include "lldb/Target/UnwindAssemblyProfiler.h"
+#include "lldb/Target/UnwindAssembly.h"
using namespace lldb;
using namespace lldb_private;
@@ -50,7 +50,7 @@ UnwindAssemblyInstEmulation::FirstNonPrologueInsn (AddressRange& func, Target& t
return false;
}
-UnwindAssemblyProfiler *
+UnwindAssembly *
UnwindAssemblyInstEmulation::CreateInstance (const ArchSpec &arch)
{
return NULL;
diff --git a/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h b/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h
index 773c120a228..f6137389c95 100644
--- a/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h
+++ b/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h
@@ -11,10 +11,10 @@
#define liblldb_UnwindAssemblyInstEmulation_h_
#include "lldb/lldb-private.h"
-#include "lldb/Target/UnwindAssemblyProfiler.h"
+#include "lldb/Target/UnwindAssembly.h"
#include "lldb/Target/Thread.h"
-class UnwindAssemblyInstEmulation : public lldb_private::UnwindAssemblyProfiler
+class UnwindAssemblyInstEmulation : public lldb_private::UnwindAssembly
{
public:
@@ -40,7 +40,7 @@ public:
lldb_private::Thread* thread,
lldb_private::Address& first_non_prologue_insn);
- static lldb_private::UnwindAssemblyProfiler *
+ static lldb_private::UnwindAssembly *
CreateInstance (const lldb_private::ArchSpec &arch);
@@ -72,7 +72,7 @@ private:
// Call CreateInstance to get an instance of this class
UnwindAssemblyInstEmulation(int cpu) :
- lldb_private::UnwindAssemblyProfiler(), m_cpu(cpu)
+ lldb_private::UnwindAssembly(), m_cpu(cpu)
{
}
diff --git a/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp b/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp
index d1fd2dfddab..28bb3364243 100644
--- a/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp
+++ b/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp
@@ -21,7 +21,7 @@
#include "lldb/Target/RegisterContext.h"
#include "lldb/Target/Thread.h"
#include "lldb/Target/Target.h"
-#include "lldb/Target/UnwindAssemblyProfiler.h"
+#include "lldb/Target/UnwindAssembly.h"
using namespace lldb;
using namespace lldb_private;
@@ -839,7 +839,7 @@ UnwindAssembly_x86::FirstNonPrologueInsn (AddressRange& func, Target& target, Th
return asm_parse.find_first_non_prologue_insn (first_non_prologue_insn);
}
-UnwindAssemblyProfiler *
+UnwindAssembly *
UnwindAssembly_x86::CreateInstance (const ArchSpec &arch)
{
const llvm::Triple::ArchType cpu = arch.GetMachine ();
diff --git a/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.h b/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.h
index 057c7f2e34f..4c29dcf7b28 100644
--- a/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.h
+++ b/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.h
@@ -11,12 +11,12 @@
#define liblldb_UnwindAssembly_x86_h_
#include "lldb/lldb-private.h"
-#include "lldb/Target/UnwindAssemblyProfiler.h"
+#include "lldb/Target/UnwindAssembly.h"
#include "lldb/Target/Thread.h"
namespace lldb_private {
-class UnwindAssembly_x86 : public lldb_private::UnwindAssemblyProfiler
+class UnwindAssembly_x86 : public lldb_private::UnwindAssembly
{
public:
@@ -32,7 +32,7 @@ public:
virtual bool
FirstNonPrologueInsn (AddressRange& func, lldb_private::Target& target, lldb_private::Thread* thread, Address& first_non_prologue_insn);
- static lldb_private::UnwindAssemblyProfiler *
+ static lldb_private::UnwindAssembly *
CreateInstance (const lldb_private::ArchSpec &arch);
@@ -62,7 +62,7 @@ public:
private:
UnwindAssembly_x86(int cpu) :
- lldb_private::UnwindAssemblyProfiler(), m_cpu(cpu) { } // Call CreateInstance instead.
+ lldb_private::UnwindAssembly(), m_cpu(cpu) { } // Call CreateInstance instead.
int m_cpu;
};
diff --git a/lldb/source/Symbol/FuncUnwinders.cpp b/lldb/source/Symbol/FuncUnwinders.cpp
index 0af42105b5c..eb8e4da3cca 100644
--- a/lldb/source/Symbol/FuncUnwinders.cpp
+++ b/lldb/source/Symbol/FuncUnwinders.cpp
@@ -17,7 +17,7 @@
#include "lldb/Target/ArchDefaultUnwindPlan.h"
#include "lldb/Target/Thread.h"
#include "lldb/Target/Target.h"
-#include "lldb/Target/UnwindAssemblyProfiler.h"
+#include "lldb/Target/UnwindAssembly.h"
using namespace lldb;
using namespace lldb_private;
@@ -26,7 +26,7 @@ using namespace lldb_private;
FuncUnwinders::FuncUnwinders
(
UnwindTable& unwind_table,
- UnwindAssemblyProfiler *assembly_profiler,
+ UnwindAssembly *assembly_profiler,
AddressRange range
) :
m_unwind_table(unwind_table),
diff --git a/lldb/source/Symbol/UnwindTable.cpp b/lldb/source/Symbol/UnwindTable.cpp
index f183debdeda..647fbb1f85a 100644
--- a/lldb/source/Symbol/UnwindTable.cpp
+++ b/lldb/source/Symbol/UnwindTable.cpp
@@ -17,7 +17,7 @@
#include "lldb/Symbol/FuncUnwinders.h"
#include "lldb/Symbol/SymbolContext.h"
#include "lldb/Symbol/DWARFCallFrameInfo.h"
-#include "lldb/Target/UnwindAssemblyProfiler.h"
+#include "lldb/Target/UnwindAssembly.h"
// There is one UnwindTable object per ObjectFile.
// It contains a list of Unwind objects -- one per function, populated lazily -- for the ObjectFile.
@@ -57,7 +57,7 @@ UnwindTable::Initialize ()
ArchSpec arch;
if (m_object_file.GetArchitecture (arch))
{
- m_assembly_profiler = UnwindAssemblyProfiler::FindPlugin (arch);
+ m_assembly_profiler = UnwindAssembly::FindPlugin (arch);
m_initialized = true;
}
}
diff --git a/lldb/source/Target/UnwindAssemblyProfiler.cpp b/lldb/source/Target/UnwindAssembly.cpp
index 89bb1e6d84a..ba3ba6f7eb1 100644
--- a/lldb/source/Target/UnwindAssemblyProfiler.cpp
+++ b/lldb/source/Target/UnwindAssembly.cpp
@@ -1,4 +1,4 @@
-//===-- UnwindAssemblyProfiler.cpp ------------------------------*- C++ -*-===//
+//===-- UnwindAssembly.cpp ------------------------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
@@ -10,31 +10,31 @@
#include "lldb/lldb-private.h"
#include "lldb/Core/PluginManager.h"
#include "lldb/Core/PluginInterface.h"
-#include "lldb/Target/UnwindAssemblyProfiler.h"
+#include "lldb/Target/UnwindAssembly.h"
using namespace lldb;
using namespace lldb_private;
-UnwindAssemblyProfiler*
-UnwindAssemblyProfiler::FindPlugin (const ArchSpec &arch)
+UnwindAssembly*
+UnwindAssembly::FindPlugin (const ArchSpec &arch)
{
- UnwindAssemblyProfilerCreateInstance create_callback;
+ UnwindAssemblyCreateInstance create_callback;
for (uint32_t idx = 0;
- (create_callback = PluginManager::GetUnwindAssemblyProfilerCreateCallbackAtIndex(idx)) != NULL;
+ (create_callback = PluginManager::GetUnwindAssemblyCreateCallbackAtIndex(idx)) != NULL;
++idx)
{
- std::auto_ptr<UnwindAssemblyProfiler> assembly_profiler_ap (create_callback (arch));
+ std::auto_ptr<UnwindAssembly> assembly_profiler_ap (create_callback (arch));
if (assembly_profiler_ap.get ())
return assembly_profiler_ap.release ();
}
return NULL;
}
-UnwindAssemblyProfiler::UnwindAssemblyProfiler ()
+UnwindAssembly::UnwindAssembly ()
{
}
-UnwindAssemblyProfiler::~UnwindAssemblyProfiler ()
+UnwindAssembly::~UnwindAssembly ()
{
}
OpenPOWER on IntegriCloud