replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed an issue for ARM where data symbols would alway return invalid addresses. 

llvm-svn: 133684
This commit is contained in:
Greg Clayton 2011-06-23 04:25:29 +00:00
parent e25a8710e5
commit 084db10d4d
3 changed files with 60 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lldb/include/lldb/Expression/ClangExpressionDeclMap.h
View File

@ -333,20 +333,15 @@ public:
/// @param[in] name
/// The name of the symbol.
///
/// @param[out] ptr
/// The absolute address of the function in the target.
///
/// @return
/// True if the address could be retrieved; false otherwise.
/// Valid load address for the symbol
//------------------------------------------------------------------
bool
lldb::addr_t
GetSymbolAddress (Target &target,
const ConstString &name,
uint64_t &ptr);
const ConstString &name);
bool
GetSymbolAddress (const ConstString &name,
uint64_t &ptr);
lldb::addr_t
GetSymbolAddress (const ConstString &name);
//------------------------------------------------------------------
/// [Used by CommandObjectExpression] Materialize the entire struct

80
lldb/source/Expression/ClangExpressionDeclMap.cpp
View File

@ -557,37 +557,65 @@ ClangExpressionDeclMap::GetFunctionAddress
return true;
}
bool
ClangExpressionDeclMap::GetSymbolAddress
(
Target &target,
const ConstString &name,
uint64_t &ptr
)
addr_t
ClangExpressionDeclMap::GetSymbolAddress (Target &target, const ConstString &name)
{
SymbolContextList sc_list;
target.GetImages().FindSymbolsWithNameAndType(name, eSymbolTypeAny, sc_list);
if (!sc_list.GetSize())
return false;
const uint32_t num_matches = sc_list.GetSize();
addr_t symbol_load_addr = LLDB_INVALID_ADDRESS;
for (uint32_t i=0; i<num_matches && symbol_load_addr == LLDB_INVALID_ADDRESS; i++)
{
SymbolContext sym_ctx;
sc_list.GetContextAtIndex(i, sym_ctx);
SymbolContext sym_ctx;
sc_list.GetContextAtIndex(0, sym_ctx);
const Address *sym_address = &sym_ctx.symbol->GetAddressRangeRef().GetBaseAddress();
if (sym_address)
{
switch (sym_ctx.symbol->GetType())
{
case eSymbolTypeCode:
case eSymbolTypeTrampoline:
symbol_load_addr = sym_address->GetCallableLoadAddress (&target);
break;
case eSymbolTypeData:
case eSymbolTypeRuntime:
case eSymbolTypeVariable:
case eSymbolTypeLocal:
case eSymbolTypeParam:
case eSymbolTypeInvalid:
case eSymbolTypeAbsolute:
case eSymbolTypeExtern:
case eSymbolTypeException:
case eSymbolTypeSourceFile:
case eSymbolTypeHeaderFile:
case eSymbolTypeObjectFile:
case eSymbolTypeCommonBlock:
case eSymbolTypeBlock:
case eSymbolTypeVariableType:
case eSymbolTypeLineEntry:
case eSymbolTypeLineHeader:
case eSymbolTypeScopeBegin:
case eSymbolTypeScopeEnd:
case eSymbolTypeAdditional:
case eSymbolTypeCompiler:
case eSymbolTypeInstrumentation:
case eSymbolTypeUndefined:
symbol_load_addr = sym_address->GetLoadAddress (&target);
break;
}
}
}
const Address *sym_address = &sym_ctx.symbol->GetAddressRangeRef().GetBaseAddress();
ptr = sym_address->GetCallableLoadAddress(&target);
return true;
return symbol_load_addr;
}
bool
ClangExpressionDeclMap::GetSymbolAddress
(
const ConstString &name,
uint64_t &ptr
)
addr_t
ClangExpressionDeclMap::GetSymbolAddress (const ConstString &name)
{
assert (m_parser_vars.get());
@ -595,9 +623,7 @@ ClangExpressionDeclMap::GetSymbolAddress
!m_parser_vars->m_exe_ctx->target)
return false;
return GetSymbolAddress(*m_parser_vars->m_exe_ctx->target,
name,
ptr);
return GetSymbolAddress(*m_parser_vars->m_exe_ctx->target, name);
}
// Interface for CommandObjectExpression
@ -1238,9 +1264,9 @@ ClangExpressionDeclMap::DoMaterializeOneVariable
{
location_value.reset(new Value);
uint64_t location_load_addr;
addr_t location_load_addr = GetSymbolAddress(*exe_ctx.target, name);
if (!GetSymbolAddress(*exe_ctx.target, name, location_load_addr))
if (location_load_addr == LLDB_INVALID_ADDRESS)
{
if (log)
err.SetErrorStringWithFormat ("Couldn't find value for global symbol %s",

4
lldb/source/Expression/IRForTarget.cpp
View File

@ -1327,9 +1327,9 @@ IRForTarget::HandleSymbol (Value *symbol)
lldb_private::ConstString name(symbol->getName().str().c_str());
uint64_t symbol_addr;
lldb::addr_t symbol_addr = m_decl_map->GetSymbolAddress (name);
if (!m_decl_map->GetSymbolAddress (name, symbol_addr))
if (symbol_addr == LLDB_INVALID_ADDRESS)
{
if (log)
log->Printf ("Symbol \"%s\" had no address", name.GetCString());