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

Block memory writes to read-only selected program memory segments

Browse Source
This commit is contained in:
Nav
2024-12-14 23:50:20 +00:00
parent 9e5d69dee4
commit 6dd8f0453e
1 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/Targets/RiscV/Wch/WchRiscV.cpp
View File

@@ -33,6 +33,17 @@ namespace Targets::RiscV::Wch
"Selected program memory segment: \"" + this->selectedProgramSegmentDescriptor.name + "\" (\""
+ this->selectedProgramSegmentDescriptor.key + "\")"
);
if (
this->selectedProgramSegmentDescriptor == this->bootProgramSegmentDescriptor
&& !this->selectedProgramSegmentDescriptor.programmingModeAccess.writeable
) {
Logger::warning(
"A read-only boot segment has been selected as the program memory segment - all programming sessions"
" will fail. This WCH target does not support storing custom bootloaders in this boot segment."
);
// TODO: Add link to further documentation here
}
}
void WchRiscV::activate() {
@@ -131,6 +142,16 @@ namespace Targets::RiscV::Wch
breakpoint.type == TargetProgramBreakpoint::Type::SOFTWARE
&& breakpoint.memorySegmentDescriptor == this->mappedSegmentDescriptor
) {
if (
!this->selectedProgramSegmentDescriptor.debugModeAccess.writeable
&& (!this->programmingMode || !this->selectedProgramSegmentDescriptor.programmingModeAccess.writeable)
) {
throw Exceptions::Exception{
"The selected program memory segment (\"" + this->selectedProgramSegmentDescriptor.key
+ "\") is not writable - cannot insert software breakpoint"
};
}
this->riscVDebugInterface->setProgramBreakpoint(TargetProgramBreakpoint{
.addressSpaceDescriptor = this->sysAddressSpaceDescriptor,
.memorySegmentDescriptor = this->selectedProgramSegmentDescriptor,
@@ -150,6 +171,16 @@ namespace Targets::RiscV::Wch
breakpoint.type == TargetProgramBreakpoint::Type::SOFTWARE
&& breakpoint.memorySegmentDescriptor == this->mappedSegmentDescriptor
) {
if (
!this->selectedProgramSegmentDescriptor.debugModeAccess.writeable
&& (!this->programmingMode || !this->selectedProgramSegmentDescriptor.programmingModeAccess.writeable)
) {
throw Exceptions::Exception{
"The selected program memory segment (\"" + this->selectedProgramSegmentDescriptor.key
+ "\") is not writable - cannot remove software breakpoint"
};
}
this->riscVDebugInterface->removeProgramBreakpoint(TargetProgramBreakpoint{
.addressSpaceDescriptor = this->sysAddressSpaceDescriptor,
.memorySegmentDescriptor = this->selectedProgramSegmentDescriptor,
@@ -221,6 +252,16 @@ namespace Targets::RiscV::Wch
if (memorySegmentDescriptor == this->mappedSegmentDescriptor) {
const auto& aliasedSegment = this->selectedProgramSegmentDescriptor;
if (
!aliasedSegment.debugModeAccess.writeable
&& (!this->programmingMode || !aliasedSegment.programmingModeAccess.writeable)
) {
throw Exceptions::Exception{
"The selected program memory segment (\"" + aliasedSegment.key + "\") is not writable"
};
}
const auto transformedAddress = this->transformMappedAddress(startAddress, aliasedSegment);
const auto addressRange = TargetMemoryAddressRange{