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

Add more workarounds for "bl #..." and "blx #..." where the ARMAsmParser fails to parse/recognize 

the (PC-relative) immediate operand.

llvm-svn: 131913
This commit is contained in:
Johnny Chen 2011-05-23 19:41:31 +00:00
parent b66b5cef00
commit 54dc300653
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
View File

@ -328,6 +328,7 @@ InstructionLLVM::Dump
if (m_arch_type == llvm::Triple::thumb && opcode.GetString() == "b") {
const char *inst_str;
const char *pos = NULL;
operands.Clear(); comment.Clear();
if (EDGetInstString(&inst_str, m_inst) == 0 && (pos = strstr(inst_str, "#")) != NULL) {
uint64_t operand_value = PC + atoi(++pos);
operands.Printf("0x%llx ", operand_value);
@ -345,6 +346,33 @@ InstructionLLVM::Dump
}
}
}
// Yet more workaround for "bl #..." and "blx #...".
if ((m_arch_type == llvm::Triple::arm || m_arch_type == llvm::Triple::thumb) &&
(opcode.GetString() == "bl" || opcode.GetString() == "blx")) {
const char *inst_str;
const char *pos = NULL;
operands.Clear(); comment.Clear();
if (EDGetInstString(&inst_str, m_inst) == 0 && (pos = strstr(inst_str, "#")) != NULL) {
uint64_t operand_value = PC + atoi(++pos);
// Put the address value into the comment
comment.Printf("0x%llx ", operand_value);
llvm::StringRef string_ref(pos - 1);
llvm::StringRef operand_string_ref = string_ref.split('\n').first;
operands.PutCString(operand_string_ref.str().c_str());
lldb_private::Address so_addr;
if (exe_ctx && exe_ctx->target && !exe_ctx->target->GetSectionLoadList().IsEmpty()) {
if (exe_ctx->target->GetSectionLoadList().ResolveLoadAddress (operand_value, so_addr))
so_addr.Dump(&comment, exe_scope, Address::DumpStyleResolvedDescriptionNoModule, Address::DumpStyleSectionNameOffset);
} else {
Module *module = GetAddress().GetModule();
if (module) {
if (module->ResolveFileAddress (operand_value, so_addr))
so_addr.Dump(&comment, exe_scope, Address::DumpStyleResolvedDescriptionNoModule, Address::DumpStyleSectionNameOffset);
}
}
}
}
// END of workaround.
// If both operands and comment are empty, we will just print out