Tidying
This commit is contained in:
@@ -279,7 +279,7 @@ namespace Targets::RiscV
|
|||||||
stringOffset += majorString->length();
|
stringOffset += majorString->length();
|
||||||
|
|
||||||
auto output = IsaVersionNumber{
|
auto output = IsaVersionNumber{
|
||||||
.major = static_cast<std::uint16_t>(std::stoul(*majorString, nullptr, 10)),
|
.major = Services::StringService::toUint16(*majorString, 10),
|
||||||
.minor = 0
|
.minor = 0
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -290,7 +290,7 @@ namespace Targets::RiscV
|
|||||||
|
|
||||||
const auto minorString = getNextDigitSequence(isaStringLower, stringOffset + 1);
|
const auto minorString = getNextDigitSequence(isaStringLower, stringOffset + 1);
|
||||||
if (minorString.has_value()) {
|
if (minorString.has_value()) {
|
||||||
output.minor = static_cast<std::uint16_t>(std::stoul(*minorString, nullptr, 10));
|
output.minor = Services::StringService::toUint16(*minorString, 10);
|
||||||
stringOffset += minorString->length() + 1;
|
stringOffset += minorString->length() + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -64,10 +64,6 @@ namespace Targets::RiscV
|
|||||||
this->riscVDebugInterface->deactivate();
|
this->riscVDebugInterface->deactivate();
|
||||||
}
|
}
|
||||||
|
|
||||||
void RiscV::postActivate() {
|
|
||||||
// Nothing to do here, for now.
|
|
||||||
}
|
|
||||||
|
|
||||||
void RiscV::run(std::optional<TargetMemoryAddress> toAddress) {
|
void RiscV::run(std::optional<TargetMemoryAddress> toAddress) {
|
||||||
this->riscVDebugInterface->run();
|
this->riscVDebugInterface->run();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,8 +33,6 @@ namespace Targets::RiscV
|
|||||||
void activate() override;
|
void activate() override;
|
||||||
void deactivate() override;
|
void deactivate() override;
|
||||||
|
|
||||||
void postActivate() override;
|
|
||||||
|
|
||||||
void run(std::optional<TargetMemoryAddress> toAddress = std::nullopt) override;
|
void run(std::optional<TargetMemoryAddress> toAddress = std::nullopt) override;
|
||||||
void stop() override;
|
void stop() override;
|
||||||
void step() override;
|
void step() override;
|
||||||
|
|||||||
@@ -44,8 +44,6 @@ namespace Targets::RiscV::Wch
|
|||||||
const auto& variant = this->variant->get();
|
const auto& variant = this->variant->get();
|
||||||
Logger::info("WCH variant ID: " + variant.getProperty("vendor", "variant_id").value);
|
Logger::info("WCH variant ID: " + variant.getProperty("vendor", "variant_id").value);
|
||||||
Logger::info("WCH variant name: " + variant.name);
|
Logger::info("WCH variant name: " + variant.name);
|
||||||
|
|
||||||
RiscV::postActivate();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
TargetDescriptor WchRiscV::targetDescriptor() {
|
TargetDescriptor WchRiscV::targetDescriptor() {
|
||||||
|
|||||||
Reference in New Issue
Block a user