LowLevel/Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

fix gdb control C regression

Browse Source
This commit is contained in:
TuxSH 2019-04-21 18:00:29 +02:00
parent 4285736286
commit 5d3585a33d
3 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sysmodules/rosalina/source/gdb.c
View File

@ -143,9 +143,6 @@ void GDB_DetachFromProcess(GDBContext *ctx)
memset(ctx->threadListData, 0, sizeof(ctx->threadListData)); memset(ctx->threadListData, 0, sizeof(ctx->threadListData));
ctx->threadListDataPos = 0; ctx->threadListDataPos = 0;
svcClearEvent(ctx->processAttachedEvent);
ctx->eventToWaitFor = ctx->processAttachedEvent;
//svcSignalEvent(server->statusUpdated); //svcSignalEvent(server->statusUpdated);
/* /*
@ -184,8 +181,6 @@ void GDB_DetachFromProcess(GDBContext *ctx)
ctx->currentHioRequestTargetAddr = 0; ctx->currentHioRequestTargetAddr = 0;
memset(&ctx->currentHioRequest, 0, sizeof(PackedGdbHioRequest)); memset(&ctx->currentHioRequest, 0, sizeof(PackedGdbHioRequest));
ctx->state = GDB_STATE_CONNECTED;
} }
Result GDB_CreateProcess(GDBContext *ctx, const FS_ProgramInfo *progInfo, u32 launchFlags) Result GDB_CreateProcess(GDBContext *ctx, const FS_ProgramInfo *progInfo, u32 launchFlags)

3
sysmodules/rosalina/source/gdb/debug.c
View File

@ -45,6 +45,9 @@ static void GDB_DetachImmediatelyExtended(GDBContext *ctx)
RecursiveLock_Lock(&ctx->lock); RecursiveLock_Lock(&ctx->lock);
ctx->state = GDB_STATE_DETACHING; ctx->state = GDB_STATE_DETACHING;
svcClearEvent(ctx->processAttachedEvent);
ctx->eventToWaitFor = ctx->processAttachedEvent;
svcClearEvent(ctx->parent->statusUpdateReceived); svcClearEvent(ctx->parent->statusUpdateReceived);
svcSignalEvent(ctx->parent->statusUpdated); svcSignalEvent(ctx->parent->statusUpdated);
RecursiveLock_Unlock(&ctx->lock); RecursiveLock_Unlock(&ctx->lock);

44
sysmodules/rosalina/source/gdb/server.c
View File

@ -192,6 +192,8 @@ int GDB_AcceptClient(GDBContext *ctx)
int GDB_CloseClient(GDBContext *ctx) int GDB_CloseClient(GDBContext *ctx)
{ {
RecursiveLock_Lock(&ctx->lock); RecursiveLock_Lock(&ctx->lock);
svcClearEvent(ctx->processAttachedEvent);
ctx->eventToWaitFor = ctx->processAttachedEvent;
svcClearEvent(ctx->parent->statusUpdateReceived); svcClearEvent(ctx->parent->statusUpdateReceived);
svcSignalEvent(ctx->parent->statusUpdated); // note: monitor will be waiting for lock svcSignalEvent(ctx->parent->statusUpdated); // note: monitor will be waiting for lock
RecursiveLock_Unlock(&ctx->lock); RecursiveLock_Unlock(&ctx->lock);
@ -199,8 +201,20 @@ int GDB_CloseClient(GDBContext *ctx)
svcWaitSynchronization(ctx->parent->statusUpdateReceived, -1LL); svcWaitSynchronization(ctx->parent->statusUpdateReceived, -1LL);
RecursiveLock_Lock(&ctx->lock); RecursiveLock_Lock(&ctx->lock);
if (ctx->state >= GDB_STATE_ATTACHED)
GDB_DetachFromProcess(ctx); GDB_DetachFromProcess(ctx);
ctx->localPort = 0;
ctx->enableExternalMemoryAccess = false;
ctx->flags = 0;
ctx->state = GDB_STATE_DISCONNECTED; ctx->state = GDB_STATE_DISCONNECTED;
ctx->catchThreadEvents = false;
memset(&ctx->latestDebugEvent, 0, sizeof(DebugEventInfo));
memset(ctx->memoryOsInfoXmlData, 0, sizeof(ctx->memoryOsInfoXmlData));
memset(ctx->processesOsInfoXmlData, 0, sizeof(ctx->processesOsInfoXmlData));
RecursiveLock_Unlock(&ctx->lock); RecursiveLock_Unlock(&ctx->lock);
return 0; return 0;
} }
@ -260,19 +274,7 @@ GDBContext *GDB_GetClient(GDBServer *server, u16 port)
void GDB_ReleaseClient(GDBServer *server, GDBContext *ctx) void GDB_ReleaseClient(GDBServer *server, GDBContext *ctx)
{ {
(void)server; (void)server;
RecursiveLock_Lock(&ctx->lock); (void)ctx;
ctx->localPort = 0;
ctx->enableExternalMemoryAccess = false;
ctx->flags = 0;
ctx->state = GDB_STATE_DISCONNECTED;
ctx->catchThreadEvents = false;
memset(&ctx->latestDebugEvent, 0, sizeof(DebugEventInfo));
memset(ctx->memoryOsInfoXmlData, 0, sizeof(ctx->memoryOsInfoXmlData));
memset(ctx->processesOsInfoXmlData, 0, sizeof(ctx->processesOsInfoXmlData));
RecursiveLock_Unlock(&ctx->lock);
} }
static const struct static const struct
@ -344,9 +346,20 @@ int GDB_DoPacket(GDBContext *ctx)
else else
ret = 0; ret = 0;
RecursiveLock_Unlock(&ctx->lock);
if(ctx->state == GDB_STATE_DETACHING) if(ctx->state == GDB_STATE_DETACHING)
return (ctx->flags & GDB_FLAG_EXTENDED_REMOTE) ? ret : -1; {
if(ctx->flags & GDB_FLAG_EXTENDED_REMOTE)
{
ctx->state = GDB_STATE_CONNECTED;
RecursiveLock_Unlock(&ctx->lock);
return ret;
}
else
{
RecursiveLock_Unlock(&ctx->lock);
return -1;
}
}
if((oldFlags & GDB_FLAG_PROCESS_CONTINUING) && !(ctx->flags & GDB_FLAG_PROCESS_CONTINUING)) if((oldFlags & GDB_FLAG_PROCESS_CONTINUING) && !(ctx->flags & GDB_FLAG_PROCESS_CONTINUING))
{ {
@ -356,5 +369,6 @@ int GDB_DoPacket(GDBContext *ctx)
else if(!(oldFlags & GDB_FLAG_PROCESS_CONTINUING) && (ctx->flags & GDB_FLAG_PROCESS_CONTINUING)) else if(!(oldFlags & GDB_FLAG_PROCESS_CONTINUING) && (ctx->flags & GDB_FLAG_PROCESS_CONTINUING))
svcSignalEvent(ctx->continuedEvent); svcSignalEvent(ctx->continuedEvent);
RecursiveLock_Unlock(&ctx->lock);
return ret; return ret;
} }