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-05-23 23:50:10 +01:00
parent 33da17e393
commit abfd47dc9c
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Application.cpp
View File

@@ -375,9 +375,9 @@ namespace Bloom
} }
void Application::stopSignalHandler() { void Application::stopSignalHandler() {
if (this->signalHandler.getThreadState() != ThreadState::STOPPED const auto shThreadState = this->signalHandler.getThreadState();
&& this->signalHandler.getThreadState() != ThreadState::UNINITIALISED
) { if (shThreadState != ThreadState::STOPPED && shThreadState != ThreadState::UNINITIALISED) {
this->signalHandler.triggerShutdown(); this->signalHandler.triggerShutdown();
/* /*

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

@@ -1419,7 +1419,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
segmentSize segmentSize
); );
output.insert(output.end(), segmentBuffer.begin(), segmentBuffer.end()); std::move(segmentBuffer.begin(), segmentBuffer.end(), std::back_inserter(output));
} }
output.emplace_back(0x00); output.emplace_back(0x00);
@@ -1436,7 +1436,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
finalReadBytes finalReadBytes
); );
output.insert(output.end(), segmentBuffer.begin(), segmentBuffer.end()); std::move(segmentBuffer.begin(), segmentBuffer.end(), std::back_inserter(output));
} }
return output; return output;
@@ -1447,15 +1447,18 @@ 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) {
const auto memoryBuffer = this->readMemory(type, alignedStartAddress, alignedBytes, excludedAddresses); auto memoryBuffer = this->readMemory(type, alignedStartAddress, alignedBytes, excludedAddresses);
const auto offset = memoryBuffer.begin() + (startAddress - alignedStartAddress); const auto offset = memoryBuffer.begin() + (startAddress - alignedStartAddress);
return TargetMemoryBuffer(offset, offset + bytes); auto output = TargetMemoryBuffer(bytes);
std::move(offset, offset + bytes, std::back_inserter(output));
return output;
} }
if (type == Avr8MemoryType::FLASH_PAGE && this->configVariant == Avr8ConfigVariant::DEBUG_WIRE) { if (type == Avr8MemoryType::FLASH_PAGE && this->configVariant == Avr8ConfigVariant::DEBUG_WIRE) {
// With the FLASH_PAGE memory type, in debugWire sessions, we can only read one page at a time. // With the FLASH_PAGE memory type, in debugWire sessions, we can only read one page at a time.
auto pageSize = this->targetParameters.flashPageSize.value(); const auto pageSize = this->targetParameters.flashPageSize.value();
if (bytes > pageSize) { if (bytes > pageSize) {
// bytes should always be a multiple of pageSize (given the code above) // bytes should always be a multiple of pageSize (given the code above)
@@ -1469,7 +1472,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
startAddress + static_cast<std::uint32_t>(pageSize * i), startAddress + static_cast<std::uint32_t>(pageSize * i),
pageSize pageSize
); );
memoryBuffer.insert(memoryBuffer.end(), pageBuffer.begin(), pageBuffer.end()); std::move(pageBuffer.begin(), pageBuffer.end(), std::back_inserter(memoryBuffer));
} }
return memoryBuffer; return memoryBuffer;
@@ -1489,8 +1492,10 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
output.reserve(bytes); output.reserve(bytes);
for (float i = 1; i <= totalReadsRequired; i++) { for (float i = 1; i <= totalReadsRequired; i++) {
auto bytesToRead = static_cast<std::uint32_t>((bytes - output.size()) > maximumRequestSize ? const auto bytesToRead = static_cast<std::uint32_t>(
maximumRequestSize : bytes - output.size()); (bytes - output.size()) > maximumRequestSize ? maximumRequestSize : bytes - output.size()
);
auto data = this->readMemory( auto data = this->readMemory(
type, type,
static_cast<std::uint32_t>(startAddress + output.size()), static_cast<std::uint32_t>(startAddress + output.size()),

3
src/Targets/Microchip/AVR/AVR8/Avr8.cpp
View File

@@ -459,7 +459,8 @@ namespace Bloom::Targets::Microchip::Avr::Avr8Bit
ioState = TargetPinState::IoState::LOW; ioState = TargetPinState::IoState::LOW;
} }
if (!padDescriptor.ddrSetAddress.has_value() if (
!padDescriptor.ddrSetAddress.has_value()
|| !padDescriptor.gpioPortSetAddress.has_value() || !padDescriptor.gpioPortSetAddress.has_value()
|| !padDescriptor.gpioPinNumber.has_value() || !padDescriptor.gpioPinNumber.has_value()
) { ) {