diff --git a/src/Targets/RiscV/IsaDescriptor.cpp b/src/Targets/RiscV/IsaDescriptor.cpp index a7524407..72fe4343 100644 --- a/src/Targets/RiscV/IsaDescriptor.cpp +++ b/src/Targets/RiscV/IsaDescriptor.cpp @@ -279,7 +279,7 @@ namespace Targets::RiscV stringOffset += majorString->length(); auto output = IsaVersionNumber{ - .major = static_cast(std::stoul(*majorString, nullptr, 10)), + .major = Services::StringService::toUint16(*majorString, 10), .minor = 0 }; @@ -290,7 +290,7 @@ namespace Targets::RiscV const auto minorString = getNextDigitSequence(isaStringLower, stringOffset + 1); if (minorString.has_value()) { - output.minor = static_cast(std::stoul(*minorString, nullptr, 10)); + output.minor = Services::StringService::toUint16(*minorString, 10); stringOffset += minorString->length() + 1; } diff --git a/src/Targets/RiscV/RiscV.cpp b/src/Targets/RiscV/RiscV.cpp index efad9557..c7e899b6 100644 --- a/src/Targets/RiscV/RiscV.cpp +++ b/src/Targets/RiscV/RiscV.cpp @@ -64,10 +64,6 @@ namespace Targets::RiscV this->riscVDebugInterface->deactivate(); } - void RiscV::postActivate() { - // Nothing to do here, for now. - } - void RiscV::run(std::optional toAddress) { this->riscVDebugInterface->run(); } diff --git a/src/Targets/RiscV/RiscV.hpp b/src/Targets/RiscV/RiscV.hpp index 863a054d..dbeb61c6 100644 --- a/src/Targets/RiscV/RiscV.hpp +++ b/src/Targets/RiscV/RiscV.hpp @@ -33,8 +33,6 @@ namespace Targets::RiscV void activate() override; void deactivate() override; - void postActivate() override; - void run(std::optional toAddress = std::nullopt) override; void stop() override; void step() override; diff --git a/src/Targets/RiscV/Wch/WchRiscV.cpp b/src/Targets/RiscV/Wch/WchRiscV.cpp index 2f464952..8743784b 100644 --- a/src/Targets/RiscV/Wch/WchRiscV.cpp +++ b/src/Targets/RiscV/Wch/WchRiscV.cpp @@ -44,8 +44,6 @@ namespace Targets::RiscV::Wch const auto& variant = this->variant->get(); Logger::info("WCH variant ID: " + variant.getProperty("vendor", "variant_id").value); Logger::info("WCH variant name: " + variant.name); - - RiscV::postActivate(); } TargetDescriptor WchRiscV::targetDescriptor() {