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

Corrected infinite recursion bug with EDBG Avr8 memory read implementation

Browse Source
This commit is contained in:
Nav
2021-04-07 23:30:30 +01:00
parent 509ff084cd
commit fae2a2af34
4 changed files with 47 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -39,8 +39,11 @@ add_executable(Bloom
src/SignalHandler/SignalHandler.cpp
src/DebugToolDrivers/USB/Interface.cpp
src/DebugToolDrivers/USB/HID/HidInterface.cpp
src/DebugToolDrivers/Microchip/AtmelICE/AtmelIce.cpp
src/DebugToolDrivers/Microchip/PowerDebugger/PowerDebugger.cpp
src/DebugToolDrivers/Microchip/MplabSnap/MplabSnap.cpp
src/DebugToolDrivers/Protocols/CMSIS-DAP/Command.cpp
src/DebugToolDrivers/Protocols/CMSIS-DAP/Response.cpp
src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrCommand.cpp
@@ -142,7 +145,8 @@ target_compile_options(
PUBLIC -Wconversion
PUBLIC -fno-sized-deallocation
PUBLIC $<$<CONFIG:DEBUG>:-g>
PUBLIC $<$<CONFIG:DEBUG>:-Os>
PUBLIC $<$<CONFIG:DEBUG>:-O0>
# PUBLIC $<$<CONFIG:DEBUG>:-Os>
PUBLIC $<$<CONFIG:RELEASE>:-O2>
PUBLIC $<$<CONFIG:DEBUG>:-fno-inline>
PUBLIC $<$<CONFIG:DEBUG>:-fkeep-static-functions>

1
src/DebugToolDrivers/DebugTools.hpp
View File

@@ -3,3 +3,4 @@
#include "DebugTool.hpp"
#include "src/DebugToolDrivers/Microchip/AtmelICE/AtmelIce.hpp"
#include "src/DebugToolDrivers/Microchip/PowerDebugger/PowerDebugger.hpp"
#include "src/DebugToolDrivers/Microchip/MplabSnap/MplabSnap.hpp"

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

@@ -652,7 +652,11 @@ TargetState EdbgAvr8Interface::getTargetState() {
}
TargetMemoryBuffer EdbgAvr8Interface::readMemory(Avr8MemoryType type, std::uint32_t address, std::uint32_t bytes) {
if (type == Avr8MemoryType::FLASH_PAGE && this->targetParameters.flashPageSize.value_or(0) > 0) {
if (type == Avr8MemoryType::FLASH_PAGE) {
if (this->targetParameters.flashPageSize.value_or(0) < 1) {
throw Exception("Missing/invalid flash page size parameter");
}
// Flash reads must be done in pages
auto pageSize = this->targetParameters.flashPageSize.value();
@@ -744,40 +748,41 @@ TargetMemoryBuffer EdbgAvr8Interface::readMemory(Avr8MemoryType type, std::uint3
return memoryBuffer;
}
}
/*
* EDBG AVR8 debug tools behave in a really weird way when responding with more than two packets
* for a single read memory command. The data they return in this case appears to be of little use.
*
* To address this, we make sure we only issue read memory commands that will result in no more than two
* response packets. For calls that require more than this, we simply split them into numerous calls.
*/
/*
* The subtraction of 20 bytes here is just to account for any other bytes included in the response
* that isn't actually the memory data (like the command ID, version bytes, etc). I could have sought the
* actual value but who has the time. It won't exceed 20 bytes. Bite me.
*/
auto singlePacketSize = static_cast<std::uint32_t>(this->edbgInterface.getUsbHidInputReportSize() - 20);
auto totalResponsePackets = std::ceil(static_cast<float>(bytes) / static_cast<float>(singlePacketSize));
auto totalReadsRequired = std::ceil(static_cast<float>(totalResponsePackets) / 2);
if (totalResponsePackets > 2) {
} else {
/*
* This call to readMemory() will result in more than two response packets, so split it into multiple calls
* that will result in no more than two response packets per call.
* EDBG AVR8 debug tools behave in a really weird way when responding with more than two packets
* for a single read (non-flash) memory command. The data they return in this case appears to be of little use.
*
* To address this, we make sure we only issue read memory commands that will result in no more than two
* response packets. For calls that require more than this, we simply split them into numerous calls.
*/
auto output = std::vector<unsigned char>();
for (float i = 1; i <= totalReadsRequired; i++) {
auto bytesToRead = static_cast<std::uint32_t>((bytes - output.size()) > (singlePacketSize * 2) ?
(singlePacketSize * 2) : bytes - output.size());
auto data = this->readMemory(type, static_cast<std::uint32_t>(address + output.size()), bytesToRead);
output.insert(output.end(), data.begin(), data.end());
/*
* The subtraction of 20 bytes here is just to account for any other bytes included in the response
* that isn't actually the memory data (like the command ID, version bytes, etc). I could have sought the
* actual value but who has the time. It won't exceed 20 bytes. Bite me.
*/
auto singlePacketSize = static_cast<std::uint32_t>(this->edbgInterface.getUsbHidInputReportSize() - 20);
auto totalResponsePackets = std::ceil(static_cast<float>(bytes) / static_cast<float>(singlePacketSize));
auto totalReadsRequired = std::ceil(static_cast<float>(totalResponsePackets) / 2);
if (totalResponsePackets > 2) {
/*
* This call to readMemory() will result in more than two response packets, so split it into multiple calls
* that will result in no more than two response packets per call.
*/
auto output = std::vector<unsigned char>();
for (float i = 1; i <= totalReadsRequired; i++) {
auto bytesToRead = static_cast<std::uint32_t>((bytes - output.size()) > (singlePacketSize * 2) ?
(singlePacketSize * 2) : bytes - output.size());
auto data = this->readMemory(type, static_cast<std::uint32_t>(address + output.size()), bytesToRead);
output.insert(output.end(), data.begin(), data.end());
}
return output;
}
return output;
}
auto commandFrame = CommandFrames::Avr8Generic::ReadMemory();

6
src/TargetController/TargetController.hpp
View File

@@ -85,6 +85,12 @@ namespace Bloom
return std::make_unique<PowerDebugger>();
}
},
{
"snap",
[]() -> std::unique_ptr<DebugTool> {
return std::make_unique<MplabSnap>();
}
},
};
}