portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WinKD: Avoid unnecessary re-syncing

Browse source
This commit is contained in:
GustavoLCR 2022-04-29 20:17:37 -03:00 committed by Anton Kochkov
parent c2d36fa024
commit 10cfd66598
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
librz/debug/p/debug_winkd.c
View file

@ -89,9 +89,13 @@ static int rz_debug_winkd_attach(RzDebug *dbg, int pid) {
kdctx = (KdCtx *)desc->data;
// Handshake
if (!winkd_sync(kdctx)) {
int ret = winkd_sync(kdctx);
if (ret < 0) {
RZ_LOG_ERROR("Could not connect to winkd\n");
return false;
} else if (!ret) {
RZ_LOG_VERBOSE("Already synced\n");
return true;
}
if (!winkd_read_ver(kdctx)) {
return false;
@ -104,6 +108,7 @@ static int rz_debug_winkd_attach(RzDebug *dbg, int pid) {
static int rz_debug_winkd_detach(RzDebug *dbg, int pid) {
eprintf("Detaching...\n");
kdctx->syncd = 0;
return true;
}

10
subprojects/rzwinkd/winkd.c
View file

@ -923,11 +923,11 @@ int winkd_sync(KdCtx *ctx) {
kd_packet_t *s;
if (!ctx || !ctx->desc) {
return 0;
return -1;
}
if (ctx->syncd) {
return 1;
return 0;
}
winkd_lock_enter(ctx);
@ -937,14 +937,13 @@ int winkd_sync(KdCtx *ctx) {
// The first packet will always be type of KD_PACKET_TYPE_UNUSED
ret = kd_read_packet(ctx->desc, &s);
if (ret != KD_E_OK) {
ret = 0;
goto end;
}
}
// Send the breakin packet
if (iob_write(ctx->desc, (const uint8_t *)"b", 1) != 1) {
ret = 0;
ret = KD_E_IOERR;
goto end;
}
@ -952,14 +951,12 @@ int winkd_sync(KdCtx *ctx) {
// Reset the host
ret = kd_send_ctrl_packet(ctx->desc, KD_PACKET_TYPE_RESET, 0);
if (ret != KD_E_OK) {
ret = 0;
goto end;
}
// Wait for the response
ret = winkd_wait_packet(ctx, KD_PACKET_TYPE_RESET, NULL);
if (ret != KD_E_OK) {
ret = 0;
goto end;
}
}
@ -967,7 +964,6 @@ int winkd_sync(KdCtx *ctx) {
// Syncronize with the first KD_PACKET_TYPE_STATE_CHANGE64 packet
ret = winkd_wait_packet(ctx, KD_PACKET_TYPE_STATE_CHANGE64, &s);
if (ret != KD_E_OK) {
ret = 0;
goto end;
}