2937b28218
This reverts commit 0df522969a7a0128052bd79182c8d58e00556e2f. Additional checks are added to fix the detection of the last memory region in GetMemoryRegions or repeating the "memory region" command when the target has non-address bits. Normally you keep reading from address 0, looking up each region's end address until you get LLDB_INVALID_ADDR as the region end address. (0xffffffffffffffff) This is what the remote will return once you go beyond the last mapped region: [0x0000fffffffdf000-0x0001000000000000) rw- [stack] [0x0001000000000000-0xffffffffffffffff) --- Problem is that when we "fix" the lookup address, we remove some bits from it. On an AArch64 system we have 48 bit virtual addresses, so when we fix the end address of the [stack] region the result is 0. So we loop back to the start. [0x0000fffffffdf000-0x0001000000000000) rw- [stack] [0x0000000000000000-0x0000000000400000) --- To fix this I added an additional check for the last range. If the end address of the region is different once you apply FixDataAddress, we are at the last region. Since the end of the last region will be the last valid mappable address, plus 1. That 1 will be removed by the ABI plugin. The only side effect is that on systems with non-address bits, you won't get that last catch all unmapped region from the max virtual address up to 0xf...f. [0x0000fffff8000000-0x0000fffffffdf000) --- [0x0000fffffffdf000-0x0001000000000000) rw- [stack] <ends here> Though in some way this is more correct because that region is not just unmapped, it's not mappable at all. No extra testing is needed because this is already covered by TestMemoryRegion.py, I simply forgot to run it on system that had both top byte ignore and pointer authentication. This change has been tested on a qemu VM with top byte ignore, memory tagging and pointer authentication enabled. Reviewed By: omjavaid Differential Revision: https://reviews.llvm.org/D115508
120 lines
3.4 KiB
C++
120 lines
3.4 KiB
C++
//===-- ScriptedProcess.h ------------------------------------- -*- C++ -*-===//
|
|
//
|
|
// 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
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef LLDB_SOURCE_PLUGINS_SCRIPTED_PROCESS_H
|
|
#define LLDB_SOURCE_PLUGINS_SCRIPTED_PROCESS_H
|
|
|
|
#include "lldb/Target/Process.h"
|
|
#include "lldb/Utility/ConstString.h"
|
|
#include "lldb/Utility/Status.h"
|
|
|
|
#include "ScriptedThread.h"
|
|
|
|
#include <mutex>
|
|
|
|
namespace lldb_private {
|
|
|
|
class ScriptedProcess : public Process {
|
|
protected:
|
|
class ScriptedProcessInfo {
|
|
public:
|
|
ScriptedProcessInfo(const ProcessLaunchInfo &launch_info) {
|
|
m_class_name = launch_info.GetScriptedProcessClassName();
|
|
m_args_sp = launch_info.GetScriptedProcessDictionarySP();
|
|
}
|
|
|
|
std::string GetClassName() const { return m_class_name; }
|
|
StructuredData::DictionarySP GetArgsSP() const { return m_args_sp; }
|
|
|
|
private:
|
|
std::string m_class_name;
|
|
StructuredData::DictionarySP m_args_sp;
|
|
};
|
|
|
|
public:
|
|
static lldb::ProcessSP CreateInstance(lldb::TargetSP target_sp,
|
|
lldb::ListenerSP listener_sp,
|
|
const FileSpec *crash_file_path,
|
|
bool can_connect);
|
|
|
|
static void Initialize();
|
|
|
|
static void Terminate();
|
|
|
|
static llvm::StringRef GetPluginNameStatic() { return "ScriptedProcess"; }
|
|
|
|
static llvm::StringRef GetPluginDescriptionStatic();
|
|
|
|
ScriptedProcess(lldb::TargetSP target_sp, lldb::ListenerSP listener_sp,
|
|
const ScriptedProcess::ScriptedProcessInfo &launch_info,
|
|
Status &error);
|
|
|
|
~ScriptedProcess() override;
|
|
|
|
bool CanDebug(lldb::TargetSP target_sp,
|
|
bool plugin_specified_by_name) override;
|
|
|
|
DynamicLoader *GetDynamicLoader() override { return nullptr; }
|
|
|
|
llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); }
|
|
|
|
SystemRuntime *GetSystemRuntime() override { return nullptr; }
|
|
|
|
Status DoLoadCore() override;
|
|
|
|
Status DoLaunch(Module *exe_module, ProcessLaunchInfo &launch_info) override;
|
|
|
|
void DidLaunch() override;
|
|
|
|
Status DoResume() override;
|
|
|
|
Status DoDestroy() override;
|
|
|
|
void RefreshStateAfterStop() override;
|
|
|
|
bool IsAlive() override;
|
|
|
|
size_t DoReadMemory(lldb::addr_t addr, void *buf, size_t size,
|
|
Status &error) override;
|
|
|
|
ArchSpec GetArchitecture();
|
|
|
|
Status
|
|
GetMemoryRegions(lldb_private::MemoryRegionInfos ®ion_list) override;
|
|
|
|
bool GetProcessInfo(ProcessInstanceInfo &info) override;
|
|
|
|
protected:
|
|
Status DoStop();
|
|
|
|
void Clear();
|
|
|
|
bool DoUpdateThreadList(ThreadList &old_thread_list,
|
|
ThreadList &new_thread_list) override;
|
|
|
|
Status DoGetMemoryRegionInfo(lldb::addr_t load_addr,
|
|
MemoryRegionInfo &range_info) override;
|
|
|
|
private:
|
|
friend class ScriptedThread;
|
|
|
|
void CheckInterpreterAndScriptObject() const;
|
|
ScriptedProcessInterface &GetInterface() const;
|
|
static bool IsScriptLanguageSupported(lldb::ScriptLanguage language);
|
|
|
|
// Member variables.
|
|
const ScriptedProcessInfo m_scripted_process_info;
|
|
lldb_private::ScriptInterpreter *m_interpreter = nullptr;
|
|
lldb_private::StructuredData::ObjectSP m_script_object_sp = nullptr;
|
|
//@}
|
|
};
|
|
|
|
} // namespace lldb_private
|
|
|
|
#endif // LLDB_SOURCE_PLUGINS_SCRIPTED_PROCESS_H
|