HBLDR_DebugNextApplicationByForce changes
This commit is contained in:
parent
eef22f8701
commit
687dfddd9f
@ -80,5 +80,18 @@ Result HBLDR_PatchExHeaderInfo(ExHeader_Info *exheaderInfo)
|
|||||||
Result rc = svcSendSyncRequest(hbldrHandle);
|
Result rc = svcSendSyncRequest(hbldrHandle);
|
||||||
if (R_SUCCEEDED(rc)) rc = cmdbuf[1];
|
if (R_SUCCEEDED(rc)) rc = cmdbuf[1];
|
||||||
|
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
|
||||||
|
Result HBLDR_DebugNextApplicationByForce(bool dryRun)
|
||||||
|
{
|
||||||
|
u32* cmdbuf = getThreadCommandBuffer();
|
||||||
|
|
||||||
|
cmdbuf[0] = IPC_MakeHeader(5, 1, 0); // 0x50040
|
||||||
|
cmdbuf[1] = dryRun ? 1 : 0;
|
||||||
|
|
||||||
|
Result rc = svcSendSyncRequest(hbldrHandle);
|
||||||
|
if (R_SUCCEEDED(rc)) rc = cmdbuf[1];
|
||||||
|
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
@ -11,3 +11,4 @@ Result HBLDR_LoadProcess(Handle *outCodeSet, u32 textAddr, u32 kernelFlags, u64
|
|||||||
Result HBLDR_SetTarget(const char* path);
|
Result HBLDR_SetTarget(const char* path);
|
||||||
Result HBLDR_SetArgv(const void* buffer, size_t size);
|
Result HBLDR_SetArgv(const void* buffer, size_t size);
|
||||||
Result HBLDR_PatchExHeaderInfo(ExHeader_Info *exheaderInfo);
|
Result HBLDR_PatchExHeaderInfo(ExHeader_Info *exheaderInfo);
|
||||||
|
Result HBLDR_DebugNextApplicationByForce(bool dryRun);
|
||||||
|
@ -318,30 +318,33 @@ void HBLDR_HandleCommands(void *ctx)
|
|||||||
case 5: // DebugNextApplicationByForce
|
case 5: // DebugNextApplicationByForce
|
||||||
{
|
{
|
||||||
res = 0;
|
res = 0;
|
||||||
GDB_LockAllContexts(&gdbServer);
|
if (gdbServer.referenceCount == 0)
|
||||||
if (nextApplicationGdbCtx != NULL)
|
|
||||||
res = MAKERESULT(RL_PERMANENT, RS_NOP, RM_LDR, RD_ALREADY_DONE);
|
|
||||||
else if (gdbServer.referenceCount == 0)
|
|
||||||
res = MAKERESULT(RL_PERMANENT, RS_INVALIDSTATE, RM_LDR, RD_NOT_INITIALIZED);
|
res = MAKERESULT(RL_PERMANENT, RS_INVALIDSTATE, RM_LDR, RD_NOT_INITIALIZED);
|
||||||
else
|
else if (cmdbuf[1] == 0)
|
||||||
{
|
{
|
||||||
nextApplicationGdbCtx = GDB_SelectAvailableContext(&gdbServer, GDB_PORT_BASE + 3, GDB_PORT_BASE + 4);
|
GDB_LockAllContexts(&gdbServer);
|
||||||
if (nextApplicationGdbCtx != NULL)
|
if (nextApplicationGdbCtx != NULL)
|
||||||
{
|
res = MAKERESULT(RL_PERMANENT, RS_NOP, RM_LDR, RD_ALREADY_DONE);
|
||||||
nextApplicationGdbCtx->debug = 0;
|
|
||||||
nextApplicationGdbCtx->pid = 0xFFFFFFFF;
|
|
||||||
res = PMDBG_DebugNextApplicationByForce();
|
|
||||||
if (R_FAILED(res))
|
|
||||||
{
|
|
||||||
nextApplicationGdbCtx->flags = 0;
|
|
||||||
nextApplicationGdbCtx->localPort = 0;
|
|
||||||
nextApplicationGdbCtx = NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
res = MAKERESULT(RL_PERMANENT, RS_OUTOFRESOURCE, RM_LDR, RD_OUT_OF_RANGE);
|
{
|
||||||
|
nextApplicationGdbCtx = GDB_SelectAvailableContext(&gdbServer, GDB_PORT_BASE + 3, GDB_PORT_BASE + 4);
|
||||||
|
if (nextApplicationGdbCtx != NULL)
|
||||||
|
{
|
||||||
|
nextApplicationGdbCtx->debug = 0;
|
||||||
|
nextApplicationGdbCtx->pid = 0xFFFFFFFF;
|
||||||
|
res = PMDBG_DebugNextApplicationByForce();
|
||||||
|
if (R_FAILED(res))
|
||||||
|
{
|
||||||
|
nextApplicationGdbCtx->flags = 0;
|
||||||
|
nextApplicationGdbCtx->localPort = 0;
|
||||||
|
nextApplicationGdbCtx = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
res = MAKERESULT(RL_PERMANENT, RS_OUTOFRESOURCE, RM_LDR, RD_OUT_OF_RANGE);
|
||||||
|
}
|
||||||
|
GDB_UnlockAllContexts(&gdbServer);
|
||||||
}
|
}
|
||||||
GDB_UnlockAllContexts(&gdbServer);
|
|
||||||
cmdbuf[1] = res;
|
cmdbuf[1] = res;
|
||||||
cmdbuf[0] = IPC_MakeHeader(5, 1, 0);
|
cmdbuf[0] = IPC_MakeHeader(5, 1, 0);
|
||||||
break;
|
break;
|
||||||
|
@ -174,34 +174,37 @@ void DebuggerMenu_DebugNextApplicationByForce(void)
|
|||||||
Result res = 0;
|
Result res = 0;
|
||||||
char buf[256];
|
char buf[256];
|
||||||
|
|
||||||
GDB_LockAllContexts(&gdbServer);
|
if(initialized)
|
||||||
|
|
||||||
if (nextApplicationGdbCtx != NULL)
|
|
||||||
strcpy(buf, "Operation already performed.");
|
|
||||||
else if(initialized)
|
|
||||||
{
|
{
|
||||||
nextApplicationGdbCtx = GDB_SelectAvailableContext(&gdbServer, GDB_PORT_BASE + 3, GDB_PORT_BASE + 4);
|
GDB_LockAllContexts(&gdbServer);
|
||||||
|
|
||||||
if (nextApplicationGdbCtx != NULL)
|
if (nextApplicationGdbCtx != NULL)
|
||||||
{
|
strcpy(buf, "Operation already performed.");
|
||||||
nextApplicationGdbCtx->debug = 0;
|
|
||||||
nextApplicationGdbCtx->pid = 0xFFFFFFFF;
|
|
||||||
res = PMDBG_DebugNextApplicationByForce();
|
|
||||||
if(R_SUCCEEDED(res))
|
|
||||||
sprintf(buf, "Operation succeeded.\nUse port %d to connect to the next launched\napplication.", nextApplicationGdbCtx->localPort);
|
|
||||||
else
|
|
||||||
{
|
|
||||||
nextApplicationGdbCtx->flags = 0;
|
|
||||||
nextApplicationGdbCtx->localPort = 0;
|
|
||||||
nextApplicationGdbCtx = NULL;
|
|
||||||
sprintf(buf, "Operation failed (0x%08lx).", (u32)res);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
strcpy(buf, "Failed to allocate a slot.\nPlease unselect a process in the process list first");
|
{
|
||||||
|
nextApplicationGdbCtx = GDB_SelectAvailableContext(&gdbServer, GDB_PORT_BASE + 3, GDB_PORT_BASE + 4);
|
||||||
|
if (nextApplicationGdbCtx != NULL)
|
||||||
|
{
|
||||||
|
nextApplicationGdbCtx->debug = 0;
|
||||||
|
nextApplicationGdbCtx->pid = 0xFFFFFFFF;
|
||||||
|
res = PMDBG_DebugNextApplicationByForce();
|
||||||
|
if(R_SUCCEEDED(res))
|
||||||
|
sprintf(buf, "Operation succeeded.\nUse port %d to connect to the next launched\napplication.", nextApplicationGdbCtx->localPort);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
nextApplicationGdbCtx->flags = 0;
|
||||||
|
nextApplicationGdbCtx->localPort = 0;
|
||||||
|
nextApplicationGdbCtx = NULL;
|
||||||
|
sprintf(buf, "Operation failed (0x%08lx).", (u32)res);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
strcpy(buf, "Failed to allocate a slot.\nPlease unselect a process in the process list first");
|
||||||
|
}
|
||||||
|
GDB_UnlockAllContexts(&gdbServer);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
strcpy(buf, "Debugger not enabled.");
|
strcpy(buf, "Debugger not enabled.");
|
||||||
GDB_UnlockAllContexts(&gdbServer);
|
|
||||||
|
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user