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

Improved naming consistency of aliases

Browse Source
This commit is contained in:
Nav
2022-10-01 21:01:37 +01:00
parent 2c6fd25ae4
commit 065a389dfe
56 changed files with 96 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/DebugServer/Gdb/AvrGdb/AvrGdbRsp.cpp
View File

@@ -32,7 +32,7 @@ namespace Bloom::DebugServer::Gdb::AvrGdb
}
std::unique_ptr<Gdb::CommandPackets::CommandPacket> AvrGdbRsp::resolveCommandPacket(
const RawPacketType& rawPacket
const RawPacket& rawPacket
) {
using AvrGdb::CommandPackets::ReadMemory;
using AvrGdb::CommandPackets::WriteMemory;

2
src/DebugServer/Gdb/AvrGdb/AvrGdbRsp.hpp
View File

@@ -29,7 +29,7 @@ namespace Bloom::DebugServer::Gdb::AvrGdb
}
std::unique_ptr<Gdb::CommandPackets::CommandPacket> resolveCommandPacket(
const RawPacketType& rawPacket
const RawPacket& rawPacket
) override;
std::set<std::pair<Feature, std::optional<std::string>>> getSupportedFeatures() override ;

2
src/DebugServer/Gdb/AvrGdb/CommandPackets/FlashDone.cpp
View File

@@ -15,7 +15,7 @@ namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
using namespace Bloom::Exceptions;
FlashDone::FlashDone(const RawPacketType& rawPacket)
FlashDone::FlashDone(const RawPacket& rawPacket)
: CommandPacket(rawPacket)
{}

2
src/DebugServer/Gdb/AvrGdb/CommandPackets/FlashDone.hpp
View File

