replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed lldb::SBSourceManager_impl. We export everything in the lldb namespace 

and this implemenation that backs our lldb::SBSourceManager should not be
exported. 

llvm-svn: 140930
This commit is contained in:
Greg Clayton 2011-10-01 02:59:24 +00:00
parent ce29158bc4
commit 9a37766e7c
9 changed files with 90 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lldb/include/lldb/API/SBDebugger.h
View File

@ -246,8 +246,8 @@ private:
friend class SBInputReader;
friend class SBProcess;
friend class SBSourceManager;
friend class SBTarget;
friend class SBSourceManager_impl;
lldb::SBTarget
FindTargetWithLLDBProcess (const lldb::ProcessSP &processSP);
@ -261,6 +261,8 @@ private:
lldb_private::Debugger &
ref () const;
const lldb::DebuggerSP &
get_sp () const;
#endif
lldb::DebuggerSP m_opaque_sp;

2
lldb/include/lldb/API/SBFileSpec.h
View File

@ -64,7 +64,7 @@ private:
friend class SBLineEntry;
friend class SBModule;
friend class SBProcess;
friend class SBSourceManager_impl;
friend class SBSourceManager;
friend class SBThread;
friend class SBTarget;

4
lldb/include/lldb/API/SBSourceManager.h
View File

@ -16,8 +16,6 @@
namespace lldb {
class SBSourceManager_impl;
class SBSourceManager
{
public:
@ -49,7 +47,7 @@ protected:
private:
std::auto_ptr<SBSourceManager_impl> m_opaque_ap;
std::auto_ptr<lldb_private::SourceManagerImpl> m_opaque_ap;
};
} // namespace lldb

4
lldb/include/lldb/API/SBStream.h
View File

@ -61,6 +61,7 @@ protected:
friend class SBBlock;
friend class SBBreakpoint;
friend class SBBreakpointLocation;
friend class SBCommandReturnObject;
friend class SBCompileUnit;
friend class SBData;
friend class SBEvent;
@ -70,14 +71,13 @@ protected:
friend class SBInstructionList;
friend class SBModule;
friend class SBSection;
friend class SBSourceManager_impl;
friend class SBSourceManager;
friend class SBSymbol;
friend class SBSymbolContext;
friend class SBTarget;
friend class SBThread;
friend class SBValue;
friend class SBWatchpointLocation;
friend class SBCommandReturnObject;
#ifndef SWIG

9
lldb/include/lldb/API/SBTarget.h
View File

@ -502,11 +502,11 @@ protected:
friend class SBDebugger;
friend class SBFunction;
friend class SBInstruction;
friend class SBProcess;
friend class SBSymbol;
friend class SBModule;
friend class SBProcess;
friend class SBSourceManager;
friend class SBSymbol;
friend class SBValue;
friend class SBSourceManager_impl;
//------------------------------------------------------------------
// Constructors are private, use static Target::Create function to
@ -524,6 +524,9 @@ protected:
lldb_private::Target *
get() const;
const lldb::TargetSP &
get_sp () const;
private:
//------------------------------------------------------------------
// For Target only

1
lldb/include/lldb/lldb-forward.h
View File

@ -131,6 +131,7 @@ class Section;
class SectionImpl;
class SectionList;
class SourceManager;
class SourceManagerImpl;
class StackFrame;
class StackFrameList;
class StackID;

5
lldb/source/API/SBDebugger.cpp
View File

@ -825,6 +825,11 @@ SBDebugger::ref () const
return *m_opaque_sp;
}
const lldb::DebuggerSP &
SBDebugger::get_sp () const
{
return m_opaque_sp;
}
SBDebugger
SBDebugger::FindDebuggerWithID (int id)

56
lldb/source/API/SBSourceManager.cpp
View File

