summaryrefslogtreecommitdiffstats
path: root/lldb/source/Expression/ClangPersistentVariables.cpp
diff options
context:
space:
mode:
authorGreg Clayton <gclayton@apple.com>2010-12-14 02:59:59 +0000
committerGreg Clayton <gclayton@apple.com>2010-12-14 02:59:59 +0000
commit8b2fe6dcbdf27b0df84ef4bdf514f9bc577c5804 (patch)
tree9816fbd1612d4cb872b44f996c47f67f9fc6470f /lldb/source/Expression/ClangPersistentVariables.cpp
parent12960558416a6797ea7504e7d9934bb11a5b1f42 (diff)
downloadbcm5719-llvm-8b2fe6dcbdf27b0df84ef4bdf514f9bc577c5804.tar.gz
bcm5719-llvm-8b2fe6dcbdf27b0df84ef4bdf514f9bc577c5804.zip
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. llvm-svn: 121745
Diffstat (limited to 'lldb/source/Expression/ClangPersistentVariables.cpp')
-rw-r--r--lldb/source/Expression/ClangPersistentVariables.cpp49
1 files changed, 25 insertions, 24 deletions
diff --git a/lldb/source/Expression/ClangPersistentVariables.cpp b/lldb/source/Expression/ClangPersistentVariables.cpp
index 4919922a401..5e61524f924 100644
--- a/lldb/source/Expression/ClangPersistentVariables.cpp
+++ b/lldb/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;
+}
OpenPOWER on IntegriCloud