nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2025-01-03 11:11:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

thermosphere: gdb: fix a few bugs

Browse source
This commit is contained in:
TuxSH 2020-02-01 14:25:12 +00:00
parent 86eaa7777b
commit eff433f62c
5 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
thermosphere/src/debug_manager.c
View file

@ -79,7 +79,7 @@ void debugManagerInit(TransportInterfaceType gdbIfaceType, u32 gdbIfaceId, u32 g
{ {
memset(&g_debugManager, 0, sizeof(DebugManager)); memset(&g_debugManager, 0, sizeof(DebugManager));
GDB_InitializeContext(&g_gdbContext, gdbIfaceType, gdbIfaceId, gdbIfaceFlags); GDB_InitializeContext(&g_gdbContext, gdbIfaceType, gdbIfaceId, gdbIfaceFlags);
GDB_MigrateRxIrq(&g_gdbContext, BIT(currentCoreCtx->coreId)); GDB_MigrateRxIrq(&g_gdbContext, currentCoreCtx->coreId);
} }
bool debugManagerHandlePause(void) bool debugManagerHandlePause(void)

4
thermosphere/src/gdb/context.c
View file

@ -234,9 +234,9 @@ void GDB_ReleaseContext(GDBContext *ctx)
transportInterfaceRelease(ctx->transportInterface); transportInterfaceRelease(ctx->transportInterface);
} }
void GDB_MigrateRxIrq(GDBContext *ctx, u32 newAffinity) void GDB_MigrateRxIrq(GDBContext *ctx, u32 coreId)
{ {
transportInterfaceSetInterruptAffinity(ctx->transportInterface, newAffinity); transportInterfaceSetInterruptAffinity(ctx->transportInterface, BIT(coreId));
} }
GDB_DECLARE_HANDLER(Unsupported) GDB_DECLARE_HANDLER(Unsupported)

2
thermosphere/src/gdb/context.h
View file

@ -106,7 +106,7 @@ void GDB_DetachFromContext(GDBContext *ctx);
void GDB_AcquireContext(GDBContext *ctx); void GDB_AcquireContext(GDBContext *ctx);
void GDB_ReleaseContext(GDBContext *ctx); void GDB_ReleaseContext(GDBContext *ctx);
void GDB_MigrateRxIrq(GDBContext *ctx, u32 newAffinity); void GDB_MigrateRxIrq(GDBContext *ctx, u32 coreId);
GDB_DECLARE_HANDLER(Unsupported); GDB_DECLARE_HANDLER(Unsupported);
GDB_DECLARE_HANDLER(EnableExtendedMode); GDB_DECLARE_HANDLER(EnableExtendedMode);

2
thermosphere/src/gdb/debug.c
View file

@ -41,7 +41,7 @@ static bool GDB_PreprocessDebugEvent(GDBContext *ctx, DebugEventInfo *info)
u32 newLst = ctx->attachedCoreList & ~BIT(info->coreId); u32 newLst = ctx->attachedCoreList & ~BIT(info->coreId);
if (ctx->selectedThreadId == info->coreId && newLst != 0) { if (ctx->selectedThreadId == info->coreId && newLst != 0) {
ctx->selectedThreadId = __builtin_ctz(newLst); ctx->selectedThreadId = __builtin_ctz(newLst);
GDB_MigrateRxIrq(ctx, BIT(ctx->selectedThreadId)); GDB_MigrateRxIrq(ctx, ctx->selectedThreadId);
} }
ctx->attachedCoreList = newLst; ctx->attachedCoreList = newLst;
shouldSignal = ctx->catchThreadEvents || newLst == 0; shouldSignal = ctx->catchThreadEvents || newLst == 0;

16
thermosphere/src/gdb/net.c
View file

@ -166,9 +166,14 @@ int GDB_ReceivePacket(GDBContext *ctx)
} }
switch (hdr) { switch (hdr) {
case '+': case '+': {
// Ack, don't do anything else (if allowed) // Ack, don't do anything else except maybe NoAckMode state transition
if (ctx->noAckSent) {
ctx->flags |= GDB_FLAG_NOACK;
ctx->noAckSent = false;
}
return 0; return 0;
}
case '-': case '-':
// Nack, return the previous packet // Nack, return the previous packet
transportInterfaceWriteData(iface, ctx->buffer, ctx->lastSentPacketSize); transportInterfaceWriteData(iface, ctx->buffer, ctx->lastSentPacketSize);
@ -231,14 +236,11 @@ int GDB_ReceivePacket(GDBContext *ctx)
ctx->state = GDB_STATE_ATTACHED; ctx->state = GDB_STATE_ATTACHED;
} }
if (ctx->noAckSent) {
ctx->flags |= GDB_FLAG_NOACK;
ctx->noAckSent = false;
}
// Set helper attributes, change '#' to NUL // Set helper attributes, change '#' to NUL
ctx->commandData = ctx->buffer + 2;
ctx->commandEnd = ctx->buffer + delimPos; ctx->commandEnd = ctx->buffer + delimPos;
ctx->buffer[delimPos] = '\0'; ctx->buffer[delimPos] = '\0';
DEBUG("Packet: %s\n", ctx->buffer + 1);
return (int)(delimPos + 2); return (int)(delimPos + 2);
} }