@ -20,23 +20,22 @@
#include "lldb/Target/Target.h"
using namespace lldb;
using namespace lldb_private;
class lldb::SBSourceManager_impl
namespace lldb_private
{
public:
SBSourceManager_impl (const SBDebugger &debugger)
class SourceManagerImpl
{
m_debugger_sp = debugger.m_opaque_sp;
public:
SourceManagerImpl (const lldb::DebuggerSP &debugger_sp)
{
m_debugger_sp = debugger_sp;
}
SBSourceManager_impl (const SBTarget &target)
SourceManagerImpl (const lldb::TargetSP &target_sp)
{
m_target_sp = target.m_opaque_sp;
m_target_sp = target_sp;
}
SBSourceManager_impl (const SBSourceManager_impl &rhs)
SourceManagerImpl (const SourceManagerImpl &rhs)
{
if (&rhs == this)
return;
@ -45,51 +44,52 @@ public:
}
size_t
DisplaySourceLinesWithLineNumbers
(
const SBFileSpec &file,
DisplaySourceLinesWithLineNumbers (const lldb_private::FileSpec &file,
uint32_t line,
uint32_t context_before,
uint32_t context_after,
const char* current_line_cstr,
SBStream &s
)
lldb_private::Stream *s)
{
if (!file.IsValid())
if (file)
return 0;
if (m_debugger_sp)
return m_debugger_sp->GetSourceManager().DisplaySourceLinesWithLineNumbers (*file,
return m_debugger_sp->GetSourceManager().DisplaySourceLinesWithLineNumbers (file,
line,
context_before,
context_after,
current_line_cstr,
s.m_opaque_ap.get());
s);
else if (m_target_sp)
return m_target_sp->GetSourceManager().DisplaySourceLinesWithLineNumbers (*file,
return m_target_sp->GetSourceManager().DisplaySourceLinesWithLineNumbers (file,
line,
context_before,
context_after,
current_line_cstr,
s.m_opaque_ap.get());
s);
else
return 0;
}
private:
private:
lldb::DebuggerSP m_debugger_sp;
lldb::TargetSP m_target_sp;
};
};
}
using namespace lldb;
using namespace lldb_private;
SBSourceManager::SBSourceManager (const SBDebugger &debugger)
{
m_opaque_ap.reset(new SBSourceManager_impl (debugger));
m_opaque_ap.reset(new SourceManagerImpl (debugger.get_sp()));
}
SBSourceManager::SBSourceManager (const SBTarget &target)
{
m_opaque_ap.reset(new SBSourceManager_impl (target));
m_opaque_ap.reset(new SourceManagerImpl (target.get_sp()));
}
SBSourceManager::SBSourceManager (const SBSourceManager &rhs)
@ -97,13 +97,13 @@ SBSourceManager::SBSourceManager (const SBSourceManager &rhs)
if (&rhs == this)
return;
m_opaque_ap.reset(new SBSourceManager_impl (*(rhs.m_opaque_ap.get())));
m_opaque_ap.reset(new SourceManagerImpl (*(rhs.m_opaque_ap.get())));
}
const lldb::SBSourceManager &
SBSourceManager::operator = (const lldb::SBSourceManager &rhs)
{
m_opaque_ap.reset (new SBSourceManager_impl (*(rhs.m_opaque_ap.get())));
m_opaque_ap.reset (new SourceManagerImpl (*(rhs.m_opaque_ap.get())));
return *this;
}
@ -125,10 +125,10 @@ SBSourceManager::DisplaySourceLinesWithLineNumbers
if (m_opaque_ap.get() == NULL)
return 0;
return m_opaque_ap->DisplaySourceLinesWithLineNumbers (file,
return m_opaque_ap->DisplaySourceLinesWithLineNumbers (file.ref(),
line,
context_before,
context_after,
current_line_cstr,
s);
s.get());
}

6
lldb/source/API/SBTarget.cpp
View File

@ -499,6 +499,12 @@ SBTarget::get() const
return m_opaque_sp.get();
}
const lldb::TargetSP &
SBTarget::get_sp () const
{
return m_opaque_sp;
}
void
SBTarget::reset (const lldb::TargetSP& target_sp)
{