Modified LLDB expressions to not have to JIT and run code just to see variable
values or persistent expression variables. Now if an expression consists of
a value that is a child of a variable, or of a persistent variable only, we
will create a value object for it and make a ValueObjectConstResult from it to
freeze the value (for program variables only, not persistent variables) and
avoid running JITed code. For everything else we still parse up and JIT code
and run it in the inferior.
There was also a lot of clean up in the expression code. I made the
ClangExpressionVariables be stored in collections of shared pointers instead
of in collections of objects. This will help stop a lot of copy constructors on
these large objects and also cleans up the code considerably. The persistent
clang expression variables were moved over to the Target to ensure they persist
across process executions.
Added the ability for lldb_private::Target objects to evaluate expressions.
We want to evaluate expressions at the target level in case we aren't running
yet, or we have just completed running. We still want to be able to access the
persistent expression variables between runs, and also evaluate constant
expressions.
Added extra logging to the dynamic loader plug-in for MacOSX. ModuleList objects
can now dump their contents with the UUID, arch and full paths being logged with
appropriate prefix values.
Thread hardened the Communication class a bit by making the connection auto_ptr
member into a shared pointer member and then making a local copy of the shared
pointer in each method that uses it to make sure another thread can't nuke the
connection object while it is being used by another thread.
Added a new file to the lldb/test/load_unload test that causes the test a.out file
to link to the libd.dylib file all the time. This will allow us to test using
the DYLD_LIBRARY_PATH environment variable after moving libd.dylib somewhere else.
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@121745 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Expression/ClangExpressionVariable.cpp b/source/Expression/ClangExpressionVariable.cpp
index a85bc24..79a7e4f 100644
--- a/source/Expression/ClangExpressionVariable.cpp
+++ b/source/Expression/ClangExpressionVariable.cpp
@@ -25,116 +25,109 @@
using namespace lldb_private;
using namespace clang;
-ClangExpressionVariable::ClangExpressionVariable() :
- m_name(),
- m_user_type (TypeFromUser(NULL, NULL)),
- m_store (NULL),
- m_register_info (NULL),
- m_index (0),
+ClangExpressionVariable::ClangExpressionVariable(lldb::ByteOrder byte_order, uint32_t addr_byte_size) :
m_parser_vars(),
m_jit_vars (),
- m_data_sp ()
+ m_valojb_sp (new ValueObjectConstResult(byte_order, addr_byte_size))
{
}
-void
-ClangExpressionVariable::DisableDataVars()
+ClangExpressionVariable::ClangExpressionVariable (const lldb::ValueObjectSP &valobj_sp) :
+ m_parser_vars(),
+ m_jit_vars (),
+ m_valojb_sp (valobj_sp)
{
- m_data_sp.reset();
}
-
-ClangExpressionVariable::ClangExpressionVariable(const ClangExpressionVariable &rhs) :
- m_name(rhs.m_name),
- m_user_type(rhs.m_user_type),
- m_store(rhs.m_store),
- m_register_info(rhs.m_register_info),
- m_index(rhs.m_index)
+//----------------------------------------------------------------------
+/// Return the variable's size in bytes
+//----------------------------------------------------------------------
+size_t
+ClangExpressionVariable::GetByteSize ()
{
- if (rhs.m_parser_vars.get())
- {
- // TODO: Sean, can m_parser_vars be a shared pointer??? We are copy
- // constructing it here. That is ok if we need to, but do we really
- // need to?
- m_parser_vars.reset(new struct ParserVars);
- *m_parser_vars.get() = *rhs.m_parser_vars.get();
- }
-
- if (rhs.m_jit_vars.get())
- {
- // TODO: Sean, can m_jit_vars be a shared pointer??? We are copy
- // constructing it here. That is ok if we need to, but do we really
- // need to?
- m_jit_vars.reset(new struct JITVars);
- *m_jit_vars.get() = *rhs.m_jit_vars.get();
- }
-
- if (rhs.m_data_sp)
- {
- // TODO: Sean, does m_data_sp need to be copy constructed? Or can it
- // shared the data?
-
- m_data_sp.reset(new DataBufferHeap (rhs.m_data_sp->GetBytes(),
- rhs.m_data_sp->GetByteSize()));
- }
-}
+ return m_valojb_sp->GetByteSize();
+}
-bool
-ClangExpressionVariable::PointValueAtData(Value &value, ExecutionContext *exe_ctx)
+const ConstString &
+ClangExpressionVariable::GetName ()
{
- if (m_data_sp.get() == NULL)
- return false;
-
- value.SetContext(Value::eContextTypeClangType, m_user_type.GetOpaqueQualType());
- value.SetValueType(Value::eValueTypeHostAddress);
- value.GetScalar() = (uintptr_t)m_data_sp->GetBytes();
- clang::ASTContext *ast_context = m_user_type.GetASTContext();
-
- if (exe_ctx)
- value.ResolveValue (exe_ctx, ast_context);
-
- return true;
-}
-
-void
-ClangExpressionVariable::EnableDataVars()
-{
- if (!m_data_sp.get())
- m_data_sp.reset(new DataBufferHeap);
-}
+ return m_valojb_sp->GetName();
+}
lldb::ValueObjectSP
-ClangExpressionVariable::GetExpressionResult (ExecutionContext *exe_ctx)
+ClangExpressionVariable::GetValueObject()
{
- lldb::ValueObjectSP result_sp;
- if (m_data_sp)
+ return m_valojb_sp;
+}
+
+lldb::RegisterInfo *
+ClangExpressionVariable::GetRegisterInfo()
+{
+ return m_valojb_sp->GetValue().GetRegisterInfo();
+}
+
+void
+ClangExpressionVariable::SetRegisterInfo (const lldb::RegisterInfo *reg_info)
+{
+ return m_valojb_sp->GetValue().SetContext (Value::eContextTypeRegisterInfo, const_cast<lldb::RegisterInfo *>(reg_info));
+}
+
+lldb::clang_type_t
+ClangExpressionVariable::GetClangType()
+{
+ return m_valojb_sp->GetClangType();
+}
+
+void
+ClangExpressionVariable::SetClangType(lldb::clang_type_t clang_type)
+{
+ m_valojb_sp->GetValue().SetContext(Value::eContextTypeClangType, clang_type);
+}
+
+clang::ASTContext *
+ClangExpressionVariable::GetClangAST()
+{
+ return m_valojb_sp->GetClangAST();
+}
+
+void
+ClangExpressionVariable::SetClangAST (clang::ASTContext *ast)
+{
+ m_valojb_sp->SetClangAST (ast);
+}
+
+TypeFromUser
+ClangExpressionVariable::GetTypeFromUser()
+{
+ TypeFromUser tfu (m_valojb_sp->GetClangType(), m_valojb_sp->GetClangAST());
+ return tfu;
+}
+
+uint8_t *
+ClangExpressionVariable::GetValueBytes()
+{
+ const size_t byte_size = m_valojb_sp->GetByteSize();
+ if (byte_size > 0)
{
- Target * target = NULL;
- Process *process = NULL;
- if (exe_ctx)
+ if (m_valojb_sp->GetDataExtractor().GetByteSize() < byte_size)
{
- target = exe_ctx->target;
- process = exe_ctx->process;
+ m_valojb_sp->GetValue().ResizeData(byte_size);
+ m_valojb_sp->GetValue().GetData (m_valojb_sp->GetDataExtractor());
}
-
- Value value;
- if (PointValueAtData(value, exe_ctx))
- {
- lldb::ByteOrder byte_order = lldb::eByteOrderHost;
- uint32_t addr_byte_size = 4;
- if (process)
- {
- byte_order = process->GetByteOrder();
- addr_byte_size = process->GetAddressByteSize();
- }
- result_sp.reset (new ValueObjectConstResult (m_user_type.GetASTContext(),
- m_user_type.GetOpaqueQualType(),
- m_name,
- m_data_sp,// TODO: sean can you get this to be valid?
- byte_order,
- addr_byte_size));
- }
+ return const_cast<uint8_t *>(m_valojb_sp->GetDataExtractor().GetDataStart());
}
- return result_sp;
+ return NULL;
+}
+
+void
+ClangExpressionVariable::SetName (const ConstString &name)
+{
+ m_valojb_sp->SetName (name);
+}
+
+void
+ClangExpressionVariable::ValueUpdated ()
+{
+ m_valojb_sp->ValueUpdated ();
}