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

Tidying

Browse Source
This commit is contained in:
Nav
2022-12-18 19:28:17 +00:00
parent 09fc5b73f2
commit 5854b43816
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.cpp
View File

@@ -7,7 +7,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames
{ {
ReadMemory::ReadMemory( ReadMemory::ReadMemory(
const Avr8MemoryType& type, const Avr8MemoryType& type,
std::uint32_t address, std::uint32_t startAddress,
std::uint32_t bytes, std::uint32_t bytes,
const std::set<std::uint32_t>& excludedAddresses const std::set<std::uint32_t>& excludedAddresses
) )
@@ -26,24 +26,24 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames
this->payload[0] = excludedAddresses.empty() ? 0x21 : 0x22; this->payload[0] = excludedAddresses.empty() ? 0x21 : 0x22;
this->payload[1] = 0x00; this->payload[1] = 0x00;
this->payload[2] = static_cast<unsigned char>(type); this->payload[2] = static_cast<unsigned char>(type);
this->payload[3] = static_cast<unsigned char>(address); this->payload[3] = static_cast<unsigned char>(startAddress);
this->payload[4] = static_cast<unsigned char>(address >> 8); this->payload[4] = static_cast<unsigned char>(startAddress >> 8);
this->payload[5] = static_cast<unsigned char>(address >> 16); this->payload[5] = static_cast<unsigned char>(startAddress >> 16);
this->payload[6] = static_cast<unsigned char>(address >> 24); this->payload[6] = static_cast<unsigned char>(startAddress >> 24);
this->payload[7] = static_cast<unsigned char>(bytes); this->payload[7] = static_cast<unsigned char>(bytes);
this->payload[8] = static_cast<unsigned char>(bytes >> 8); this->payload[8] = static_cast<unsigned char>(bytes >> 8);
this->payload[9] = static_cast<unsigned char>(bytes >> 16); this->payload[9] = static_cast<unsigned char>(bytes >> 16);
this->payload[10] = static_cast<unsigned char>(bytes >> 24); this->payload[10] = static_cast<unsigned char>(bytes >> 24);
if (!excludedAddresses.empty()) { if (!excludedAddresses.empty()) {
const auto endAddress = address + (bytes - 1); const auto endAddress = startAddress + (bytes - 1);
constexpr auto byteBitSize = std::numeric_limits<unsigned char>::digits; constexpr auto byteBitSize = std::numeric_limits<unsigned char>::digits;
auto byteBitset = std::bitset<byteBitSize>(); auto byteBitset = std::bitset<byteBitSize>();
byteBitset.reset(); byteBitset.reset();
for (std::uint32_t address = address; address <= endAddress; address++) { for (std::uint32_t address = startAddress; address <= endAddress; address++) {
auto addressIndex = address - address; auto addressIndex = address - startAddress;
auto bitIndex = static_cast<std::size_t>( auto bitIndex = static_cast<std::size_t>(
addressIndex - (std::floor(addressIndex / byteBitSize) * byteBitSize) addressIndex - (std::floor(addressIndex / byteBitSize) * byteBitSize)
); );