maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[JITLoaderGDB] Pack the jit entry struct according to the target arch. 

Reviewers: clayborg

Subscribers: tberghammer, dsrbecky, lldb-commits

Differential Revision: http://reviews.llvm.org/D18334

llvm-svn: 264012
This commit is contained in:
Siva Chandra 2016-03-22 00:35:31 +00:00
parent 79d2451cd7
commit f027e130d8
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp
View File

@ -90,14 +90,24 @@ typedef enum
JIT_UNREGISTER_FN
} jit_actions_t;
template <typename ptr_t>
template <typename ptr_t, bool packed_size>
struct jit_code_entry
{
ptr_t next_entry; // pointer
ptr_t prev_entry; // pointer
ptr_t symfile_addr; // pointer
uint64_t symfile_size;
uint64_t symfile_size __attribute__ ((aligned (8)));
};
template <typename ptr_t>
struct jit_code_entry<ptr_t, true>
{
ptr_t next_entry; // pointer
ptr_t prev_entry; // pointer
ptr_t symfile_addr; // pointer
uint64_t symfile_size __attribute__ ((packed));
};
template <typename ptr_t>
struct jit_descriptor
{
@ -269,13 +279,20 @@ bool
JITLoaderGDB::ReadJITDescriptor(bool all_entries)
{
Target &target = m_process->GetTarget();
if (target.GetArchitecture().GetAddressByteSize() == 8)
return ReadJITDescriptorImpl<uint64_t>(all_entries);
const ArchSpec &arch_spec = target.GetArchitecture();
if (arch_spec.GetAddressByteSize() == 8)
return ReadJITDescriptorImpl<uint64_t, false>(all_entries);
else
return ReadJITDescriptorImpl<uint32_t>(all_entries);
{
ArchSpec::Core core = arch_spec.GetCore();
if (ArchSpec::kCore_x86_32_first <= core && core <= ArchSpec::kCore_x86_32_last)
return ReadJITDescriptorImpl<uint32_t, true>(all_entries);
else
return ReadJITDescriptorImpl<uint32_t, false>(all_entries);
}
}
template <typename ptr_t>
template <typename ptr_t, bool packed>
bool
JITLoaderGDB::ReadJITDescriptorImpl(bool all_entries)
{
@ -309,7 +326,7 @@ JITLoaderGDB::ReadJITDescriptorImpl(bool all_entries)
while (jit_relevant_entry != 0)
{
jit_code_entry<ptr_t> jit_entry;
jit_code_entry<ptr_t, packed> jit_entry;
const size_t jit_entry_size = sizeof(jit_entry);
bytes_read = m_process->DoReadMemory(jit_relevant_entry, &jit_entry, jit_entry_size, error);
if (bytes_read != jit_entry_size || !error.Success())

2
lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.h
View File

@ -83,7 +83,7 @@ private:
bool
ReadJITDescriptor(bool all_entries);
template <typename ptr_t>
template <typename ptr_t, bool packed>
bool
ReadJITDescriptorImpl(bool all_entries);