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

Moved TargetController components into new 'TargetController' namespace.

Browse Source
This commit is contained in:
Nav
2022-04-09 15:57:24 +01:00
parent 0a537dcf90
commit 8be1446e72
55 changed files with 134 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,8 @@
namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
{
using TargetController::TargetControllerConsole;
using ResponsePackets::ErrorResponsePacket;
using ResponsePackets::ResponsePacket;

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

@@ -31,6 +31,9 @@ namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
explicit ReadMemory(const RawPacketType& rawPacket);
void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole) override;
void handle(
DebugSession& debugSession,
TargetController::TargetControllerConsole& targetControllerConsole
) override;
};
}

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

@@ -8,6 +8,8 @@
namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
{
using TargetController::TargetControllerConsole;
using ResponsePackets::ErrorResponsePacket;
using ResponsePackets::OkResponsePacket;

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

@@ -31,6 +31,9 @@ namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
explicit WriteMemory(const RawPacketType& rawPacket);
void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole) override;
void handle(
DebugSession& debugSession,
TargetController::TargetControllerConsole& targetControllerConsole
) override;
};
}

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

@@ -13,6 +13,8 @@
namespace Bloom::DebugServer::Gdb::CommandPackets
{
using TargetController::TargetControllerConsole;
using ResponsePackets::ResponsePacket;
using ResponsePackets::OkResponsePacket;
using ResponsePackets::TargetStopped;

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

@@ -46,6 +46,9 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
*
* @param targetControllerConsole
*/
virtual void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole);
virtual void handle(
DebugSession& debugSession,
TargetController::TargetControllerConsole& targetControllerConsole
);
};
}

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

@@ -7,6 +7,8 @@
namespace Bloom::DebugServer::Gdb::CommandPackets
{
using TargetController::TargetControllerConsole;
using ResponsePackets::ErrorResponsePacket;
using Exceptions::Exception;

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

@@ -26,6 +26,9 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
explicit ContinueExecution(const RawPacketType& rawPacket);
void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole) override;
void handle(
DebugSession& debugSession,
TargetController::TargetControllerConsole& targetControllerConsole
) override;
};
}

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

@@ -9,6 +9,8 @@
namespace Bloom::DebugServer::Gdb::CommandPackets
{
using TargetController::TargetControllerConsole;
using ResponsePackets::TargetStopped;
using ResponsePackets::ErrorResponsePacket;
using Exceptions::Exception;

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

@@ -17,6 +17,9 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
public:
explicit InterruptExecution(const RawPacketType& rawPacket): CommandPacket(rawPacket) {}
void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole) override;
void handle(
DebugSession& debugSession,
TargetController::TargetControllerConsole& targetControllerConsole
) override;
};
}

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

@@ -6,6 +6,8 @@
namespace Bloom::DebugServer::Gdb::CommandPackets
{
using TargetController::TargetControllerConsole;
using ResponsePackets::EmptyResponsePacket;
Monitor::Monitor(const RawPacketType& rawPacket)

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

@@ -19,6 +19,9 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
explicit Monitor(const RawPacketType& rawPacket);
void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole) override;
void handle(
DebugSession& debugSession,
TargetController::TargetControllerConsole& targetControllerConsole
) override;
};
}

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

@@ -9,6 +9,8 @@
namespace Bloom::DebugServer::Gdb::CommandPackets
{
using TargetController::TargetControllerConsole;
using Targets::TargetRegister;
using Targets::TargetRegisterDescriptors;

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

@@ -27,6 +27,9 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
explicit ReadRegisters(const RawPacketType& rawPacket);
void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole) override;
void handle(
DebugSession& debugSession,
TargetController::TargetControllerConsole& targetControllerConsole
) override;
};
}

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

