From 5f29bb8a675e8f96452b632e7129113f7dec850e Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Tue, 20 Aug 2019 20:51:52 +0000 Subject: Vendor import of stripped lldb trunk r366426 (just before the release_90 branch point): https://llvm.org/svn/llvm-project/lldb/trunk@366426 --- source/Commands/CommandObjectDisassemble.cpp | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'source/Commands/CommandObjectDisassemble.cpp') diff --git a/source/Commands/CommandObjectDisassemble.cpp b/source/Commands/CommandObjectDisassemble.cpp index f8ee46121851..5972555b2499 100644 --- a/source/Commands/CommandObjectDisassemble.cpp +++ b/source/Commands/CommandObjectDisassemble.cpp @@ -1,9 +1,8 @@ //===-- CommandObjectDisassemble.cpp ----------------------------*- C++ -*-===// // -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// @@ -230,9 +229,7 @@ CommandObjectDisassemble::CommandOptions::GetDefinitions() { return llvm::makeArrayRef(g_disassemble_options); } -//------------------------------------------------------------------------- // CommandObjectDisassemble -//------------------------------------------------------------------------- CommandObjectDisassemble::CommandObjectDisassemble( CommandInterpreter &interpreter) @@ -248,7 +245,7 @@ CommandObjectDisassemble::~CommandObjectDisassemble() = default; bool CommandObjectDisassemble::DoExecute(Args &command, CommandReturnObject &result) { - Target *target = m_interpreter.GetDebugger().GetSelectedTarget().get(); + Target *target = GetDebugger().GetSelectedTarget().get(); if (target == nullptr) { result.AppendError("invalid target, create a debug target using the " "'target create' command"); @@ -323,8 +320,8 @@ bool CommandObjectDisassemble::DoExecute(Args &command, ConstString name(m_options.func_name.c_str()); if (Disassembler::Disassemble( - m_interpreter.GetDebugger(), m_options.arch, plugin_name, - flavor_string, m_exe_ctx, name, + GetDebugger(), m_options.arch, plugin_name, flavor_string, + m_exe_ctx, name, nullptr, // Module * m_options.num_instructions, m_options.show_mixed, m_options.show_mixed ? m_options.num_lines_context : 0, options, @@ -487,8 +484,8 @@ bool CommandObjectDisassemble::DoExecute(Args &command, bool print_sc_header = ranges.size() > 1; for (AddressRange cur_range : ranges) { if (Disassembler::Disassemble( - m_interpreter.GetDebugger(), m_options.arch, plugin_name, - flavor_string, m_exe_ctx, cur_range.GetBaseAddress(), + GetDebugger(), m_options.arch, plugin_name, flavor_string, + m_exe_ctx, cur_range.GetBaseAddress(), m_options.num_instructions, m_options.show_mixed, m_options.show_mixed ? m_options.num_lines_context : 0, options, result.GetOutputStream())) { @@ -535,8 +532,8 @@ bool CommandObjectDisassemble::DoExecute(Args &command, cur_range.SetByteSize(DEFAULT_DISASM_BYTE_SIZE); if (Disassembler::Disassemble( - m_interpreter.GetDebugger(), m_options.arch, plugin_name, - flavor_string, m_exe_ctx, cur_range, m_options.num_instructions, + GetDebugger(), m_options.arch, plugin_name, flavor_string, + m_exe_ctx, cur_range, m_options.num_instructions, m_options.show_mixed, m_options.show_mixed ? m_options.num_lines_context : 0, options, result.GetOutputStream())) { -- cgit v1.2.3