From 1d4def228b723ff85e4c4ef8ed21a1e777798af9 Mon Sep 17 00:00:00 2001 From: Nav Date: Fri, 29 Nov 2024 01:13:18 +0000 Subject: [PATCH] Tidying --- src/Targets/RiscV/RiscV.cpp | 2 +- src/Targets/TargetDescription/TargetDescriptionFile.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Targets/RiscV/RiscV.cpp b/src/Targets/RiscV/RiscV.cpp index fec75581..efad9557 100644 --- a/src/Targets/RiscV/RiscV.cpp +++ b/src/Targets/RiscV/RiscV.cpp @@ -53,7 +53,7 @@ namespace Targets::RiscV } void RiscV::deactivate() { - // TODO: Is this "tidy-up" code better placed in the TC? Review after v1.1.0. + // TODO: Is this "tidy-up" code better placed in the TC? Review after v2.0.0. if (this->getExecutionState() != TargetExecutionState::STOPPED) { this->stop(); diff --git a/src/Targets/TargetDescription/TargetDescriptionFile.cpp b/src/Targets/TargetDescription/TargetDescriptionFile.cpp index d741e219..e25d2561 100644 --- a/src/Targets/TargetDescription/TargetDescriptionFile.cpp +++ b/src/Targets/TargetDescription/TargetDescriptionFile.cpp @@ -647,8 +647,8 @@ namespace Targets::TargetDescription StringService::toUint32(TargetDescriptionFile::getAttribute(xmlElement, "size")), TargetDescriptionFile::getAttribute(xmlElement, "executable") == "1", TargetMemoryAccess{ - accessString.has_value() ? accessString->find('R') != std::string::npos : true, - accessString.has_value() ? accessString->find('W') != std::string::npos : true + !accessString.has_value() || accessString->find('R') != std::string::npos, + !accessString.has_value() || accessString->find('W') != std::string::npos }, pageSize.has_value() ? std::optional{StringService::toUint32(*pageSize)}