summaryrefslogtreecommitdiffstats
path: root/lldb/source/API
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/source/API')
-rw-r--r--lldb/source/API/CMakeLists.txt1
-rw-r--r--lldb/source/API/SBFrame.cpp51
-rw-r--r--lldb/source/API/SBVariablesOptions.cpp254
3 files changed, 17 insertions, 289 deletions
diff --git a/lldb/source/API/CMakeLists.txt b/lldb/source/API/CMakeLists.txt
index cba68069ba1..edc76395dee 100644
--- a/lldb/source/API/CMakeLists.txt
+++ b/lldb/source/API/CMakeLists.txt
@@ -58,7 +58,6 @@ add_lldb_library(lldbAPI
SBTypeSynthetic.cpp
SBValue.cpp
SBValueList.cpp
- SBVariablesOptions.cpp
SBWatchpoint.cpp
SBUnixSignals.cpp
)
diff --git a/lldb/source/API/SBFrame.cpp b/lldb/source/API/SBFrame.cpp
index d51f59c2307..da1d32f2e80 100644
--- a/lldb/source/API/SBFrame.cpp
+++ b/lldb/source/API/SBFrame.cpp
@@ -44,7 +44,6 @@
#include "lldb/API/SBStream.h"
#include "lldb/API/SBSymbolContext.h"
#include "lldb/API/SBThread.h"
-#include "lldb/API/SBVariablesOptions.h"
using namespace lldb;
using namespace lldb_private;
@@ -1076,17 +1075,7 @@ SBFrame::GetVariables (bool arguments,
if (frame && target)
{
lldb::DynamicValueType use_dynamic = frame->CalculateTarget()->GetPreferDynamicValue();
- const bool include_runtime_support_values = target ? target->GetDisplayRuntimeSupportValues() : false;
-
- SBVariablesOptions options;
- options.SetIncludeArguments(arguments);
- options.SetIncludeLocals(locals);
- options.SetIncludeStatics(statics);
- options.SetInScopeOnly(in_scope_only);
- options.SetIncludeRuntimeSupportValues(include_runtime_support_values);
- options.SetUseDynamic(use_dynamic);
-
- value_list = GetVariables (options);
+ value_list = GetVariables (arguments, locals, statics, in_scope_only, use_dynamic);
}
return value_list;
}
@@ -1100,19 +1089,22 @@ SBFrame::GetVariables (bool arguments,
{
ExecutionContext exe_ctx(m_opaque_sp.get());
Target *target = exe_ctx.GetTargetPtr();
- const bool include_runtime_support_values = target ? target->GetDisplayRuntimeSupportValues() : false;
- SBVariablesOptions options;
- options.SetIncludeArguments(arguments);
- options.SetIncludeLocals(locals);
- options.SetIncludeStatics(statics);
- options.SetInScopeOnly(in_scope_only);
- options.SetIncludeRuntimeSupportValues(include_runtime_support_values);
- options.SetUseDynamic(use_dynamic);
- return GetVariables(options);
+ bool include_runtime_support_values = target ? target->GetDisplayRuntimeSupportValues() : false;
+ return GetVariables(arguments,
+ locals,
+ statics,
+ in_scope_only,
+ include_runtime_support_values,
+ use_dynamic);
}
SBValueList
-SBFrame::GetVariables (const lldb::SBVariablesOptions& options)
+SBFrame::GetVariables (bool arguments,
+ bool locals,
+ bool statics,
+ bool in_scope_only,
+ bool include_runtime_support_values,
+ lldb::DynamicValueType use_dynamic)
{
Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
@@ -1123,19 +1115,10 @@ SBFrame::GetVariables (const lldb::SBVariablesOptions& options)
StackFrame *frame = NULL;
Target *target = exe_ctx.GetTargetPtr();
- const bool statics = options.GetIncludeStatics();
- const bool arguments = options.GetIncludeArguments();
- const bool locals = options.GetIncludeLocals();
- const bool in_scope_only = options.GetInScopeOnly();
- const bool include_runtime_support_values = options.GetIncludeRuntimeSupportValues();
- const lldb::DynamicValueType use_dynamic = options.GetUseDynamic();
-
if (log)
- log->Printf ("SBFrame::GetVariables (arguments=%i, locals=%i, statics=%i, in_scope_only=%i runtime=%i dynamic=%i)",
- arguments, locals,
- statics, in_scope_only,
- include_runtime_support_values, use_dynamic);
-
+ log->Printf ("SBFrame::GetVariables (arguments=%i, locals=%i, statics=%i, in_scope_only=%i)",
+ arguments, locals, statics, in_scope_only);
+
Process *process = exe_ctx.GetProcessPtr();
if (target && process)
{
diff --git a/lldb/source/API/SBVariablesOptions.cpp b/lldb/source/API/SBVariablesOptions.cpp
deleted file mode 100644
index 7c453567c0a..00000000000
--- a/lldb/source/API/SBVariablesOptions.cpp
+++ /dev/null
@@ -1,254 +0,0 @@
-//===-- SBVariablesOptions.cpp --------------------------------------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-
-#include "lldb/API/SBVariablesOptions.h"
-
-using namespace lldb;
-using namespace lldb_private;
-
-class VariablesOptionsImpl
-{
-public:
- VariablesOptionsImpl () :
- m_include_arguments(false),
- m_include_locals(false),
- m_include_statics(false),
- m_in_scope_only(false),
- m_include_runtime_support_values(false),
- m_use_dynamic(lldb::eNoDynamicValues)
- {}
-
- VariablesOptionsImpl (const VariablesOptionsImpl&) = default;
-
- ~VariablesOptionsImpl () = default;
-
- VariablesOptionsImpl&
- operator = (const VariablesOptionsImpl&) = default;
-
- bool
- GetIncludeArguments () const
- {
- return m_include_arguments;
- }
-
- void
- SetIncludeArguments (bool b)
- {
- m_include_arguments = b;
- }
-
- bool
- GetIncludeLocals () const
- {
- return m_include_locals;
- }
-
- void
- SetIncludeLocals (bool b)
- {
- m_include_locals = b;
- }
-
- bool
- GetIncludeStatics () const
- {
- return m_include_statics;
- }
-
- void
- SetIncludeStatics (bool b)
- {
- m_include_statics = b;
- }
-
- bool
- GetInScopeOnly () const
- {
- return m_in_scope_only;
- }
-
- void
- SetInScopeOnly (bool b)
- {
- m_in_scope_only = b;
- }
-
- bool
- GetIncludeRuntimeSupportValues () const
- {
- return m_include_runtime_support_values;
- }
-
- void
- SetIncludeRuntimeSupportValues (bool b)
- {
- m_include_runtime_support_values = b;
- }
-
- lldb::DynamicValueType
- GetUseDynamic () const
- {
- return m_use_dynamic;
- }
-
- void
- SetUseDynamic (lldb::DynamicValueType d)
- {
- m_use_dynamic = d;
- }
-
-
-private:
- bool m_include_arguments : 1;
- bool m_include_locals : 1;
- bool m_include_statics : 1;
- bool m_in_scope_only : 1;
- bool m_include_runtime_support_values : 1;
- lldb::DynamicValueType m_use_dynamic;
-};
-
-SBVariablesOptions::SBVariablesOptions () :
-m_opaque_ap(new VariablesOptionsImpl())
-{
-}
-
-SBVariablesOptions::SBVariablesOptions (const SBVariablesOptions& options) :
-m_opaque_ap(new VariablesOptionsImpl(options.ref()))
-{
-}
-
-SBVariablesOptions&
-SBVariablesOptions::operator = (const SBVariablesOptions& options)
-{
- m_opaque_ap.reset(new VariablesOptionsImpl(options.ref()));
- return *this;
-}
-
-SBVariablesOptions::~SBVariablesOptions () = default;
-
-bool
-SBVariablesOptions::IsValid () const
-{
- return m_opaque_ap.get() != nullptr;
-}
-
-bool
-SBVariablesOptions::GetIncludeArguments () const
-{
- return m_opaque_ap->GetIncludeArguments();
-}
-
-void
-SBVariablesOptions::SetIncludeArguments (bool arguments)
-{
- m_opaque_ap->SetIncludeArguments(arguments);
-}
-
-bool
-SBVariablesOptions::GetIncludeLocals () const
-{
- return m_opaque_ap->GetIncludeLocals();
-}
-
-void
-SBVariablesOptions::SetIncludeLocals (bool locals)
-{
- m_opaque_ap->SetIncludeLocals(locals);
-}
-
-bool
-SBVariablesOptions::GetIncludeStatics () const
-{
- return m_opaque_ap->GetIncludeStatics();
-}
-
-void
-SBVariablesOptions::SetIncludeStatics (bool statics)
-{
- m_opaque_ap->SetIncludeStatics(statics);
-}
-
-bool
-SBVariablesOptions::GetInScopeOnly () const
-{
- return m_opaque_ap->GetInScopeOnly();
-}
-
-void
-SBVariablesOptions::SetInScopeOnly (bool in_scope_only)
-{
- m_opaque_ap->SetInScopeOnly(in_scope_only);
-}
-
-bool
-SBVariablesOptions::GetIncludeRuntimeSupportValues () const
-{
- return m_opaque_ap->GetIncludeRuntimeSupportValues();
-}
-
-void
-SBVariablesOptions::SetIncludeRuntimeSupportValues (bool runtime_support_values)
-{
- m_opaque_ap->SetIncludeRuntimeSupportValues(runtime_support_values);
-}
-
-lldb::DynamicValueType
-SBVariablesOptions::GetUseDynamic () const
-{
- return m_opaque_ap->GetUseDynamic();
-}
-
-void
-SBVariablesOptions::SetUseDynamic (lldb::DynamicValueType dynamic)
-{
- m_opaque_ap->SetUseDynamic(dynamic);
-}
-
-VariablesOptionsImpl *
-SBVariablesOptions::operator->()
-{
- return m_opaque_ap.operator->();
-}
-
-const VariablesOptionsImpl *
-SBVariablesOptions::operator->() const
-{
- return m_opaque_ap.operator->();
-}
-
-VariablesOptionsImpl *
-SBVariablesOptions::get ()
-{
- return m_opaque_ap.get();
-}
-
-VariablesOptionsImpl &
-SBVariablesOptions::ref()
-{
- return *m_opaque_ap;
-}
-
-const VariablesOptionsImpl &
-SBVariablesOptions::ref() const
-{
- return *m_opaque_ap;
-}
-
-SBVariablesOptions::SBVariablesOptions (VariablesOptionsImpl *lldb_object_ptr) :
-m_opaque_ap(std::move(lldb_object_ptr))
-{
-}
-
-void
-SBVariablesOptions::SetOptions (VariablesOptionsImpl *lldb_object_ptr)
-{
- m_opaque_ap.reset(std::move(lldb_object_ptr));
-}
-
OpenPOWER on IntegriCloud