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

Fixed bug (in EDBG driver) with writeMemory() forwarding an invalid memory type to readMemory() (EEPROM_ATOMIC can only be used for writing to memory, not reading)

Browse Source
This commit is contained in:
Nav
2022-12-11 23:36:21 +00:00
parent 131f1aa249
commit f0225dba88
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp
View File

@@ -1809,7 +1809,15 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
const auto alignedBytes = this->alignMemoryBytes(type, bytes + (startAddress - alignedStartAddress)); const auto alignedBytes = this->alignMemoryBytes(type, bytes + (startAddress - alignedStartAddress));
if (alignedStartAddress != startAddress || alignedBytes != bytes) { if (alignedStartAddress != startAddress || alignedBytes != bytes) {
auto alignedBuffer = this->readMemory(type, alignedStartAddress, alignedBytes); /*
* We can't just forward the memory type to readMemory(), because some memory types (such as
* EEPROM_ATOMIC) can only be used for writing.
*
* This nasty hack will have to do for now.
*/
const auto readMemoryType = type == Avr8MemoryType::EEPROM_ATOMIC ? Avr8MemoryType::EEPROM : type;
auto alignedBuffer = this->readMemory(readMemoryType, alignedStartAddress, alignedBytes);
assert(alignedBuffer.size() >= buffer.size()); assert(alignedBuffer.size() >= buffer.size());
const auto offset = alignedBuffer.begin() + (startAddress - alignedStartAddress); const auto offset = alignedBuffer.begin() + (startAddress - alignedStartAddress);