Added logging:
- When we JIT an expression, we print the disassembly
of the generated code
- When we put the structure into the target, we print
the individual entries in the structure byte for
byte.
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@109278 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Expression/ClangExpression.cpp b/source/Expression/ClangExpression.cpp
index cdb3383..c3bdd7a 100644
--- a/source/Expression/ClangExpression.cpp
+++ b/source/Expression/ClangExpression.cpp
@@ -669,10 +669,10 @@
ret.SetErrorString("Couldn't find the target");
}
- lldb::DataBufferSP buffer_sp(new DataBufferHeap(func_range.second - func_range.first, 0));
+ lldb::DataBufferSP buffer_sp(new DataBufferHeap(func_range.second - func_remote_addr, 0));
Error err;
- exe_ctx.process->ReadMemory(func_range.first, buffer_sp->GetBytes(), buffer_sp->GetByteSize(), err);
+ exe_ctx.process->ReadMemory(func_remote_addr, buffer_sp->GetBytes(), buffer_sp->GetByteSize(), err);
if (!err.Success())
{
@@ -701,7 +701,7 @@
DataExtractor extractor(buffer_sp,
exe_ctx.process->GetByteOrder(),
- 32);
+ exe_ctx.target->GetArchitecture().GetAddressByteSize());
if(log)
{
@@ -709,7 +709,7 @@
extractor.PutToLog (log,
0,
extractor.GetByteSize(),
- func_range.first,
+ func_remote_addr,
16,
DataExtractor::TypeUInt8);
}
@@ -725,8 +725,9 @@
++instruction_index)
{
Disassembler::Instruction *instruction = instruction_list.GetInstructionAtIndex(instruction_index);
+ Address addr(NULL, func_remote_addr + bytes_offset);
instruction->Dump (&stream,
- NULL,
+ &addr,
&extractor,
bytes_offset,
exe_ctx,
diff --git a/source/Expression/ClangExpressionDeclMap.cpp b/source/Expression/ClangExpressionDeclMap.cpp
index 1a9e57f..946ee67 100644
--- a/source/Expression/ClangExpressionDeclMap.cpp
+++ b/source/Expression/ClangExpressionDeclMap.cpp
@@ -215,6 +215,71 @@
return DoMaterialize(true, exe_ctx, &result_value, err);
}
+bool
+ClangExpressionDeclMap::DumpMaterializedStruct(ExecutionContext *exe_ctx,
+ Stream &s,
+ Error &err)
+{
+ if (!m_struct_laid_out)
+ {
+ err.SetErrorString("Structure hasn't been laid out yet");
+ return false;
+ }
+
+ if (!exe_ctx)
+ {
+ err.SetErrorString("Received null execution context");
+ return false;
+ }
+
+
+ if (!exe_ctx->process)
+ {
+ err.SetErrorString("Couldn't find the process");
+ return false;
+ }
+
+ if (!exe_ctx->target)
+ {
+ err.SetErrorString("Couldn't find the target");
+ return false;
+ }
+
+ lldb::DataBufferSP data(new DataBufferHeap(m_struct_size, 0));
+
+ Error error;
+ if (exe_ctx->process->ReadMemory (m_materialized_location, data->GetBytes(), data->GetByteSize(), error) != data->GetByteSize())
+ {
+ err.SetErrorStringWithFormat ("Couldn't read struct from the target: %s", error.AsCString());
+ return false;
+ }
+
+ DataExtractor extractor(data, exe_ctx->process->GetByteOrder(), exe_ctx->target->GetArchitecture().GetAddressByteSize());
+
+ StructMemberIterator iter;
+
+ for (iter = m_members.begin();
+ iter != m_members.end();
+ ++iter)
+ {
+ s.Printf("[%s]\n", iter->m_name.c_str());
+
+ extractor.Dump(&s, // stream
+ iter->m_offset, // offset
+ lldb::eFormatBytesWithASCII, // format
+ 1, // byte size of individual entries
+ iter->m_size, // number of entries
+ 16, // entries per line
+ m_materialized_location + iter->m_offset, // address to print
+ 0, // bit size (bitfields only; 0 means ignore)
+ 0); // bit alignment (bitfields only; 0 means ignore)
+
+ s.PutChar('\n');
+ }
+
+ return true;
+}
+
bool
ClangExpressionDeclMap::DoMaterialize (bool dematerialize,
ExecutionContext *exe_ctx,