caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mapping symbol handling on arm 32/64

Browse Source 
The debug info section contains some $d mapping symbol what is
overlapping with code sections in other sections of the object file
causing problem in the address class detection. This CL ignores these
symboles from the address class map as the debug info sections don't use
this map.

Differential revision: http://reviews.llvm.org/D9050

llvm-svn: 235171
This commit is contained in:
Tamas Berghammer
2015-04-17 09:36:59 +00:00
parent a762fa6c98
commit b52bbd1724
1 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
View File

@@ -1878,23 +1878,26 @@ ObjectFileELF::ParseSymbols (Symtab *symtab,
// These are reserved for the specification (e.g.: mapping
// symbols). We don't want to add them to the symbol table.
llvm::StringRef symbol_name_ref(symbol_name);
if (symbol_name_ref == "$a" || symbol_name_ref.startswith("$a."))
if (symbol_type == eSymbolTypeCode)
{
// $a[.<any>]* - marks an ARM instruction sequence
m_address_class_map[symbol.st_value] = eAddressClassCode;
}
else if (symbol_name_ref == "$b" || symbol_name_ref.startswith("$b.") ||
symbol_name_ref == "$t" || symbol_name_ref.startswith("$t."))
{
// $b[.<any>]* - marks a THUMB BL instruction sequence
// $t[.<any>]* - marks a THUMB instruction sequence
m_address_class_map[symbol.st_value] = eAddressClassCodeAlternateISA;
}
else if (symbol_name_ref == "$d" || symbol_name_ref.startswith("$d."))
{
// $d[.<any>]* - marks a data item sequence (e.g. lit pool)
m_address_class_map[symbol.st_value] = eAddressClassData;
llvm::StringRef symbol_name_ref(symbol_name);
if (symbol_name_ref == "$a" || symbol_name_ref.startswith("$a."))
{
// $a[.<any>]* - marks an ARM instruction sequence
m_address_class_map[symbol.st_value] = eAddressClassCode;
}
else if (symbol_name_ref == "$b" || symbol_name_ref.startswith("$b.") ||
symbol_name_ref == "$t" || symbol_name_ref.startswith("$t."))
{
// $b[.<any>]* - marks a THUMB BL instruction sequence
// $t[.<any>]* - marks a THUMB instruction sequence
m_address_class_map[symbol.st_value] = eAddressClassCodeAlternateISA;
}
else if (symbol_name_ref == "$d" || symbol_name_ref.startswith("$d."))
{
// $d[.<any>]* - marks a data item sequence (e.g. lit pool)
m_address_class_map[symbol.st_value] = eAddressClassData;
}
}
continue;
@@ -1907,16 +1910,19 @@ ObjectFileELF::ParseSymbols (Symtab *symtab,
// These are reserved for the specification (e.g.: mapping
// symbols). We don't want to add them to the symbol table.
llvm::StringRef symbol_name_ref(symbol_name);
if (symbol_name_ref == "$x" || symbol_name_ref.startswith("$x."))
if (symbol_type == eSymbolTypeCode)
{
// $x[.<any>]* - marks an A64 instruction sequence
m_address_class_map[symbol.st_value] = eAddressClassCode;
}
else if (symbol_name_ref == "$d" || symbol_name_ref.startswith("$d."))
{
// $d[.<any>]* - marks a data item sequence (e.g. lit pool)
m_address_class_map[symbol.st_value] = eAddressClassData;
llvm::StringRef symbol_name_ref(symbol_name);
if (symbol_name_ref == "$x" || symbol_name_ref.startswith("$x."))
{
// $x[.<any>]* - marks an A64 instruction sequence
m_address_class_map[symbol.st_value] = eAddressClassCode;
}
else if (symbol_name_ref == "$d" || symbol_name_ref.startswith("$d."))
{
// $d[.<any>]* - marks a data item sequence (e.g. lit pool)
m_address_class_map[symbol.st_value] = eAddressClassData;
}
}
continue;