mirror of
https://github.com/apple/swift.git
synced 2025-12-14 20:36:38 +01:00
e2c8b761cd
Add an extra opaque field to AddressSpace, which can be used by clients of RemoteInspection to distinguish between different address spaces. LLDB employs an optimization where it reads memory from files instead of the running process whenever it can to speed up memory reads (these can be slow when debugging something over a network). To do this, it needs to keep track whether an address originated from a process or a file. It currently distinguishes addresses by setting an unused high bit on the address, but because of pointer authentication this is not a reliable solution. In order to keep this optimization working, this patch adds an extra opaque AddressSpace field to RemoteAddress, which LLDB can use on its own implementation of MemoryReader to distinguish between addresses. This patch is NFC for the other RemoteInspection clients, as it adds extra information to RemoteAddress, which is entirely optional and if unused should not change the behavior of the library. Although this patch is quite big the changes are largely mechanical, replacing threading StoredPointer with RemoteAddress. rdar://148361743 (cherry picked from commit58df5534d2) (cherry picked from commit8f3862b5e7)
40 lines
1.4 KiB
C++
40 lines
1.4 KiB
C++
//===--- InProcessMemoryReader.cpp - Reads local memory -------------------===//
|
|
//
|
|
// This source file is part of the Swift.org open source project
|
|
//
|
|
// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
|
|
// Licensed under Apache License v2.0 with Runtime Library Exception
|
|
//
|
|
// See https://swift.org/LICENSE.txt for license information
|
|
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// This file implements the abstract interface for working with remote memory.
|
|
// This method cannot be implemented in the header, as we must avoid importing
|
|
// <windows.h> in a header, which causes conflicts with Swift definitions.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "swift/Remote/InProcessMemoryReader.h"
|
|
|
|
#if defined(_WIN32)
|
|
#define WIN32_LEAN_AND_MEAN
|
|
#define NOMINMAX
|
|
#include <windows.h>
|
|
#else
|
|
#include <dlfcn.h>
|
|
#endif
|
|
|
|
using namespace swift;
|
|
using namespace swift::remote;
|
|
|
|
RemoteAddress InProcessMemoryReader::getSymbolAddress(const std::string &name) {
|
|
#if defined(_WIN32)
|
|
auto pointer = GetProcAddress(GetModuleHandle(NULL), name.c_str());
|
|
#else
|
|
auto pointer = dlsym(RTLD_DEFAULT, name.c_str());
|
|
#endif
|
|
return RemoteAddress((uint64_t)pointer, RemoteAddress::DefaultAddressSpace);
|
|
}
|