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/ClangExpressionDeclMap.cpp b/source/Expression/ClangExpressionDeclMap.cpp
index b210d49..be6d709 100644
--- a/source/Expression/ClangExpressionDeclMap.cpp
+++ b/source/Expression/ClangExpressionDeclMap.cpp
@@ -59,7 +59,8 @@
DisableStructVars();
}
-void ClangExpressionDeclMap::WillParse(ExecutionContext &exe_ctx)
+void
+ClangExpressionDeclMap::WillParse(ExecutionContext &exe_ctx)
{
EnableParserVars();
m_parser_vars->m_exe_ctx = &exe_ctx;
@@ -69,32 +70,35 @@
else if (exe_ctx.thread)
m_parser_vars->m_sym_ctx = exe_ctx.thread->GetStackFrameAtIndex(0)->GetSymbolContext(lldb::eSymbolContextEverything);
- if (exe_ctx.process)
- m_parser_vars->m_persistent_vars = &exe_ctx.process->GetPersistentVariables();
+ if (exe_ctx.target)
+ m_parser_vars->m_persistent_vars = &exe_ctx.target->GetPersistentVariables();
}
-void ClangExpressionDeclMap::DidParse()
+void
+ClangExpressionDeclMap::DidParse()
{
if (m_parser_vars.get())
{
- for (uint64_t entity_index = 0, num_entities = m_found_entities.Size();
+ for (size_t entity_index = 0, num_entities = m_found_entities.GetSize();
entity_index < num_entities;
++entity_index)
{
- ClangExpressionVariable &entity(m_found_entities.VariableAtIndex(entity_index));
- if (entity.m_parser_vars.get() &&
- entity.m_parser_vars->m_lldb_value)
- delete entity.m_parser_vars->m_lldb_value;
+ ClangExpressionVariableSP var_sp(m_found_entities.GetVariableAtIndex(entity_index));
+ if (var_sp &&
+ var_sp->m_parser_vars.get() &&
+ var_sp->m_parser_vars->m_lldb_value)
+ delete var_sp->m_parser_vars->m_lldb_value;
- entity.DisableParserVars();
+ var_sp->DisableParserVars();
}
- for (uint64_t pvar_index = 0, num_pvars = m_parser_vars->m_persistent_vars->Size();
+ for (size_t pvar_index = 0, num_pvars = m_parser_vars->m_persistent_vars->GetSize();
pvar_index < num_pvars;
++pvar_index)
{
- ClangExpressionVariable &pvar(m_parser_vars->m_persistent_vars->VariableAtIndex(pvar_index));
- pvar.DisableParserVars();
+ ClangExpressionVariableSP pvar_sp(m_parser_vars->m_persistent_vars->GetVariableAtIndex(pvar_index));
+ if (pvar_sp)
+ pvar_sp->DisableParserVars();
}
DisableParserVars();
@@ -108,10 +112,12 @@
{
assert (m_struct_vars.get());
assert (m_parser_vars.get());
-
if (!m_struct_vars->m_result_name)
- m_parser_vars->m_persistent_vars->GetNextResultName(m_struct_vars->m_result_name);
-
+ {
+ Target *target = m_parser_vars->GetTarget();
+ assert (target);
+ m_struct_vars->m_result_name = target->GetPersistentVariables().GetNextPersistentVariableName();
+ }
return m_struct_vars->m_result_name;
}
@@ -132,18 +138,21 @@
parser_type.GetOpaqueQualType()),
context);
- if (!m_parser_vars->m_persistent_vars->CreatePersistentVariable (name, user_type))
+ if (!m_parser_vars->m_persistent_vars->CreatePersistentVariable (name,
+ user_type,
+ m_parser_vars->m_exe_ctx->process->GetByteOrder(),
+ m_parser_vars->m_exe_ctx->process->GetAddressByteSize()))
return false;
- ClangExpressionVariable *var = m_parser_vars->m_persistent_vars->GetVariable(name);
+ ClangExpressionVariableSP var_sp (m_parser_vars->m_persistent_vars->GetVariable(name));
- if (!var)
+ if (!var_sp)
return false;
- var->EnableParserVars();
+ var_sp->EnableParserVars();
- var->m_parser_vars->m_named_decl = decl;
- var->m_parser_vars->m_parser_type = parser_type;
+ var_sp->m_parser_vars->m_named_decl = decl;
+ var_sp->m_parser_vars->m_parser_type = parser_type;
return true;
}
@@ -168,29 +177,29 @@
if (m_struct_members.GetVariable(decl))
return true;
- ClangExpressionVariable *var = m_found_entities.GetVariable(decl);
+ ClangExpressionVariableSP var_sp (m_found_entities.GetVariable(decl));
- if (!var)
- var = m_parser_vars->m_persistent_vars->GetVariable(decl);
+ if (!var_sp)
+ var_sp = m_parser_vars->m_persistent_vars->GetVariable(decl);
- if (!var)
+ if (!var_sp)
return false;
if (log)
log->Printf("Adding value for decl %p [%s - %s] to the structure",
decl,
name.GetCString(),
- var->m_name.GetCString());
+ var_sp->GetName().GetCString());
// We know entity->m_parser_vars is valid because we used a parser variable
// to find it
- var->m_parser_vars->m_llvm_value = value;
+ var_sp->m_parser_vars->m_llvm_value = value;
- var->EnableJITVars();
- var->m_jit_vars->m_alignment = alignment;
- var->m_jit_vars->m_size = size;
+ var_sp->EnableJITVars();
+ var_sp->m_jit_vars->m_alignment = alignment;
+ var_sp->m_jit_vars->m_size = size;
- m_struct_members.AddVariable(*var);
+ m_struct_members.AddVariable(var_sp);
return true;
}
@@ -208,23 +217,25 @@
m_struct_vars->m_struct_alignment = 0;
m_struct_vars->m_struct_size = 0;
- for (uint64_t member_index = 0, num_members = m_struct_members.Size();
+ for (size_t member_index = 0, num_members = m_struct_members.GetSize();
member_index < num_members;
++member_index)
{
- ClangExpressionVariable &member(m_struct_members.VariableAtIndex(member_index));
-
- if (!member.m_jit_vars.get())
+ ClangExpressionVariableSP member_sp(m_struct_members.GetVariableAtIndex(member_index));
+ if (!member_sp)
+ return false;
+
+ if (!member_sp->m_jit_vars.get())
return false;
if (member_index == 0)
- m_struct_vars->m_struct_alignment = member.m_jit_vars->m_alignment;
+ m_struct_vars->m_struct_alignment = member_sp->m_jit_vars->m_alignment;
- if (cursor % member.m_jit_vars->m_alignment)
- cursor += (member.m_jit_vars->m_alignment - (cursor % member.m_jit_vars->m_alignment));
+ if (cursor % member_sp->m_jit_vars->m_alignment)
+ cursor += (member_sp->m_jit_vars->m_alignment - (cursor % member_sp->m_jit_vars->m_alignment));
- member.m_jit_vars->m_offset = cursor;
- cursor += member.m_jit_vars->m_size;
+ member_sp->m_jit_vars->m_offset = cursor;
+ cursor += member_sp->m_jit_vars->m_size;
}
m_struct_vars->m_struct_size = cursor;
@@ -245,7 +256,7 @@
if (!m_struct_vars->m_struct_laid_out)
return false;
- num_elements = m_struct_members.Size();
+ num_elements = m_struct_members.GetSize();
size = m_struct_vars->m_struct_size;
alignment = m_struct_vars->m_struct_alignment;
@@ -267,19 +278,20 @@
if (!m_struct_vars->m_struct_laid_out)
return false;
- if (index >= m_struct_members.Size())
+ if (index >= m_struct_members.GetSize())
return false;
- ClangExpressionVariable &member(m_struct_members.VariableAtIndex(index));
+ ClangExpressionVariableSP member_sp(m_struct_members.GetVariableAtIndex(index));
- if (!member.m_parser_vars.get() ||
- !member.m_jit_vars.get())
+ if (!member_sp ||
+ !member_sp->m_parser_vars.get() ||
+ !member_sp->m_jit_vars.get())
return false;
- decl = member.m_parser_vars->m_named_decl;
- value = member.m_parser_vars->m_llvm_value;
- offset = member.m_jit_vars->m_offset;
- name = member.m_name;
+ decl = member_sp->m_parser_vars->m_named_decl;
+ value = member_sp->m_parser_vars->m_llvm_value;
+ offset = member_sp->m_jit_vars->m_offset;
+ name = member_sp->GetName();
return true;
}
@@ -292,16 +304,16 @@
uint64_t &ptr
)
{
- ClangExpressionVariable *entity = m_found_entities.GetVariable(decl);
+ ClangExpressionVariableSP entity_sp(m_found_entities.GetVariable(decl));
- if (!entity)
+ if (!entity_sp)
return false;
// We know m_parser_vars is valid since we searched for the variable by
// its NamedDecl
- value = &entity->m_parser_vars->m_llvm_value;
- ptr = entity->m_parser_vars->m_lldb_value->GetScalar().ULongLong();
+ value = &entity_sp->m_parser_vars->m_llvm_value;
+ ptr = entity_sp->m_parser_vars->m_lldb_value->GetScalar().ULongLong();
return true;
}
@@ -453,11 +465,11 @@
ClangExpressionDeclMap::Dematerialize
(
ExecutionContext &exe_ctx,
- ClangExpressionVariable *&result,
+ ClangExpressionVariableSP &result_sp,
Error &err
)
{
- return DoMaterialize(true, exe_ctx, &result, err);
+ return DoMaterialize(true, exe_ctx, &result_sp, err);
DidDematerialize();
}
@@ -527,26 +539,29 @@
DataExtractor extractor(data, exe_ctx.process->GetByteOrder(), exe_ctx.target->GetArchitecture().GetAddressByteSize());
- for (uint64_t member_index = 0, num_members = m_struct_members.Size();
- member_index < num_members;
- ++member_index)
+ for (size_t member_idx = 0, num_members = m_struct_members.GetSize();
+ member_idx < num_members;
+ ++member_idx)
{
- ClangExpressionVariable &member (m_struct_members.VariableAtIndex(member_index));
+ ClangExpressionVariableSP member_sp(m_struct_members.GetVariableAtIndex(member_idx));
- s.Printf("[%s]\n", member.m_name.GetCString());
+ if (!member_sp)
+ return false;
+
+ s.Printf("[%s]\n", member_sp->GetName().GetCString());
- if (!member.m_jit_vars.get())
+ if (!member_sp->m_jit_vars.get())
return false;
- extractor.Dump(&s, // stream
- member.m_jit_vars->m_offset, // offset
- lldb::eFormatBytesWithASCII, // format
- 1, // byte size of individual entries
- member.m_jit_vars->m_size, // number of entries
- 16, // entries per line
- m_material_vars->m_materialized_location + member.m_jit_vars->m_offset, // address to print
- 0, // bit size (bitfields only; 0 means ignore)
- 0); // bit alignment (bitfields only; 0 means ignore)
+ extractor.Dump (&s, // stream
+ member_sp->m_jit_vars->m_offset, // offset
+ lldb::eFormatBytesWithASCII, // format
+ 1, // byte size of individual entries
+ member_sp->m_jit_vars->m_size, // number of entries
+ 16, // entries per line
+ m_material_vars->m_materialized_location + member_sp->m_jit_vars->m_offset, // address to print
+ 0, // bit size (bitfields only; 0 means ignore)
+ 0); // bit alignment (bitfields only; 0 means ignore)
s.PutChar('\n');
}
@@ -559,10 +574,13 @@
(
bool dematerialize,
ExecutionContext &exe_ctx,
- ClangExpressionVariable **result,
+ lldb::ClangExpressionVariableSP *result_sp_ptr,
Error &err
)
{
+ if (result_sp_ptr)
+ result_sp_ptr->reset();
+
assert (m_struct_vars.get());
lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
@@ -579,7 +597,7 @@
return LLDB_INVALID_ADDRESS;
}
- ClangPersistentVariables &persistent_vars = exe_ctx.process->GetPersistentVariables();
+ ClangPersistentVariables &persistent_vars = exe_ctx.target->GetPersistentVariables();
if (!m_struct_vars->m_struct_size)
{
@@ -619,26 +637,20 @@
if (m_material_vars->m_materialized_location % m_struct_vars->m_struct_alignment)
m_material_vars->m_materialized_location += (m_struct_vars->m_struct_alignment - (m_material_vars->m_materialized_location % m_struct_vars->m_struct_alignment));
- for (uint64_t member_index = 0, num_members = m_struct_members.Size();
+ for (uint64_t member_index = 0, num_members = m_struct_members.GetSize();
member_index < num_members;
++member_index)
{
- ClangExpressionVariable &member (m_struct_members.VariableAtIndex(member_index));
+ ClangExpressionVariableSP member_sp(m_struct_members.GetVariableAtIndex(member_index));
- ClangExpressionVariable *entity = NULL;
-
- /*
- if (member.m_parser_vars.get())
- entity = m_found_entities.GetVariable(member.m_parser_vars->m_named_decl);
- */
-
- entity = m_found_entities.GetVariable(member.m_name);
+ ClangExpressionVariableSP entity_sp (m_found_entities.GetVariable(member_sp->GetName()));
- ClangExpressionVariable *persistent_variable = persistent_vars.GetVariable(member.m_name);
+ ClangExpressionVariableSP persistent_var_sp (persistent_vars.GetVariable(member_sp->GetName()));
- if (entity)
+ if (entity_sp)
{
- if (entity->m_register_info)
+ RegisterInfo *reg_info = entity_sp->GetRegisterInfo ();
+ if (reg_info)
{
// This is a register variable
@@ -647,21 +659,32 @@
if (!reg_ctx)
return false;
- if (!DoMaterializeOneRegister(dematerialize, exe_ctx, *reg_ctx, *entity->m_register_info, m_material_vars->m_materialized_location + member.m_jit_vars->m_offset, err))
+ if (!DoMaterializeOneRegister (dematerialize,
+ exe_ctx,
+ *reg_ctx,
+ *reg_info,
+ m_material_vars->m_materialized_location + member_sp->m_jit_vars->m_offset,
+ err))
return false;
}
else
{
- if (!member.m_jit_vars.get())
+ if (!member_sp->m_jit_vars.get())
return false;
- if (!DoMaterializeOneVariable(dematerialize, exe_ctx, sym_ctx, member.m_name, member.m_user_type, m_material_vars->m_materialized_location + member.m_jit_vars->m_offset, err))
+ if (!DoMaterializeOneVariable (dematerialize,
+ exe_ctx,
+ sym_ctx,
+ member_sp->GetName(),
+ member_sp->GetTypeFromUser(),
+ m_material_vars->m_materialized_location + member_sp->m_jit_vars->m_offset,
+ err))
return false;
}
}
- else if (persistent_variable)
+ else if (persistent_var_sp)
{
- if (member.m_name == m_struct_vars->m_result_name)
+ if (member_sp->GetName() == m_struct_vars->m_result_name)
{
if (!dematerialize)
continue;
@@ -669,18 +692,23 @@
if (log)
log->PutCString("Found result member in the struct");
- *result = &member;
+ if (result_sp_ptr)
+ *result_sp_ptr = member_sp;
}
if (log)
- log->Printf("Searched for persistent variable %s and found %s", member.m_name.GetCString(), persistent_variable->m_name.GetCString());
+ log->Printf("Searched for persistent variable %s and found %s", member_sp->GetName().GetCString(), persistent_var_sp->GetName().GetCString());
- if (!DoMaterializeOnePersistentVariable(dematerialize, exe_ctx, persistent_variable->m_name, m_material_vars->m_materialized_location + member.m_jit_vars->m_offset, err))
+ if (!DoMaterializeOnePersistentVariable (dematerialize,
+ exe_ctx,
+ persistent_var_sp,
+ m_material_vars->m_materialized_location + member_sp->m_jit_vars->m_offset,
+ err))
return false;
}
else
{
- err.SetErrorStringWithFormat("Unexpected variable %s", member.m_name.GetCString());
+ err.SetErrorStringWithFormat("Unexpected variable %s", member_sp->GetName().GetCString());
return false;
}
}
@@ -693,32 +721,29 @@
(
bool dematerialize,
ExecutionContext &exe_ctx,
- const ConstString &name,
+ ClangExpressionVariableSP &var_sp,
lldb::addr_t addr,
Error &err
)
{
- ClangPersistentVariables &persistent_vars = exe_ctx.process->GetPersistentVariables();
-
- ClangExpressionVariable *pvar(persistent_vars.GetVariable(name));
-
- if (!pvar)
+ if (!var_sp)
{
- err.SetErrorStringWithFormat("Undefined persistent variable %s", name.GetCString());
+ err.SetErrorString("Invalid persistent variable");
return LLDB_INVALID_ADDRESS;
}
- size_t pvar_size = pvar->Size();
+ const size_t pvar_byte_size = var_sp->GetByteSize();
- if (!pvar->m_data_sp.get())
+ uint8_t *pvar_data = var_sp->GetValueBytes();
+ if (pvar_data == NULL)
return false;
- uint8_t *pvar_data = pvar->m_data_sp->GetBytes();
Error error;
if (dematerialize)
{
- if (exe_ctx.process->ReadMemory (addr, pvar_data, pvar_size, error) != pvar_size)
+ var_sp->ValueUpdated ();
+ if (exe_ctx.process->ReadMemory (addr, pvar_data, pvar_byte_size, error) != pvar_byte_size)
{
err.SetErrorStringWithFormat ("Couldn't read a composite type from the target: %s", error.AsCString());
return false;
@@ -726,7 +751,7 @@
}
else
{
- if (exe_ctx.process->WriteMemory (addr, pvar_data, pvar_size, error) != pvar_size)
+ if (exe_ctx.process->WriteMemory (addr, pvar_data, pvar_byte_size, error) != pvar_byte_size)
{
err.SetErrorStringWithFormat ("Couldn't write a composite type to the target: %s", error.AsCString());
return false;
@@ -1201,11 +1226,7 @@
{
clang::NamespaceDecl *clang_namespace_decl = AddNamespace(context, namespace_decl);
if (clang_namespace_decl)
- {
- // TODO: is this how we get the decl lookups to be called for
- // this namespace??
clang_namespace_decl->setHasExternalLexicalStorage();
- }
}
}
}
@@ -1312,12 +1333,12 @@
return;
}
-
- ClangExpressionVariable *pvar(m_parser_vars->m_persistent_vars->GetVariable(name));
+
+ ClangExpressionVariableSP pvar_sp(m_parser_vars->m_persistent_vars->GetVariable(name));
- if (pvar)
+ if (pvar_sp)
{
- AddOneVariable(context, pvar);
+ AddOneVariable(context, pvar_sp);
return;
}
@@ -1493,17 +1514,18 @@
return;
NamedDecl *var_decl = context.AddVarDecl(pt.GetOpaqueQualType());
-
- ClangExpressionVariable &entity(m_found_entities.VariableAtIndex(m_found_entities.CreateVariable()));
std::string decl_name(context.m_decl_name.getAsString());
- entity.m_name.SetCString (decl_name.c_str());
- entity.m_user_type = ut;
-
- entity.EnableParserVars();
- entity.m_parser_vars->m_parser_type = pt;
- entity.m_parser_vars->m_named_decl = var_decl;
- entity.m_parser_vars->m_llvm_value = NULL;
- entity.m_parser_vars->m_lldb_value = var_location;
+ ConstString entity_name(decl_name.c_str());
+ ClangExpressionVariableSP entity(m_found_entities.CreateVariable (entity_name,
+ ut,
+ m_parser_vars->m_exe_ctx->process->GetByteOrder(),
+ m_parser_vars->m_exe_ctx->process->GetAddressByteSize()));
+ assert (entity.get());
+ entity->EnableParserVars();
+ entity->m_parser_vars->m_parser_type = pt;
+ entity->m_parser_vars->m_named_decl = var_decl;
+ entity->m_parser_vars->m_llvm_value = NULL;
+ entity->m_parser_vars->m_lldb_value = var_location;
if (log)
{
@@ -1518,24 +1540,24 @@
void
ClangExpressionDeclMap::AddOneVariable(NameSearchContext &context,
- ClangExpressionVariable *pvar)
+ ClangExpressionVariableSP &pvar_sp)
{
lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
- TypeFromUser user_type = pvar->m_user_type;
+ TypeFromUser user_type (pvar_sp->GetTypeFromUser());
- TypeFromParser parser_type(GuardedCopyType(context.GetASTContext(),
- user_type.GetASTContext(),
- user_type.GetOpaqueQualType()),
- context.GetASTContext());
+ TypeFromParser parser_type (GuardedCopyType(context.GetASTContext(),
+ user_type.GetASTContext(),
+ user_type.GetOpaqueQualType()),
+ context.GetASTContext());
NamedDecl *var_decl = context.AddVarDecl(parser_type.GetOpaqueQualType());
- pvar->EnableParserVars();
- pvar->m_parser_vars->m_parser_type = parser_type;
- pvar->m_parser_vars->m_named_decl = var_decl;
- pvar->m_parser_vars->m_llvm_value = NULL;
- pvar->m_parser_vars->m_lldb_value = NULL;
+ pvar_sp->EnableParserVars();
+ pvar_sp->m_parser_vars->m_parser_type = parser_type;
+ pvar_sp->m_parser_vars->m_named_decl = var_decl;
+ pvar_sp->m_parser_vars->m_llvm_value = NULL;
+ pvar_sp->m_parser_vars->m_lldb_value = NULL;
if (log)
{
@@ -1544,13 +1566,13 @@
var_decl->print(var_decl_print_stream);
var_decl_print_stream.flush();
- log->Printf("Added pvar %s, returned %s", pvar->m_name.GetCString(), var_decl_print_string.c_str());
+ log->Printf("Added pvar %s, returned %s", pvar_sp->GetName().GetCString(), var_decl_print_string.c_str());
}
}
void
-ClangExpressionDeclMap::AddOneRegister(NameSearchContext &context,
- const RegisterInfo *reg_info)
+ClangExpressionDeclMap::AddOneRegister (NameSearchContext &context,
+ const RegisterInfo *reg_info)
{
lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
@@ -1564,21 +1586,22 @@
return;
}
- TypeFromParser parser_type(ast_type,
- context.GetASTContext());
+ TypeFromParser parser_type (ast_type,
+ context.GetASTContext());
NamedDecl *var_decl = context.AddVarDecl(parser_type.GetOpaqueQualType());
- ClangExpressionVariable &entity(m_found_entities.VariableAtIndex(m_found_entities.CreateVariable()));
+ ClangExpressionVariableSP entity(m_found_entities.CreateVariable (m_parser_vars->m_exe_ctx->process->GetByteOrder(),
+ m_parser_vars->m_exe_ctx->process->GetAddressByteSize()));
+ assert (entity.get());
std::string decl_name(context.m_decl_name.getAsString());
- entity.m_name.SetCString (decl_name.c_str());
- entity.m_register_info = reg_info;
-
- entity.EnableParserVars();
- entity.m_parser_vars->m_parser_type = parser_type;
- entity.m_parser_vars->m_named_decl = var_decl;
- entity.m_parser_vars->m_llvm_value = NULL;
- entity.m_parser_vars->m_lldb_value = NULL;
+ entity->SetName (ConstString (decl_name.c_str()));
+ entity->SetRegisterInfo (reg_info);
+ entity->EnableParserVars();
+ entity->m_parser_vars->m_parser_type = parser_type;
+ entity->m_parser_vars->m_named_decl = var_decl;
+ entity->m_parser_vars->m_llvm_value = NULL;
+ entity->m_parser_vars->m_lldb_value = NULL;
if (log)
{
@@ -1666,15 +1689,18 @@
fun_location->SetValueType(Value::eValueTypeLoadAddress);
fun_location->GetScalar() = load_addr;
- ClangExpressionVariable &entity(m_found_entities.VariableAtIndex(m_found_entities.CreateVariable()));
+ ClangExpressionVariableSP entity(m_found_entities.CreateVariable (m_parser_vars->m_exe_ctx->process->GetByteOrder(),
+ m_parser_vars->m_exe_ctx->process->GetAddressByteSize()));
+ assert (entity.get());
std::string decl_name(context.m_decl_name.getAsString());
- entity.m_name.SetCString(decl_name.c_str());
- entity.m_user_type = TypeFromUser(fun_opaque_type, fun_ast_context);;
+ entity->SetName(ConstString(decl_name.c_str()));
+ entity->SetClangType (fun_opaque_type);
+ entity->SetClangAST (fun_ast_context);
- entity.EnableParserVars();
- entity.m_parser_vars->m_named_decl = fun_decl;
- entity.m_parser_vars->m_llvm_value = NULL;
- entity.m_parser_vars->m_lldb_value = fun_location.release();
+ entity->EnableParserVars();
+ entity->m_parser_vars->m_named_decl = fun_decl;
+ entity->m_parser_vars->m_llvm_value = NULL;
+ entity->m_parser_vars->m_lldb_value = fun_location.release();
if (log)
{
diff --git a/source/Expression/ClangExpressionParser.cpp b/source/Expression/ClangExpressionParser.cpp
index be7a4e9..80ce515 100644
--- a/source/Expression/ClangExpressionParser.cpp
+++ b/source/Expression/ClangExpressionParser.cpp
@@ -367,7 +367,7 @@
return err;
}
- ClangExpressionVariableStore *local_variables = m_expr.LocalVariables();
+ ClangExpressionVariableList *local_variables = m_expr.LocalVariables();
ClangExpressionDeclMap *decl_map = m_expr.DeclMap();
if (!local_variables)
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 ();
}
diff --git a/source/Expression/ClangFunction.cpp b/source/Expression/ClangFunction.cpp
index 3eac429..e55238d 100644
--- a/source/Expression/ClangFunction.cpp
+++ b/source/Expression/ClangFunction.cpp
@@ -275,7 +275,7 @@
Error error;
using namespace clang;
- Process::ExecutionResults return_value = Process::eExecutionSetupError;
+ lldb::ExecutionResults return_value = lldb::eExecutionSetupError;
Process *process = exe_ctx.process;
@@ -441,13 +441,13 @@
exe_ctx.process->DeallocateMemory(args_addr);
}
-Process::ExecutionResults
+lldb::ExecutionResults
ClangFunction::ExecuteFunction(ExecutionContext &exe_ctx, Stream &errors, Value &results)
{
return ExecuteFunction (exe_ctx, errors, 1000, true, results);
}
-Process::ExecutionResults
+lldb::ExecutionResults
ClangFunction::ExecuteFunction(ExecutionContext &exe_ctx, Stream &errors, bool stop_others, Value &results)
{
const bool try_all_threads = false;
@@ -455,7 +455,7 @@
return ExecuteFunction (exe_ctx, NULL, errors, stop_others, NULL, try_all_threads, discard_on_error, results);
}
-Process::ExecutionResults
+lldb::ExecutionResults
ClangFunction::ExecuteFunction(
ExecutionContext &exe_ctx,
Stream &errors,
@@ -470,7 +470,7 @@
}
// This is the static function
-Process::ExecutionResults
+lldb::ExecutionResults
ClangFunction::ExecuteFunction (
ExecutionContext &exe_ctx,
lldb::addr_t function_address,
@@ -486,7 +486,7 @@
errors, stop_others, discard_on_error,
this_arg));
if (call_plan_sp == NULL)
- return Process::eExecutionSetupError;
+ return lldb::eExecutionSetupError;
call_plan_sp->SetPrivate(true);
@@ -494,7 +494,7 @@
single_thread_timeout_usec, errors);
}
-Process::ExecutionResults
+lldb::ExecutionResults
ClangFunction::ExecuteFunction(
ExecutionContext &exe_ctx,
lldb::addr_t *args_addr_ptr,
@@ -506,7 +506,7 @@
Value &results)
{
using namespace clang;
- Process::ExecutionResults return_value = Process::eExecutionSetupError;
+ lldb::ExecutionResults return_value = lldb::eExecutionSetupError;
lldb::addr_t args_addr;
@@ -516,12 +516,12 @@
args_addr = LLDB_INVALID_ADDRESS;
if (CompileFunction(errors) != 0)
- return Process::eExecutionSetupError;
+ return lldb::eExecutionSetupError;
if (args_addr == LLDB_INVALID_ADDRESS)
{
if (!InsertFunction(exe_ctx, args_addr, errors))
- return Process::eExecutionSetupError;
+ return lldb::eExecutionSetupError;
}
return_value = ClangFunction::ExecuteFunction(exe_ctx, m_wrapper_function_addr, args_addr, stop_others,
@@ -530,7 +530,7 @@
if (args_addr_ptr != NULL)
*args_addr_ptr = args_addr;
- if (return_value != Process::eExecutionCompleted)
+ if (return_value != lldb::eExecutionCompleted)
return return_value;
FetchFunctionResults(exe_ctx, args_addr, results);
@@ -538,7 +538,7 @@
if (args_addr_ptr == NULL)
DeallocateFunctionResults(exe_ctx, args_addr);
- return Process::eExecutionCompleted;
+ return lldb::eExecutionCompleted;
}
clang::ASTConsumer *
diff --git a/source/Expression/ClangPersistentVariables.cpp b/source/Expression/ClangPersistentVariables.cpp
index 4919922..5e61524 100644
--- a/source/Expression/ClangPersistentVariables.cpp
+++ b/source/Expression/ClangPersistentVariables.cpp
@@ -13,38 +13,39 @@
#include "lldb/Core/StreamString.h"
#include "lldb/Core/Value.h"
+using namespace lldb;
using namespace lldb_private;
ClangPersistentVariables::ClangPersistentVariables () :
- ClangExpressionVariableStore()
+ ClangExpressionVariableList(),
+ m_next_persistent_variable_id (0)
{
- m_result_counter = 0;
}
-void
-ClangPersistentVariables::GetNextResultName (ConstString &name)
+ClangExpressionVariableSP
+ClangPersistentVariables::CreatePersistentVariable (const lldb::ValueObjectSP &valobj_sp)
{
- char result_name[256];
- ::snprintf (result_name, sizeof(result_name), "$%llu", m_result_counter++);
- name.SetCString(result_name);
+ ClangExpressionVariableSP var_sp (CreateVariable(valobj_sp));
+ return var_sp;
}
-bool
-ClangPersistentVariables::CreatePersistentVariable (const ConstString &name,
- TypeFromUser user_type)
+ClangExpressionVariableSP
+ClangPersistentVariables::CreatePersistentVariable (const ConstString &name, const TypeFromUser& user_type, lldb::ByteOrder byte_order, uint32_t addr_byte_size)
{
- if (GetVariable(name))
- return false;
-
- ClangExpressionVariable &pvar (VariableAtIndex(CreateVariable()));
-
- pvar.m_name = name;
- pvar.m_user_type = user_type;
- // TODO: Sean, why do we need to call this?, we can just make it below
- // and we aren't checking the result or anything... Is this cruft left
- // over from an old code re-org?
- //pvar.EnableDataVars();
- pvar.m_data_sp.reset(new DataBufferHeap(pvar.Size(), 0));
+ ClangExpressionVariableSP var_sp (GetVariable(name));
- return true;
-}
\ No newline at end of file
+ if (!var_sp)
+ var_sp = CreateVariable(name, user_type, byte_order, addr_byte_size);
+
+ return var_sp;
+}
+
+
+ConstString
+ClangPersistentVariables::GetNextPersistentVariableName ()
+{
+ char name_cstr[256];
+ ::snprintf (name_cstr, sizeof(name_cstr), "$%u", m_next_persistent_variable_id++);
+ ConstString name(name_cstr);
+ return name;
+}
diff --git a/source/Expression/ClangUserExpression.cpp b/source/Expression/ClangUserExpression.cpp
index aa51106..278cee7 100644
--- a/source/Expression/ClangUserExpression.cpp
+++ b/source/Expression/ClangUserExpression.cpp
@@ -271,7 +271,7 @@
m_dwarf_opcodes->SetByteOrder (lldb::eByteOrderHost);
m_dwarf_opcodes->GetFlags ().Set (Stream::eBinary);
- m_local_variables.reset(new ClangExpressionVariableStore());
+ m_local_variables.reset(new ClangExpressionVariableList());
Error dwarf_error = parser.MakeDWARF ();
@@ -422,7 +422,7 @@
bool
ClangUserExpression::FinalizeJITExecution (Stream &error_stream,
ExecutionContext &exe_ctx,
- ClangExpressionVariable *&result)
+ lldb::ClangExpressionVariableSP &result)
{
Error expr_error;
@@ -454,12 +454,12 @@
return true;
}
-Process::ExecutionResults
+lldb::ExecutionResults
ClangUserExpression::Execute (Stream &error_stream,
ExecutionContext &exe_ctx,
bool discard_on_error,
ClangUserExpression::ClangUserExpressionSP &shared_ptr_to_me,
- ClangExpressionVariable *&result)
+ lldb::ClangExpressionVariableSP &result)
{
lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
@@ -469,7 +469,7 @@
error_stream.Printf("We don't currently support executing DWARF expressions");
- return Process::eExecutionSetupError;
+ return lldb::eExecutionSetupError;
}
else if (m_jit_addr != LLDB_INVALID_ADDRESS)
{
@@ -479,7 +479,7 @@
lldb::addr_t cmd_ptr = NULL;
if (!PrepareToExecuteJITExpression (error_stream, exe_ctx, struct_address, object_ptr, cmd_ptr))
- return Process::eExecutionSetupError;
+ return lldb::eExecutionSetupError;
const bool stop_others = true;
const bool try_all_threads = true;
@@ -495,7 +495,7 @@
shared_ptr_to_me));
if (call_plan_sp == NULL || !call_plan_sp->ValidatePlan (NULL))
- return Process::eExecutionSetupError;
+ return lldb::eExecutionSetupError;
call_plan_sp->SetPrivate(true);
@@ -504,14 +504,18 @@
if (log)
log->Printf("-- [ClangUserExpression::Execute] Execution of expression begins --");
- Process::ExecutionResults execution_result =
- exe_ctx.process->RunThreadPlan (exe_ctx, call_plan_sp, stop_others, try_all_threads, discard_on_error,
- single_thread_timeout_usec, error_stream);
+ lldb::ExecutionResults execution_result = exe_ctx.process->RunThreadPlan (exe_ctx,
+ call_plan_sp,
+ stop_others,
+ try_all_threads,
+ discard_on_error,
+ single_thread_timeout_usec,
+ error_stream);
if (log)
log->Printf("-- [ClangUserExpression::Execute] Execution of expression completed --");
- if (execution_result == Process::eExecutionInterrupted)
+ if (execution_result == lldb::eExecutionInterrupted)
{
if (discard_on_error)
error_stream.Printf ("Expression execution was interrupted. The process has been returned to the state before execution.");
@@ -520,21 +524,21 @@
return execution_result;
}
- else if (execution_result != Process::eExecutionCompleted)
+ else if (execution_result != lldb::eExecutionCompleted)
{
error_stream.Printf ("Couldn't execute function; result was %s\n", Process::ExecutionResultAsCString (execution_result));
return execution_result;
}
if (FinalizeJITExecution (error_stream, exe_ctx, result))
- return Process::eExecutionCompleted;
+ return lldb::eExecutionCompleted;
else
- return Process::eExecutionSetupError;
+ return lldb::eExecutionSetupError;
}
else
{
error_stream.Printf("Expression can't be run; neither DWARF nor a JIT compiled function is present");
- return Process::eExecutionSetupError;
+ return lldb::eExecutionSetupError;
}
}
@@ -547,7 +551,7 @@
return *m_dwarf_opcodes.get();
}
-Process::ExecutionResults
+lldb::ExecutionResults
ClangUserExpression::Evaluate (ExecutionContext &exe_ctx,
bool discard_on_error,
const char *expr_cstr,
@@ -557,14 +561,14 @@
lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
Error error;
- Process::ExecutionResults execution_results = Process::eExecutionSetupError;
+ lldb::ExecutionResults execution_results = lldb::eExecutionSetupError;
if (exe_ctx.process == NULL)
{
error.SetErrorString ("Must have a process to evaluate expressions.");
result_valobj_sp.reset (new ValueObjectConstResult (error));
- return Process::eExecutionSetupError;
+ return lldb::eExecutionSetupError;
}
if (!exe_ctx.process->GetDynamicCheckers())
@@ -584,7 +588,7 @@
error.SetErrorString (install_errors.GetString().c_str());
result_valobj_sp.reset (new ValueObjectConstResult (error));
- return Process::eExecutionSetupError;
+ return lldb::eExecutionSetupError;
}
exe_ctx.process->SetDynamicCheckers(dynamic_checkers);
@@ -609,7 +613,7 @@
}
else
{
- ClangExpressionVariable *expr_result = NULL;
+ lldb::ClangExpressionVariableSP expr_result;
error_stream.GetString().clear();
@@ -621,7 +625,7 @@
discard_on_error,
user_expression_sp,
expr_result);
- if (execution_results != Process::eExecutionCompleted)
+ if (execution_results != lldb::eExecutionCompleted)
{
if (log)
log->Printf("== [ClangUserExpression::Evaluate] Execution completed abnormally ==");
@@ -633,14 +637,9 @@
}
else
{
- // TODO: seems weird to get a pointer to a result object back from
- // a function. Do we own it? Feels like we do, but from looking at the
- // code we don't. Might be best to make this a reference and state
- // explicitly that we don't own it when we get a reference back from
- // the execute?
if (expr_result)
{
- result_valobj_sp = expr_result->GetExpressionResult (&exe_ctx);
+ result_valobj_sp = expr_result->GetValueObject();
if (log)
log->Printf("== [ClangUserExpression::Evaluate] Execution completed normally with result %s ==", result_valobj_sp->GetValueAsCString(exe_ctx.GetBestExecutionContextScope()));
diff --git a/source/Expression/IRToDWARF.cpp b/source/Expression/IRToDWARF.cpp
index b7baf90..9601676 100644
--- a/source/Expression/IRToDWARF.cpp
+++ b/source/Expression/IRToDWARF.cpp
@@ -26,7 +26,7 @@
static char ID;
-IRToDWARF::IRToDWARF(lldb_private::ClangExpressionVariableStore &local_vars,
+IRToDWARF::IRToDWARF(lldb_private::ClangExpressionVariableList &local_vars,
lldb_private::ClangExpressionDeclMap *decl_map,
lldb_private::StreamString &strm,
const char *func_name) :