diff options
| author | Fangrui Song <maskray@google.com> | 2020-01-11 12:36:13 -0800 |
|---|---|---|
| committer | Fangrui Song <maskray@google.com> | 2020-01-11 13:34:52 -0800 |
| commit | 6fdd6a7b3f696972edc244488f59532d05136a27 (patch) | |
| tree | dc7e353f873ffc0db7bae27ad8631a93ba9ac321 /lldb | |
| parent | 2cdb18afda841392002feafda21af31854c195b3 (diff) | |
| download | bcm5719-llvm-6fdd6a7b3f696972edc244488f59532d05136a27.tar.gz bcm5719-llvm-6fdd6a7b3f696972edc244488f59532d05136a27.zip | |
[Disassembler] Delete the VStream parameter of MCDisassembler::getInstruction()
The argument is llvm::null() everywhere except llvm::errs() in
llvm-objdump in -DLLVM_ENABLE_ASSERTIONS=On builds. It is used by no
target but X86 in -DLLVM_ENABLE_ASSERTIONS=On builds.
If we ever have the needs to add verbose log to disassemblers, we can
record log with a member function, instead of passing it around as an
argument.
Diffstat (limited to 'lldb')
3 files changed, 11 insertions, 13 deletions
diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp index 399f8031bfe..dbdb3520087 100644 --- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp +++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp @@ -1020,7 +1020,7 @@ uint64_t DisassemblerLLVMC::MCDisasmInstance::GetMCInst( uint64_t new_inst_size; status = m_disasm_up->getInstruction(mc_inst, new_inst_size, data, pc, - llvm::nulls(), llvm::nulls()); + llvm::nulls()); if (status == llvm::MCDisassembler::Success) return new_inst_size; else diff --git a/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp b/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp index b9280478826..b55eeb0eaf4 100644 --- a/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp +++ b/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp @@ -981,13 +981,11 @@ EmulateInstructionMIPS::GetSizeOfInstruction(lldb_private::DataExtractor &data, llvm::ArrayRef<uint8_t> raw_insn(data.GetDataStart(), data.GetByteSize()); if (m_use_alt_disaasm) - decode_status = - m_alt_disasm->getInstruction(mc_insn, next_inst_size, raw_insn, - inst_addr, llvm::nulls(), llvm::nulls()); + decode_status = m_alt_disasm->getInstruction( + mc_insn, next_inst_size, raw_insn, inst_addr, llvm::nulls()); else - decode_status = - m_disasm->getInstruction(mc_insn, next_inst_size, raw_insn, inst_addr, - llvm::nulls(), llvm::nulls()); + decode_status = m_disasm->getInstruction(mc_insn, next_inst_size, raw_insn, + inst_addr, llvm::nulls()); if (decode_status != llvm::MCDisassembler::Success) return false; @@ -1070,11 +1068,11 @@ bool EmulateInstructionMIPS::EvaluateInstruction(uint32_t evaluate_options) { llvm::MCDisassembler::DecodeStatus decode_status; llvm::ArrayRef<uint8_t> raw_insn(data.GetDataStart(), data.GetByteSize()); if (m_use_alt_disaasm) - decode_status = m_alt_disasm->getInstruction( - mc_insn, insn_size, raw_insn, m_addr, llvm::nulls(), llvm::nulls()); + decode_status = m_alt_disasm->getInstruction(mc_insn, insn_size, raw_insn, + m_addr, llvm::nulls()); else - decode_status = m_disasm->getInstruction( - mc_insn, insn_size, raw_insn, m_addr, llvm::nulls(), llvm::nulls()); + decode_status = m_disasm->getInstruction(mc_insn, insn_size, raw_insn, + m_addr, llvm::nulls()); if (decode_status != llvm::MCDisassembler::Success) return false; diff --git a/lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.cpp b/lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.cpp index 4b5ca564c0c..3baf942bc17 100644 --- a/lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.cpp +++ b/lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.cpp @@ -965,8 +965,8 @@ bool EmulateInstructionMIPS64::EvaluateInstruction(uint32_t evaluate_options) { if (m_opcode.GetData(data)) { llvm::MCDisassembler::DecodeStatus decode_status; llvm::ArrayRef<uint8_t> raw_insn(data.GetDataStart(), data.GetByteSize()); - decode_status = m_disasm->getInstruction( - mc_insn, insn_size, raw_insn, m_addr, llvm::nulls(), llvm::nulls()); + decode_status = m_disasm->getInstruction(mc_insn, insn_size, raw_insn, + m_addr, llvm::nulls()); if (decode_status != llvm::MCDisassembler::Success) return false; } |