@@ -12,6 +12,8 @@
namespace Bloom::DebugServer::Gdb::CommandPackets
{
using TargetController::TargetControllerConsole;
using Targets::TargetBreakpoint;
using ResponsePackets::OkResponsePacket;

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

@@ -28,6 +28,9 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
explicit RemoveBreakpoint(const RawPacketType& rawPacket);
void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole) override;
void handle(
DebugSession& debugSession,
TargetController::TargetControllerConsole& targetControllerConsole
) override;
};
}

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

@@ -8,6 +8,8 @@
namespace Bloom::DebugServer::Gdb::CommandPackets
{
using TargetController::TargetControllerConsole;
using ResponsePackets::ErrorResponsePacket;
using ResponsePackets::ResponsePacket;

5
src/DebugServer/Gdb/CommandPackets/ResetTarget.hpp
View File

@@ -17,6 +17,9 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
public:
explicit ResetTarget(Monitor&& monitorPacket);
void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole) override;
void handle(
DebugSession& debugSession,
TargetController::TargetControllerConsole& targetControllerConsole
) override;
};
}

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

@@ -12,6 +12,8 @@
namespace Bloom::DebugServer::Gdb::CommandPackets
{
using TargetController::TargetControllerConsole;
using Targets::TargetBreakpoint;
using ResponsePackets::OkResponsePacket;

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

@@ -28,6 +28,9 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
explicit SetBreakpoint(const RawPacketType& rawPacket);
void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole) override;
void handle(
DebugSession& debugSession,
TargetController::TargetControllerConsole& targetControllerConsole
) override;
};
}

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

@@ -7,6 +7,8 @@
namespace Bloom::DebugServer::Gdb::CommandPackets
{
using TargetController::TargetControllerConsole;
using ResponsePackets::ErrorResponsePacket;
using Exceptions::Exception;

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

@@ -21,6 +21,9 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
explicit StepExecution(const RawPacketType& rawPacket);
void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole) override;
void handle(
DebugSession& debugSession,
TargetController::TargetControllerConsole& targetControllerConsole
) override;
};
}

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

@@ -13,6 +13,8 @@
namespace Bloom::DebugServer::Gdb::CommandPackets
{
using TargetController::TargetControllerConsole;
using ResponsePackets::SupportedFeaturesResponse;
using ResponsePackets::ErrorResponsePacket;

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

@@ -32,7 +32,10 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
return this->supportedFeatures;
}
void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole) override;
void handle(
DebugSession& debugSession,
TargetController::TargetControllerConsole& targetControllerConsole
) override;
private:
std::set<Feature> supportedFeatures;

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

@@ -11,6 +11,8 @@
namespace Bloom::DebugServer::Gdb::CommandPackets
{
using TargetController::TargetControllerConsole;
using Targets::TargetRegister;
using Targets::TargetRegisterDescriptors;

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

@@ -19,6 +19,9 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
explicit WriteRegister(const RawPacketType& rawPacket);
void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole) override;
void handle(
DebugSession& debugSession,
TargetController::TargetControllerConsole& targetControllerConsole
) override;
};
}

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

@@ -295,7 +295,10 @@ namespace Bloom::DebugServer::Gdb
}
void GdbRspDebugServer::onTargetControllerStateReported(const Events::TargetControllerStateReported& event) {
if (event.state == TargetControllerState::SUSPENDED && this->activeDebugSession.has_value()) {
if (
event.state == TargetController::TargetControllerState::SUSPENDED
&& this->activeDebugSession.has_value()
) {
Logger::warning("Terminating debug session - TargetController suspended unexpectedly");
this->terminateActiveDebugSession();
}

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

@@ -112,7 +112,9 @@ namespace Bloom::DebugServer::Gdb
*
* See documentation in src/DebugServer/Gdb/README.md for more on how GDB commands are processed.
*/
TargetControllerConsole targetControllerConsole = TargetControllerConsole(this->eventListener);
TargetController::TargetControllerConsole targetControllerConsole = TargetController::TargetControllerConsole(
this->eventListener
);
/**
* Listening socket address