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

Moved TargetAddressSpaceDescriptor member functions to separate source file

Browse Source
This commit is contained in:
Nav
2024-03-16 16:55:09 +00:00
parent 11a714d4b6
commit 6ca2f7681b
3 changed files with 73 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Targets/CMakeLists.txt
View File

@@ -2,6 +2,7 @@ target_sources(
Bloom
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/TargetDescription/TargetDescriptionFile.cpp
${CMAKE_CURRENT_SOURCE_DIR}/TargetAddressSpaceDescriptor.cpp
${CMAKE_CURRENT_SOURCE_DIR}/TargetRegisterDescriptor.cpp
${CMAKE_CURRENT_SOURCE_DIR}/TargetMemoryCache.cpp
${CMAKE_CURRENT_SOURCE_DIR}/TargetPhysicalInterface.cpp

49
src/Targets/TargetAddressSpaceDescriptor.cpp Normal file
View File

@@ -0,0 +1,49 @@
#include "TargetAddressSpaceDescriptor.hpp"
#include "src/Exceptions/InternalFatalErrorException.hpp"
namespace Targets
{
TargetAddressSpaceDescriptor::TargetAddressSpaceDescriptor(
const std::string& key,
const TargetMemoryAddressRange& addressRange,
TargetMemoryEndianness endianness,
const std::map<std::string, TargetMemorySegmentDescriptor>& segmentDescriptorsByKey
)
: id(++(TargetAddressSpaceDescriptor::lastAddressSpaceDescriptorId))
, key(key)
, addressRange(addressRange)
, endianness(endianness)
, segmentDescriptorsByKey(segmentDescriptorsByKey)
{}
TargetMemorySize TargetAddressSpaceDescriptor::size() const {
return this->addressRange.size();
}
std::optional<
std::reference_wrapper<const TargetMemorySegmentDescriptor>
> TargetAddressSpaceDescriptor::tryGetMemorySegmentDescriptor(const std::string& key) const {
const auto segmentIt = this->segmentDescriptorsByKey.find(key);
if (segmentIt == this->segmentDescriptorsByKey.end()) {
return std::nullopt;
}
return std::cref(segmentIt->second);
}
const TargetMemorySegmentDescriptor& TargetAddressSpaceDescriptor::getMemorySegmentDescriptor(
const std::string& key
) const {
const auto segment = this->tryGetMemorySegmentDescriptor(key);
if (!segment.has_value()) {
throw Exceptions::InternalFatalErrorException(
"Failed to get memory segment descriptor \"" + key + "\" from address space \"" + this->key
+ "\" - segment not found"
);
}
return segment->get();
}
}

54
src/Targets/TargetAddressSpaceDescriptor.hpp
View File

@@ -8,7 +8,6 @@
#include "TargetMemory.hpp"
#include "TargetMemorySegmentDescriptor.hpp"
#include "src/Exceptions/InternalFatalErrorException.hpp"
namespace Targets
{
@@ -28,41 +27,34 @@ namespace Targets
const TargetMemoryAddressRange& addressRange,
TargetMemoryEndianness endianness,
const std::map<std::string, TargetMemorySegmentDescriptor>& segmentDescriptorsByKey
)
: id(++(TargetAddressSpaceDescriptor::lastAddressSpaceDescriptorId))
, key(key)
, addressRange(addressRange)
, endianness(endianness)
, segmentDescriptorsByKey(segmentDescriptorsByKey)
{};
);
TargetMemorySize size() const {
return this->addressRange.size();
}
TargetMemorySize size() const;
/**
* Attempts to fetch a memory segment descriptor with the given key.
*
* @param key
* The key of the memory segment descriptor to lookup.
*
* @return
* A reference wrapper of the memory segment descriptor, if found. Otherwise, std::nullopt.
*/
std::optional<std::reference_wrapper<const TargetMemorySegmentDescriptor>> tryGetMemorySegmentDescriptor(
const std::string& key
) const {
const auto segmentIt = this->segmentDescriptorsByKey.find(key);
) const;
if (segmentIt == this->segmentDescriptorsByKey.end()) {
return std::nullopt;
}
return std::cref(segmentIt->second);
}
const TargetMemorySegmentDescriptor& getMemorySegmentDescriptor(const std::string& key) const {
const auto segment = this->tryGetMemorySegmentDescriptor(key);
if (!segment.has_value()) {
throw Exceptions::InternalFatalErrorException(
"Failed to get memory segment descriptor \"" + key + "\" from address space \"" + this->key
+ "\" - segment not found"
);
}
return segment->get();
}
/**
* Fetches a memory segment descriptor with the given key. If the descriptor doesn't exist, an
* InternalFatalErrorException is thrown.
*
* @param key
* The key of the memory segment descriptor to lookup.
*
* @return
* A reference to the memory segment descriptor.
*/
const TargetMemorySegmentDescriptor& getMemorySegmentDescriptor(const std::string& key) const;
private:
static inline std::atomic<TargetAddressSpaceDescriptorId> lastAddressSpaceDescriptorId = 0;