@@ -16,7 +16,7 @@ namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
class FlashDone: public Gdb::CommandPackets::CommandPacket
{
public:
explicit FlashDone(const RawPacketType& rawPacket);
explicit FlashDone(const RawPacket& rawPacket);
void handle(
DebugSession& debugSession,

2
src/DebugServer/Gdb/AvrGdb/CommandPackets/FlashErase.cpp
View File

@@ -15,7 +15,7 @@ namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
using namespace Bloom::Exceptions;
FlashErase::FlashErase(const RawPacketType& rawPacket)
FlashErase::FlashErase(const RawPacket& rawPacket)
: CommandPacket(rawPacket)
{
const auto packetString = QString::fromLocal8Bit(

2
src/DebugServer/Gdb/AvrGdb/CommandPackets/FlashErase.hpp
View File

@@ -20,7 +20,7 @@ namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
std::uint32_t startAddress = 0;
std::uint32_t bytes = 0;
explicit FlashErase(const RawPacketType& rawPacket);
explicit FlashErase(const RawPacket& rawPacket);
void handle(
DebugSession& debugSession,

2
src/DebugServer/Gdb/AvrGdb/CommandPackets/FlashWrite.cpp
View File

@@ -17,7 +17,7 @@ namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
using namespace Bloom::Exceptions;
FlashWrite::FlashWrite(const RawPacketType& rawPacket)
FlashWrite::FlashWrite(const RawPacket& rawPacket)
: CommandPacket(rawPacket)
{
if (this->data.size() < 15) {

2
src/DebugServer/Gdb/AvrGdb/CommandPackets/FlashWrite.hpp
View File

@@ -20,7 +20,7 @@ namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
std::uint32_t startAddress = 0;
Targets::TargetMemoryBuffer buffer;
explicit FlashWrite(const RawPacketType& rawPacket);
explicit FlashWrite(const RawPacket& rawPacket);
void handle(
DebugSession& debugSession,

2
src/DebugServer/Gdb/AvrGdb/CommandPackets/ReadMemory.cpp
View File

@@ -15,7 +15,7 @@ namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
using Exceptions::Exception;
ReadMemory::ReadMemory(const RawPacketType& rawPacket, const TargetDescriptor& gdbTargetDescriptor)
ReadMemory::ReadMemory(const RawPacket& rawPacket, const TargetDescriptor& gdbTargetDescriptor)
: CommandPacket(rawPacket)
{
if (this->data.size() < 4) {

2
src/DebugServer/Gdb/AvrGdb/CommandPackets/ReadMemory.hpp
View File

@@ -32,7 +32,7 @@ namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
*/
Targets::TargetMemorySize bytes = 0;
explicit ReadMemory(const RawPacketType& rawPacket, const Gdb::TargetDescriptor& gdbTargetDescriptor);
explicit ReadMemory(const RawPacket& rawPacket, const Gdb::TargetDescriptor& gdbTargetDescriptor);
void handle(
DebugSession& debugSession,

2
src/DebugServer/Gdb/AvrGdb/CommandPackets/ReadMemoryMap.cpp
View File

@@ -12,7 +12,7 @@ namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
using Exceptions::Exception;
ReadMemoryMap::ReadMemoryMap(const RawPacketType& rawPacket)
ReadMemoryMap::ReadMemoryMap(const RawPacket& rawPacket)
: CommandPacket(rawPacket)
{
if (this->data.size() < 26) {

2
src/DebugServer/Gdb/AvrGdb/CommandPackets/ReadMemoryMap.hpp
View File

@@ -23,7 +23,7 @@ namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
*/
std::uint32_t length = 0;
explicit ReadMemoryMap(const RawPacketType& rawPacket);
explicit ReadMemoryMap(const RawPacket& rawPacket);
void handle(
DebugSession& debugSession,

2
src/DebugServer/Gdb/AvrGdb/CommandPackets/WriteMemory.cpp
View File

@@ -15,7 +15,7 @@ namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
using namespace Bloom::Exceptions;
WriteMemory::WriteMemory(const RawPacketType& rawPacket, const TargetDescriptor& gdbTargetDescriptor)
WriteMemory::WriteMemory(const RawPacket& rawPacket, const TargetDescriptor& gdbTargetDescriptor)
: CommandPacket(rawPacket)
{
if (this->data.size() < 4) {

2
src/DebugServer/Gdb/AvrGdb/CommandPackets/WriteMemory.hpp
View File

@@ -32,7 +32,7 @@ namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
*/
Targets::TargetMemoryBuffer buffer;
explicit WriteMemory(const RawPacketType& rawPacket, const Gdb::TargetDescriptor& gdbTargetDescriptor);
explicit WriteMemory(const RawPacket& rawPacket, const Gdb::TargetDescriptor& gdbTargetDescriptor);
void handle(
DebugSession& debugSession,

10
src/DebugServer/Gdb/AvrGdb/TargetDescriptor.cpp
View File

@@ -24,13 +24,13 @@ namespace Bloom::DebugServer::Gdb::AvrGdb
this->loadRegisterMappings();
}
std::optional<GdbRegisterNumberType> TargetDescriptor::getRegisterNumberFromTargetRegisterDescriptor(
std::optional<GdbRegisterNumber> TargetDescriptor::getRegisterNumberFromTargetRegisterDescriptor(
const Targets::TargetRegisterDescriptor& registerDescriptor
) const {
return this->targetRegisterDescriptorsByGdbNumber.valueAt(registerDescriptor);
}
const RegisterDescriptor& TargetDescriptor::getRegisterDescriptorFromNumber(GdbRegisterNumberType number) const {
const RegisterDescriptor& TargetDescriptor::getRegisterDescriptorFromNumber(GdbRegisterNumber number) const {
if (this->registerDescriptorsByGdbNumber.contains(number)) {
return this->registerDescriptorsByGdbNumber.at(number);
}
@@ -40,7 +40,7 @@ namespace Bloom::DebugServer::Gdb::AvrGdb
}
const TargetRegisterDescriptor& TargetDescriptor::getTargetRegisterDescriptorFromNumber(
GdbRegisterNumberType number
GdbRegisterNumber number
) const {
if (this->targetRegisterDescriptorsByGdbNumber.contains(number)) {
return this->targetRegisterDescriptorsByGdbNumber.at(number);
@@ -50,7 +50,7 @@ namespace Bloom::DebugServer::Gdb::AvrGdb
+ ") not mapped to any target register descriptor.");
}
const std::vector<GdbRegisterNumberType>& TargetDescriptor::getRegisterNumbers() const {
const std::vector<GdbRegisterNumber>& TargetDescriptor::getRegisterNumbers() const {
return this->registerNumbers;
}
@@ -98,7 +98,7 @@ namespace Bloom::DebugServer::Gdb::AvrGdb
);
// General purpose registers
GdbRegisterNumberType regNumber = 0;
GdbRegisterNumber regNumber = 0;
for (const auto& descriptor : gpRegisterDescriptors) {
this->registerDescriptorsByGdbNumber.insert(std::pair(
regNumber,

14
src/DebugServer/Gdb/AvrGdb/TargetDescriptor.hpp
View File

@@ -9,8 +9,8 @@ namespace Bloom::DebugServer::Gdb::AvrGdb
class TargetDescriptor: public DebugServer::Gdb::TargetDescriptor
{
public:
BiMap<GdbRegisterNumberType, RegisterDescriptor> registerDescriptorsByGdbNumber = {};
BiMap<GdbRegisterNumberType, Targets::TargetRegisterDescriptor> targetRegisterDescriptorsByGdbNumber = {};
BiMap<GdbRegisterNumber, RegisterDescriptor> registerDescriptorsByGdbNumber = {};
BiMap<GdbRegisterNumber, Targets::TargetRegisterDescriptor> targetRegisterDescriptorsByGdbNumber = {};
explicit TargetDescriptor(const Targets::TargetDescriptor& targetDescriptor);
@@ -21,7 +21,7 @@ namespace Bloom::DebugServer::Gdb::AvrGdb
* @param registerDescriptor
* @return
*/
std::optional<GdbRegisterNumberType> getRegisterNumberFromTargetRegisterDescriptor(
std::optional<GdbRegisterNumber> getRegisterNumberFromTargetRegisterDescriptor(
const Targets::TargetRegisterDescriptor& registerDescriptor
) const override;
@@ -31,7 +31,7 @@ namespace Bloom::DebugServer::Gdb::AvrGdb
* @param number
* @return
*/
const RegisterDescriptor& getRegisterDescriptorFromNumber(GdbRegisterNumberType number) const override;
const RegisterDescriptor& getRegisterDescriptorFromNumber(GdbRegisterNumber number) const override;
/**
* Should retrieve the mapped target register descriptor for a given GDB register number.
@@ -40,13 +40,13 @@ namespace Bloom::DebugServer::Gdb::AvrGdb
* @return
*/
const Targets::TargetRegisterDescriptor& getTargetRegisterDescriptorFromNumber(
GdbRegisterNumberType number
GdbRegisterNumber number
) const override;
const std::vector<GdbRegisterNumberType>& getRegisterNumbers() const override;
const std::vector<GdbRegisterNumber>& getRegisterNumbers() const override;
private:
std::vector<GdbRegisterNumberType> registerNumbers = std::vector<GdbRegisterNumberType>(35);
std::vector<GdbRegisterNumber> registerNumbers = std::vector<GdbRegisterNumber>(35);
/**
* For AVR targets, avr-gdb defines 35 registers in total:

2
src/DebugServer/Gdb/CommandPackets/CommandPacket.hpp
View File

@@ -36,7 +36,7 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
class CommandPacket: public Packet
{
public:
explicit CommandPacket(const RawPacketType& rawPacket): Packet(rawPacket) {}
explicit CommandPacket(const RawPacket& rawPacket): Packet(rawPacket) {}
/**
* Should handle the command for the current active debug session.

2
src/DebugServer/Gdb/CommandPackets/ContinueExecution.cpp
View File

@@ -12,7 +12,7 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
using ResponsePackets::ErrorResponsePacket;
using Exceptions::Exception;
ContinueExecution::ContinueExecution(const RawPacketType& rawPacket)
ContinueExecution::ContinueExecution(const RawPacket& rawPacket)
: CommandPacket(rawPacket)
{
if (this->data.size() > 1) {

2
src/DebugServer/Gdb/CommandPackets/ContinueExecution.hpp
View File

@@ -26,7 +26,7 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
*/
std::optional<Targets::TargetProgramCounter> fromProgramCounter;
explicit ContinueExecution(const RawPacketType& rawPacket);
explicit ContinueExecution(const RawPacket& rawPacket);
void handle(
DebugSession& debugSession,

2
src/DebugServer/Gdb/CommandPackets/Detach.cpp
View File

@@ -16,7 +16,7 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
using Exceptions::Exception;
Detach::Detach(const RawPacketType& rawPacket)
Detach::Detach(const RawPacket& rawPacket)
: CommandPacket(rawPacket)
{}

2
src/DebugServer/Gdb/CommandPackets/Detach.hpp
View File

@@ -7,7 +7,7 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
class Detach: public CommandPacket
{
public:
explicit Detach(const RawPacketType& rawPacket);
explicit Detach(const RawPacket& rawPacket);
void handle(
DebugSession& debugSession,

2
src/DebugServer/Gdb/CommandPackets/InterruptExecution.hpp
View File

@@ -15,7 +15,7 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
class InterruptExecution: public CommandPacket
{
public:
explicit InterruptExecution(const RawPacketType& rawPacket): CommandPacket(rawPacket) {}
explicit InterruptExecution(const RawPacket& rawPacket): CommandPacket(rawPacket) {}
void handle(
DebugSession& debugSession,

2
src/DebugServer/Gdb/CommandPackets/Monitor.cpp
View File

@@ -10,7 +10,7 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
using ResponsePackets::EmptyResponsePacket;
Monitor::Monitor(const RawPacketType& rawPacket)
Monitor::Monitor(const RawPacket& rawPacket)
: CommandPacket(rawPacket)
{
if (this->data.size() > 6) {

2
src/DebugServer/Gdb/CommandPackets/Monitor.hpp
View File

@@ -17,7 +17,7 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
*/
std::string command;
explicit Monitor(const RawPacketType& rawPacket);
explicit Monitor(const RawPacket& rawPacket);
void handle(
DebugSession& debugSession,

2
src/DebugServer/Gdb/CommandPackets/ReadRegisters.cpp
View File

@@ -19,7 +19,7 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
using Exceptions::Exception;
ReadRegisters::ReadRegisters(const RawPacketType& rawPacket)
ReadRegisters::ReadRegisters(const RawPacket& rawPacket)
: CommandPacket(rawPacket)
{
if (this->data.size() >= 2 && this->data.front() == 'p') {

4
src/DebugServer/Gdb/CommandPackets/ReadRegisters.hpp
View File

@@ -23,9 +23,9 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
* If the register number is not supplied (as is the case with "g" packets), the server is expected to respond
* with values for all registers.
*/
std::optional<GdbRegisterNumberType> registerNumber;
std::optional<GdbRegisterNumber> registerNumber;
explicit ReadRegisters(const RawPacketType& rawPacket);
explicit ReadRegisters(const RawPacket& rawPacket);
void handle(
DebugSession& debugSession,

2
src/DebugServer/Gdb/CommandPackets/RemoveBreakpoint.cpp
View File

@@ -21,7 +21,7 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
using Exceptions::Exception;
RemoveBreakpoint::RemoveBreakpoint(const RawPacketType& rawPacket)
RemoveBreakpoint::RemoveBreakpoint(const RawPacket& rawPacket)
: CommandPacket(rawPacket)
{
if (this->data.size() < 6) {

2
src/DebugServer/Gdb/CommandPackets/RemoveBreakpoint.hpp
View File

@@ -28,7 +28,7 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
*/
Targets::TargetMemoryAddress address = 0;
explicit RemoveBreakpoint(const RawPacketType& rawPacket);
explicit RemoveBreakpoint(const RawPacket& rawPacket);
void handle(
DebugSession& debugSession,

2
src/DebugServer/Gdb/CommandPackets/SetBreakpoint.cpp
View File

@@ -21,7 +21,7 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
using Exceptions::Exception;
SetBreakpoint::SetBreakpoint(const RawPacketType& rawPacket)
SetBreakpoint::SetBreakpoint(const RawPacket& rawPacket)
: CommandPacket(rawPacket)
{
if (this->data.size() < 6) {

2
src/DebugServer/Gdb/CommandPackets/SetBreakpoint.hpp
View File

@@ -28,7 +28,7 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
*/
Targets::TargetMemoryAddress address = 0;
explicit SetBreakpoint(const RawPacketType& rawPacket);
explicit SetBreakpoint(const RawPacket& rawPacket);
void handle(
DebugSession& debugSession,

2
src/DebugServer/Gdb/CommandPackets/StepExecution.cpp
View File

@@ -13,7 +13,7 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
using Exceptions::Exception;
StepExecution::StepExecution(const RawPacketType& rawPacket)
StepExecution::StepExecution(const RawPacket& rawPacket)
: CommandPacket(rawPacket)
{
if (this->data.size() > 1) {

2
src/DebugServer/Gdb/CommandPackets/StepExecution.hpp
View File

@@ -21,7 +21,7 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
*/
std::optional<Targets::TargetProgramCounter> fromProgramCounter;
explicit StepExecution(const RawPacketType& rawPacket);
explicit StepExecution(const RawPacket& rawPacket);
void handle(
DebugSession& debugSession,

2
src/DebugServer/Gdb/CommandPackets/SupportedFeaturesQuery.cpp
View File

@@ -21,7 +21,7 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
using Bloom::Exceptions::Exception;
using Gdb::Exceptions::ClientNotSupported;
SupportedFeaturesQuery::SupportedFeaturesQuery(const RawPacketType& rawPacket)
SupportedFeaturesQuery::SupportedFeaturesQuery(const RawPacket& rawPacket)
: CommandPacket(rawPacket)
{
/*

2
src/DebugServer/Gdb/CommandPackets/SupportedFeaturesQuery.hpp
View File

@@ -22,7 +22,7 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
class SupportedFeaturesQuery: public CommandPacket
{
public:
explicit SupportedFeaturesQuery(const RawPacketType& rawPacket);
explicit SupportedFeaturesQuery(const RawPacket& rawPacket);
[[nodiscard]] bool isFeatureSupported(const Feature& feature) const {
return this->supportedFeatures.find(feature) != this->supportedFeatures.end();

2
src/DebugServer/Gdb/CommandPackets/WriteRegister.cpp
View File

@@ -22,7 +22,7 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
using Exceptions::Exception;
WriteRegister::WriteRegister(const RawPacketType& rawPacket)
WriteRegister::WriteRegister(const RawPacket& rawPacket)
: CommandPacket(rawPacket)
{
// The P packet updates a single register

2
src/DebugServer/Gdb/CommandPackets/WriteRegister.hpp
View File

@@ -17,7 +17,7 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
int registerNumber = 0;
std::vector<unsigned char> registerValue;
explicit WriteRegister(const RawPacketType& rawPacket);
explicit WriteRegister(const RawPacket& rawPacket);
void handle(
DebugSession& debugSession,

6
src/DebugServer/Gdb/Connection.cpp
View File

@@ -51,8 +51,8 @@ namespace Bloom::DebugServer::Gdb
return std::string(ipAddress.data());
}
std::vector<RawPacketType> Connection::readRawPackets() {
std::vector<RawPacketType> output;
std::vector<RawPacket> Connection::readRawPackets() {
std::vector<RawPacket> output;
const auto bytes = this->read();
@@ -71,7 +71,7 @@ namespace Bloom::DebugServer::Gdb
} else if (byte == '$') {
// Beginning of packet
RawPacketType rawPacket;
RawPacket rawPacket;
rawPacket.push_back('$');
auto packetIndex = byteIndex;

2
src/DebugServer/Gdb/Connection.hpp
View File

@@ -57,7 +57,7 @@ namespace Bloom::DebugServer::Gdb
*
* @return
*/
std::vector<RawPacketType> readRawPackets();
std::vector<RawPacket> readRawPackets();
/**
* Sends a response packet to the client.

2
src/DebugServer/Gdb/GdbRspDebugServer.cpp
View File

@@ -254,7 +254,7 @@ namespace Bloom::DebugServer::Gdb
return this->resolveCommandPacket(rawPackets.back());
}
std::unique_ptr<CommandPacket> GdbRspDebugServer::resolveCommandPacket(const RawPacketType& rawPacket) {
std::unique_ptr<CommandPacket> GdbRspDebugServer::resolveCommandPacket(const RawPacket& rawPacket) {
if (rawPacket.size() == 5 && rawPacket[1] == 0x03) {
// Interrupt request
return std::make_unique<CommandPackets::InterruptExecution>(rawPacket);

2
src/DebugServer/Gdb/GdbRspDebugServer.hpp
View File

@@ -161,7 +161,7 @@ namespace Bloom::DebugServer::Gdb
* @param rawPacket
* @return
*/
virtual std::unique_ptr<CommandPackets::CommandPacket> resolveCommandPacket(const RawPacketType& rawPacket);
virtual std::unique_ptr<CommandPackets::CommandPacket> resolveCommandPacket(const RawPacket& rawPacket);
/**
* Should return a set of GDB features supported by the GDB server. Each supported feature may come with an

8
src/DebugServer/Gdb/Packet.hpp
View File

@@ -9,7 +9,7 @@
namespace Bloom::DebugServer::Gdb
{
using RawPacketType = std::vector<unsigned char>;
using RawPacket = std::vector<unsigned char>;
/**
* The Packet class implements the data structure for GDB RSP packets.
@@ -19,7 +19,7 @@ namespace Bloom::DebugServer::Gdb
class Packet
{
public:
explicit Packet(const RawPacketType& rawPacket) {
explicit Packet(const RawPacket& rawPacket) {
this->init(rawPacket);
}
@@ -45,7 +45,7 @@ namespace Bloom::DebugServer::Gdb
*
* @return
*/
[[nodiscard]] RawPacketType toRawPacket() const {
[[nodiscard]] RawPacket toRawPacket() const {
std::vector<unsigned char> packet = {'$'};
auto data = this->getData();
@@ -139,7 +139,7 @@ namespace Bloom::DebugServer::Gdb
protected:
std::vector<unsigned char> data;
void init(const RawPacketType& rawPacket) {
void init(const RawPacket& rawPacket) {
this->data.insert(
this->data.begin(),
rawPacket.begin() + 1,

2
src/DebugServer/Gdb/README.md
View File

@@ -51,7 +51,7 @@ public:
*/
std::uint32_t address = 0;
explicit SetBreakpoint(const RawPacketType& rawPacket);
explicit SetBreakpoint(const RawPacket& rawPacket);
void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole) override;
};

11
src/DebugServer/Gdb/RegisterDescriptor.hpp
View File

@@ -5,7 +5,7 @@
namespace Bloom::DebugServer::Gdb
{
using GdbRegisterNumberType = int;
using GdbRegisterNumber = int;
/*
* GDB defines a set of registers for each target architecture.
@@ -14,12 +14,15 @@ namespace Bloom::DebugServer::Gdb
*/
struct RegisterDescriptor
{
GdbRegisterNumberType number;
GdbRegisterNumber number;
std::uint16_t size;
std::string name;
RegisterDescriptor(GdbRegisterNumberType number, std::uint16_t size, const std::string& name)
: number(number), size(size), name(name) {};
RegisterDescriptor(GdbRegisterNumber number, std::uint16_t size, const std::string& name)
: number(number)
, size(size)
, name(name)
{};
bool operator == (const RegisterDescriptor& other) const {
return this->number == other.number;

8
src/DebugServer/Gdb/TargetDescriptor.hpp
View File

@@ -59,7 +59,7 @@ namespace Bloom::DebugServer::Gdb
* @param registerDescriptor
* @return
*/
virtual std::optional<GdbRegisterNumberType> getRegisterNumberFromTargetRegisterDescriptor(
virtual std::optional<GdbRegisterNumber> getRegisterNumberFromTargetRegisterDescriptor(
const Targets::TargetRegisterDescriptor& registerDescriptor
) const = 0;
@@ -69,7 +69,7 @@ namespace Bloom::DebugServer::Gdb
* @param number
* @return
*/
virtual const RegisterDescriptor& getRegisterDescriptorFromNumber(GdbRegisterNumberType number) const = 0;
virtual const RegisterDescriptor& getRegisterDescriptorFromNumber(GdbRegisterNumber number) const = 0;
/**
* Should retrieve the mapped target register descriptor for a given GDB register number.
@@ -78,7 +78,7 @@ namespace Bloom::DebugServer::Gdb
* @return
*/
virtual const Targets::TargetRegisterDescriptor& getTargetRegisterDescriptorFromNumber(
GdbRegisterNumberType number
GdbRegisterNumber number
) const = 0;
/**
@@ -86,7 +86,7 @@ namespace Bloom::DebugServer::Gdb
*
* @return
*/
virtual const std::vector<GdbRegisterNumberType>& getRegisterNumbers() const = 0;
virtual const std::vector<GdbRegisterNumber>& getRegisterNumbers() const = 0;
private:
BiMap<Targets::TargetMemoryType, std::uint32_t> memoryOffsetsByType;

4
src/DebugToolDrivers/USB/HID/HidInterface.hpp
View File

@@ -68,9 +68,9 @@ namespace Bloom::Usb
std::string getHidDevicePath();
private:
using HidDeviceType = std::unique_ptr<::hid_device, decltype(&::hid_close)>;
using HidDevice = std::unique_ptr<::hid_device, decltype(&::hid_close)>;
HidDeviceType hidDevice = HidDeviceType(nullptr, ::hid_close);
HidDevice hidDevice = HidDevice(nullptr, ::hid_close);
/**
* All HID reports have a fixed report length. This means that every packet we send or receive to/from an HID

6
src/DebugToolDrivers/USB/UsbDevice.cpp
View File

@@ -80,12 +80,12 @@ namespace Bloom::Usb
::libusb_free_config_descriptor(configDescriptor);
}
std::vector<LibusbDeviceType> UsbDevice::findMatchingDevices(
std::vector<LibusbDevice> UsbDevice::findMatchingDevices(
std::uint16_t vendorId, std::uint16_t productId
) {
::libusb_device** devices = nullptr;
::libusb_device* device;
std::vector<LibusbDeviceType> matchedDevices;
std::vector<LibusbDevice> matchedDevices;
auto libusbStatusCode = ::libusb_get_device_list(UsbDevice::libusbContext.get(), &devices);
if (libusbStatusCode < 0) {
@@ -96,7 +96,7 @@ namespace Bloom::Usb
ssize_t i = 0;
while ((device = devices[i++]) != nullptr) {
auto libusbDevice = LibusbDeviceType(device, ::libusb_unref_device);
auto libusbDevice = LibusbDevice(device, ::libusb_unref_device);
struct ::libusb_device_descriptor desc = {};
if ((libusbStatusCode = ::libusb_get_device_descriptor(device, &desc)) < 0) {

14
src/DebugToolDrivers/USB/UsbDevice.hpp
View File

@@ -10,9 +10,9 @@
namespace Bloom::Usb
{
using LibusbContextType = std::unique_ptr<::libusb_context, decltype(&::libusb_exit)>;
using LibusbDeviceType = std::unique_ptr<::libusb_device, decltype(&::libusb_unref_device)>;
using LibusbDeviceHandleType = std::unique_ptr<::libusb_device_handle, decltype(&::libusb_close)>;
using LibusbContext = std::unique_ptr<::libusb_context, decltype(&::libusb_exit)>;
using LibusbDevice = std::unique_ptr<::libusb_device, decltype(&::libusb_unref_device)>;
using LibusbDeviceHandle = std::unique_ptr<::libusb_device_handle, decltype(&::libusb_close)>;
class UsbDevice
{
@@ -40,12 +40,12 @@ namespace Bloom::Usb
virtual ~UsbDevice();
protected:
static inline LibusbContextType libusbContext = LibusbContextType(nullptr, ::libusb_exit);
static inline LibusbContext libusbContext = LibusbContext(nullptr, ::libusb_exit);
LibusbDeviceType libusbDevice = LibusbDeviceType(nullptr, ::libusb_unref_device);
LibusbDeviceHandleType libusbDeviceHandle = LibusbDeviceHandleType(nullptr, ::libusb_close);
LibusbDevice libusbDevice = LibusbDevice(nullptr, ::libusb_unref_device);
LibusbDeviceHandle libusbDeviceHandle = LibusbDeviceHandle(nullptr, ::libusb_close);
std::vector<LibusbDeviceType> findMatchingDevices(std::uint16_t vendorId, std::uint16_t productId);
std::vector<LibusbDevice> findMatchingDevices(std::uint16_t vendorId, std::uint16_t productId);
void detachKernelDriverFromInterface(std::uint8_t interfaceNumber);

6
src/Helpers/Process.cpp
View File

@@ -47,15 +47,15 @@ namespace Bloom
return false;
}
Process::ProcT Process::getProcessInfo(::pid_t processId) {
Process::Proc Process::getProcessInfo(::pid_t processId) {
auto proc = std::unique_ptr<::PROCTAB, decltype(&::closeproc)>(
::openproc(PROC_FILLSTAT | PROC_FILLARG | PROC_PID, &processId),
::closeproc
);
auto processInfo = ProcT(::readproc(proc.get(), NULL), ::freeproc);
auto processInfo = Proc(::readproc(proc.get(), NULL), ::freeproc);
if (processInfo == NULL) {
return ProcT(nullptr, ::freeproc);
return Proc(nullptr, ::freeproc);
}
return processInfo;

4
src/Helpers/Process.hpp
View File

@@ -35,7 +35,7 @@ namespace Bloom
private:
using ProcT = std::unique_ptr<::proc_t, decltype(&::freeproc)>;
static ProcT getProcessInfo(::pid_t processId);
using Proc = std::unique_ptr<::proc_t, decltype(&::freeproc)>;
static Proc getProcessInfo(::pid_t processId);
};
}

2
src/Insight/InsightWorker/Tasks/RefreshTargetPinStates.hpp
View File

@@ -22,7 +22,7 @@ namespace Bloom
};
signals:
void targetPinStatesRetrieved(Bloom::Targets::TargetPinStateMappingType pinStatesByNumber);
void targetPinStatesRetrieved(Bloom::Targets::TargetPinStateMapping pinStatesByNumber);
protected:
void run(TargetController::TargetControllerConsole& targetControllerConsole) override;

2
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPackageWidget.cpp
View File

@@ -71,7 +71,7 @@ namespace Bloom::Widgets::InsightTargetWidgets
InsightWorker::queueTask(refreshTask);
}
void TargetPackageWidget::updatePinStates(const Targets::TargetPinStateMappingType& pinStatesByNumber) {
void TargetPackageWidget::updatePinStates(const Targets::TargetPinStateMapping& pinStatesByNumber) {
for (auto& pinWidget : this->pinWidgets) {
auto pinNumber = pinWidget->getPinNumber();
if (pinStatesByNumber.contains(pinNumber)) {

2
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPackageWidget.hpp
View File

@@ -41,7 +41,7 @@ namespace Bloom::Widgets::InsightTargetWidgets
Targets::TargetState targetState = Targets::TargetState::UNKNOWN;
virtual void updatePinStates(const Targets::TargetPinStateMappingType& pinStatesByNumber);
virtual void updatePinStates(const Targets::TargetPinStateMapping& pinStatesByNumber);
void onTargetStateChanged(Targets::TargetState newState);
void onProgrammingModeEnabled();
void onProgrammingModeDisabled();

4
src/TargetController/Responses/TargetPinStates.hpp
View File

@@ -11,9 +11,9 @@ namespace Bloom::TargetController::Responses
public:
static constexpr ResponseType type = ResponseType::TARGET_PIN_STATES;
Targets::TargetPinStateMappingType pinStatesByNumber;
Targets::TargetPinStateMapping pinStatesByNumber;
explicit TargetPinStates(const Targets::TargetPinStateMappingType& pinStatesByNumber)
explicit TargetPinStates(const Targets::TargetPinStateMapping& pinStatesByNumber)
: pinStatesByNumber(pinStatesByNumber)
{}

4
src/TargetController/TargetControllerConsole.cpp
View File

@@ -67,7 +67,7 @@ namespace Bloom::TargetController
using Targets::TargetPinDescriptor;
using Targets::TargetPinState;
using Targets::TargetPinStateMappingType;
using Targets::TargetPinStateMapping;
TargetControllerState TargetControllerConsole::getTargetControllerState() {
return this->commandManager.sendCommandAndWaitForResponse(
@@ -218,7 +218,7 @@ namespace Bloom::TargetController
);
}
TargetPinStateMappingType TargetControllerConsole::getPinStates(int variantId) {
TargetPinStateMapping TargetControllerConsole::getPinStates(int variantId) {
return this->commandManager.sendCommandAndWaitForResponse(
std::make_unique<GetTargetPinStates>(variantId),
this->defaultTimeout

2
src/TargetController/TargetControllerConsole.hpp
View File

@@ -171,7 +171,7 @@ namespace Bloom::TargetController
*
* @param variantId
*/
Targets::TargetPinStateMappingType getPinStates(int variantId);
Targets::TargetPinStateMapping getPinStates(int variantId);
/**
* Updates the pin state on the target, for a specific pin.

4
src/Targets/TargetPinDescriptor.hpp
View File

@@ -57,9 +57,9 @@ namespace Bloom::Targets
std::optional<IoDirection> ioDirection;
};
using TargetPinStateMappingType = std::map<int, Bloom::Targets::TargetPinState>;
using TargetPinStateMapping = std::map<int, Bloom::Targets::TargetPinState>;
}
Q_DECLARE_METATYPE(Bloom::Targets::TargetPinDescriptor)
Q_DECLARE_METATYPE(Bloom::Targets::TargetPinState)
Q_DECLARE_METATYPE(Bloom::Targets::TargetPinStateMappingType)
Q_DECLARE_METATYPE(Bloom::Targets::TargetPinStateMapping)