2937b28218
This reverts commit 0df522969a.
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
122 lines
4.5 KiB
C++
122 lines
4.5 KiB
C++
//===-- ProcessWindows.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 liblldb_Plugins_Process_Windows_Common_ProcessWindows_H_
|
|
#define liblldb_Plugins_Process_Windows_Common_ProcessWindows_H_
|
|
|
|
#include "lldb/Target/Process.h"
|
|
#include "lldb/Utility/Status.h"
|
|
#include "lldb/lldb-forward.h"
|
|
|
|
#include "Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.h"
|
|
#include "ProcessDebugger.h"
|
|
|
|
namespace lldb_private {
|
|
|
|
class HostProcess;
|
|
|
|
class ProcessWindows : public Process, public ProcessDebugger {
|
|
public:
|
|
// Static functions.
|
|
static lldb::ProcessSP CreateInstance(lldb::TargetSP target_sp,
|
|
lldb::ListenerSP listener_sp,
|
|
const FileSpec *,
|
|
bool can_connect);
|
|
|
|
static void Initialize();
|
|
|
|
static void Terminate();
|
|
|
|
static llvm::StringRef GetPluginNameStatic() { return "windows"; }
|
|
|
|
static llvm::StringRef GetPluginDescriptionStatic();
|
|
|
|
// Constructors and destructors
|
|
ProcessWindows(lldb::TargetSP target_sp, lldb::ListenerSP listener_sp);
|
|
|
|
~ProcessWindows();
|
|
|
|
size_t GetSTDOUT(char *buf, size_t buf_size, Status &error) override;
|
|
size_t GetSTDERR(char *buf, size_t buf_size, Status &error) override;
|
|
size_t PutSTDIN(const char *buf, size_t buf_size, Status &error) override;
|
|
|
|
llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); }
|
|
|
|
Status EnableBreakpointSite(BreakpointSite *bp_site) override;
|
|
Status DisableBreakpointSite(BreakpointSite *bp_site) override;
|
|
|
|
Status DoDetach(bool keep_stopped) override;
|
|
Status DoLaunch(Module *exe_module, ProcessLaunchInfo &launch_info) override;
|
|
Status DoAttachToProcessWithID(
|
|
lldb::pid_t pid,
|
|
const lldb_private::ProcessAttachInfo &attach_info) override;
|
|
Status DoResume() override;
|
|
Status DoDestroy() override;
|
|
Status DoHalt(bool &caused_stop) override;
|
|
|
|
void DidLaunch() override;
|
|
void DidAttach(lldb_private::ArchSpec &arch_spec) override;
|
|
|
|
void RefreshStateAfterStop() override;
|
|
|
|
bool CanDebug(lldb::TargetSP target_sp,
|
|
bool plugin_specified_by_name) override;
|
|
bool DestroyRequiresHalt() override { return false; }
|
|
bool DoUpdateThreadList(ThreadList &old_thread_list,
|
|
ThreadList &new_thread_list) override;
|
|
bool IsAlive() override;
|
|
|
|
size_t DoReadMemory(lldb::addr_t vm_addr, void *buf, size_t size,
|
|
Status &error) override;
|
|
size_t DoWriteMemory(lldb::addr_t vm_addr, const void *buf, size_t size,
|
|
Status &error) override;
|
|
lldb::addr_t DoAllocateMemory(size_t size, uint32_t permissions,
|
|
Status &error) override;
|
|
Status DoDeallocateMemory(lldb::addr_t ptr) override;
|
|
|
|
lldb::addr_t GetImageInfoAddress() override;
|
|
|
|
DynamicLoaderWindowsDYLD *GetDynamicLoader() override;
|
|
|
|
// IDebugDelegate overrides.
|
|
void OnExitProcess(uint32_t exit_code) override;
|
|
void OnDebuggerConnected(lldb::addr_t image_base) override;
|
|
ExceptionResult OnDebugException(bool first_chance,
|
|
const ExceptionRecord &record) override;
|
|
void OnCreateThread(const HostThread &thread) override;
|
|
void OnExitThread(lldb::tid_t thread_id, uint32_t exit_code) override;
|
|
void OnLoadDll(const ModuleSpec &module_spec,
|
|
lldb::addr_t module_addr) override;
|
|
void OnUnloadDll(lldb::addr_t module_addr) override;
|
|
void OnDebugString(const std::string &string) override;
|
|
void OnDebuggerError(const Status &error, uint32_t type) override;
|
|
|
|
Status GetWatchpointSupportInfo(uint32_t &num) override;
|
|
Status GetWatchpointSupportInfo(uint32_t &num, bool &after) override;
|
|
Status EnableWatchpoint(Watchpoint *wp, bool notify = true) override;
|
|
Status DisableWatchpoint(Watchpoint *wp, bool notify = true) override;
|
|
|
|
protected:
|
|
Status DoGetMemoryRegionInfo(lldb::addr_t vm_addr,
|
|
MemoryRegionInfo &info) override;
|
|
|
|
private:
|
|
struct WatchpointInfo {
|
|
uint32_t slot_id;
|
|
lldb::addr_t address;
|
|
uint32_t size;
|
|
bool read;
|
|
bool write;
|
|
};
|
|
std::map<lldb::break_id_t, WatchpointInfo> m_watchpoints;
|
|
std::vector<lldb::break_id_t> m_watchpoint_ids;
|
|
};
|
|
} // namespace lldb_private
|
|
|
|
#endif // liblldb_Plugins_Process_Windows_Common_ProcessWindows_H_
|