diff options
Diffstat (limited to 'source/Plugins/Disassembler/llvm')
| -rw-r--r-- | source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp | 32 | ||||
| -rw-r--r-- | source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h | 3 |
2 files changed, 28 insertions, 7 deletions
diff --git a/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp b/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp index 233515a23..e920d70cd 100644 --- a/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp +++ b/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp @@ -256,12 +256,18 @@ public: m_using_file_addr = true; const bool data_from_file = GetDisassemblerLLVMC().m_data_from_file; - if (!data_from_file) + bool use_hex_immediates = true; + Disassembler::HexImmediateStyle hex_style = Disassembler::eHexStyleC; + + if (exe_ctx) { - if (exe_ctx) + Target *target = exe_ctx->GetTargetPtr(); + if (target) { - Target *target = exe_ctx->GetTargetPtr(); - if (target) + use_hex_immediates = target->GetUseHexImmediates(); + hex_style = target->GetHexImmediateStyle(); + + if (!data_from_file) { const lldb::addr_t load_addr = m_address.GetLoadAddress(target); if (load_addr != LLDB_INVALID_ADDRESS) @@ -282,10 +288,13 @@ public: opcode_data_len, pc, inst); - + if (inst_size > 0) + { + mc_disasm_ptr->SetStyle(use_hex_immediates, hex_style); mc_disasm_ptr->PrintMCInst(inst, out_string, sizeof(out_string)); - + } + llvm_disasm.Unlock(); if (inst_size == 0) @@ -546,6 +555,17 @@ DisassemblerLLVMC::LLVMCDisassembler::PrintMCInst (llvm::MCInst &mc_inst, return output_size; } +void +DisassemblerLLVMC::LLVMCDisassembler::SetStyle (bool use_hex_immed, HexImmediateStyle hex_style) +{ + m_instr_printer_ap->setPrintImmHex(use_hex_immed); + switch(hex_style) + { + case eHexStyleC: m_instr_printer_ap->setPrintImmHex(llvm::HexStyle::C); break; + case eHexStyleAsm: m_instr_printer_ap->setPrintImmHex(llvm::HexStyle::Asm); break; + } +} + bool DisassemblerLLVMC::LLVMCDisassembler::CanBranch (llvm::MCInst &mc_inst) { diff --git a/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h b/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h index 29b28ade8..c56779186 100644 --- a/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h +++ b/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h @@ -47,6 +47,7 @@ class DisassemblerLLVMC : public lldb_private::Disassembler uint64_t GetMCInst (const uint8_t *opcode_data, size_t opcode_data_len, lldb::addr_t pc, llvm::MCInst &mc_inst); uint64_t PrintMCInst (llvm::MCInst &mc_inst, char *output_buffer, size_t out_buffer_len); + void SetStyle (bool use_hex_immed, HexImmediateStyle hex_style); bool CanBranch (llvm::MCInst &mc_inst); bool IsValid() { @@ -54,7 +55,7 @@ class DisassemblerLLVMC : public lldb_private::Disassembler } private: - bool m_is_valid; + bool m_is_valid; std::unique_ptr<llvm::MCContext> m_context_ap; std::unique_ptr<llvm::MCAsmInfo> m_asm_info_ap; std::unique_ptr<llvm::MCSubtargetInfo> m_subtarget_info_ap; |