doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move AVR-specific GDB memory address translation to AvrGdbTargetDescriptor

Browse Source
This commit is contained in:
Nav
2024-10-26 17:18:42 +01:00
parent b6cbdf5a0d
commit 1db70be31e
2 changed files with 33 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/DebugServer/Gdb/AvrGdb/AvrGdbTargetDescriptor.hpp
View File

@@ -3,6 +3,7 @@
#include "src/DebugServer/Gdb/TargetDescriptor.hpp"
#include "src/Targets/TargetDescriptor.hpp"
#include "src/Targets/TargetMemory.hpp"
#include "src/Targets/TargetAddressSpaceDescriptor.hpp"
#include "src/Targets/TargetMemorySegmentDescriptor.hpp"
#include "src/Targets/TargetPeripheralDescriptor.hpp"
@@ -35,15 +36,41 @@ namespace DebugServer::Gdb::AvrGdb
explicit AvrGdbTargetDescriptor(const Targets::TargetDescriptor& targetDescriptor);
const Targets::TargetAddressSpaceDescriptor& addressSpaceDescriptorFromGdbAddress(
/**
* For AVR targets, GDB encodes address space information into memory addresses, by applying a mask.
*
* This function identifies the encoded address space within the given GDB memory address, and returns the
* relevant address space descriptor.
*
* @param address
* @return
*/
[[nodiscard]] const Targets::TargetAddressSpaceDescriptor& addressSpaceDescriptorFromGdbAddress(
GdbMemoryAddress address
) const override;
) const;
Targets::TargetMemoryAddress translateGdbAddress(GdbMemoryAddress address) const override;
GdbMemoryAddress translateTargetMemoryAddress(
/**
* This function translates a GDB memory address to a target memory address. It will strip away any
* GDB-specific masks and return an address that can be used within Bloom.
*
* @param address
* @return
*/
[[nodiscard]] Targets::TargetMemoryAddress translateGdbAddress(GdbMemoryAddress address) const;
/**
* This function translates a target memory address to a GDB memory address. It will encode address space
* information into the address, as expected by GDB.
*
* @param address
* @param addressSpaceDescriptor
* @param memorySegmentDescriptor
* @return
*/
[[nodiscard]] GdbMemoryAddress translateTargetMemoryAddress(
Targets::TargetMemoryAddress address,
const Targets::TargetAddressSpaceDescriptor& addressSpaceDescriptor,
const Targets::TargetMemorySegmentDescriptor& memorySegmentDescriptor
) const override;
) const;
};
}

41
src/DebugServer/Gdb/TargetDescriptor.hpp
View File

@@ -6,7 +6,6 @@
#include <set>
#include <map>
#include "src/Helpers/BiMap.hpp"
#include "src/Targets/TargetDescriptor.hpp"
#include "src/Targets/TargetRegisterDescriptor.hpp"
#include "src/Targets/TargetMemory.hpp"
@@ -18,7 +17,7 @@ namespace DebugServer::Gdb
using GdbMemoryAddress = std::uint32_t;
/**
* GDB target descriptor.
* Generic GDB target descriptor.
*/
class TargetDescriptor
{
@@ -27,43 +26,5 @@ namespace DebugServer::Gdb
std::map<GdbRegisterId, const Targets::TargetRegisterDescriptor*> targetRegisterDescriptorsByGdbId;
virtual ~TargetDescriptor() = default;
/**
* For targets with multiple address spaces (e.g. AVR), GDB encodes address space information into memory
* addresses, by applying a mask.
*
* This function should identify the encoded address space within a GDB memory address, and return the
* relevant address space descriptor.
*
* @param address
* @return
*/
virtual const Targets::TargetAddressSpaceDescriptor& addressSpaceDescriptorFromGdbAddress(
GdbMemoryAddress address
) const = 0;
/**
* This function should translate a GDB memory address to a target memory address. This should strip any
* GDB-specific masks and return an address that can be used within Bloom.
*
* @param address
* @return
*/
virtual Targets::TargetMemoryAddress translateGdbAddress(GdbMemoryAddress address) const = 0;
/**
* This function should translate a target memory address to a GDB memory address. It should encode any
* additional data expected by GDB.
*
* @param address
* @param addressSpaceDescriptor
* @param memorySegmentDescriptor
* @return
*/
virtual GdbMemoryAddress translateTargetMemoryAddress(
Targets::TargetMemoryAddress address,
const Targets::TargetAddressSpaceDescriptor& addressSpaceDescriptor,
const Targets::TargetMemorySegmentDescriptor& memorySegmentDescriptor
) const = 0;
};
}