From patchwork Wed Apr 20 06:49:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1619329 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=QAjvw12T; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=pdbg-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KjrsY4STnz9sG0 for ; Wed, 20 Apr 2022 16:50:41 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4KjrsY3hgkz301s for ; Wed, 20 Apr 2022 16:50:41 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=QAjvw12T; dkim-atps=neutral X-Original-To: pdbg@lists.ozlabs.org Delivered-To: pdbg@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::52b; helo=mail-pg1-x52b.google.com; envelope-from=npiggin@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=QAjvw12T; dkim-atps=neutral Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4KjrsN5zCMz2xnM for ; Wed, 20 Apr 2022 16:50:32 +1000 (AEST) Received: by mail-pg1-x52b.google.com with SMTP id x191so792681pgd.4 for ; Tue, 19 Apr 2022 23:50:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zXXHY8iTAKWb6/xj9B8LUfS10em3CNeE5Cfh9LxKrmg=; b=QAjvw12TWC2piKi0m0b3VZN+ncLh3kFaJWSuE24/wfDv66DXNWoC4E6F1zMVLTnNUU XZ2FLdVDbBQIOKD2CQNCtUVX+6xCdEAt+EBqo9hEks3o/U4zCFgRjC5ZWgIJU+Sl2RpE TP4O8M6NZ0wE4WMM4FYywT8DvjXl+9u4/RQ1qSOCoCB48lXoP3NC57x7ZqmXCtPS062b /YKua8OBXE6LE94KsOOK5um7GY4ENtZpl5mZqCO7KTkxTgChmiX84QLs62L3FZ6bQ9aF 2hoCC2HMg1UD2i1SEiuMdQWh9NjXwseCqBW9JTRAKw328XSPQk6kkto3B1loCPlLFdeD AX5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zXXHY8iTAKWb6/xj9B8LUfS10em3CNeE5Cfh9LxKrmg=; b=sqUrZWRUpbDZ7fuVGv+9t6qGR8l7EA4lwJQmKw0uNl1UGPbhlZWWSbCY9s6hAWNFmD suExFoOczets57dImZrbogFzNkjNzWXN9qY5nkPUhOQMTvShSlbVd+5nq/vv8YH8rZj8 VBmdRRd8jKXDMYLkkFLGpd2CZxRIXifaM4wVa6RL5cNEt9MLEWMCA2ugTJyb6qsbamg9 vfUvrr7RzHCYkfgFnW3nA+0MGcB4i5+gm52hMUwWagIaPG49NI57yn2r+yIIzaA4KDHl iorVvOcYZwmmujgHi0c5UGQTPjPxbnMQJFHL7koyWzPGKn6Ca/2o0m1WDJkru6SSyjfB MTaQ== X-Gm-Message-State: AOAM531fD6egHRf61he1aSQP6dYMhMNcxoC7DR3NZwYqHIAzp+hjlpEl kYgAH5rLpKJ0wlSvXDFXzVpqSx1s9G7/eg== X-Google-Smtp-Source: ABdhPJxJetjpHIVNS2lisYjS9xu7OJu19RVz0AcCJRUHKyNDHj4PXbaDLfgzIbNIvsIQRcXTmGn7Vg== X-Received: by 2002:a65:6e9a:0:b0:382:1804:35c8 with SMTP id bm26-20020a656e9a000000b00382180435c8mr18233668pgb.584.1650437430111; Tue, 19 Apr 2022 23:50:30 -0700 (PDT) Received: from bobo.ozlabs.ibm.com ([203.221.203.144]) by smtp.gmail.com with ESMTPSA id x20-20020aa79574000000b005061f4782c5sm18481235pfq.183.2022.04.19.23.50.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Apr 2022 23:50:29 -0700 (PDT) From: Nicholas Piggin To: pdbg@lists.ozlabs.org Date: Wed, 20 Apr 2022 16:49:37 +1000 Message-Id: <20220420065013.222816-4-npiggin@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220420065013.222816-1-npiggin@gmail.com> References: <20220420065013.222816-1-npiggin@gmail.com> MIME-Version: 1.0 Subject: [Pdbg] [PATCH v2 03/39] gdbserver: rename detach command handler X-BeenThere: pdbg@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "mailing list for https://github.com/open-power/pdbg development" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nicholas Piggin Errors-To: pdbg-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Pdbg" The detach command handler should not be named disconnect, because that is a different concept in gdb (disconnect leaves the target in the same state, detach ends the debugging session). Signed-off-by: Nicholas Piggin --- src/gdb_parser.rl | 4 ++-- src/gdb_parser_precompile.c | 2 +- src/pdbgproxy.c | 6 +++--- src/pdbgproxy.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gdb_parser.rl b/src/gdb_parser.rl index 6259b965..93213e4f 100644 --- a/src/gdb_parser.rl +++ b/src/gdb_parser.rl @@ -76,7 +76,7 @@ set_thread = ('H' any* @{cmd = SET_THREAD;}); - disconnect = ('D' @{cmd = DISCONNECT;} + detach = ('D' @{cmd = DETACH;} xdigit+ $hex_digit %push); # TODO: We don't actually listen to what's supported @@ -94,7 +94,7 @@ commands = (get_mem | get_gprs | get_spr | stop_reason | set_thread | q_attached | q_C | q_supported | qf_threadinfo | q_C | - v_contq | v_contc | v_conts | put_mem | disconnect ); + v_contq | v_contc | v_conts | put_mem | detach ); cmd = ((commands & ^'#'*) | ^'#'*) $crc ('#' xdigit{2} $hex_digit @end); diff --git a/src/gdb_parser_precompile.c b/src/gdb_parser_precompile.c index 6012a271..e0df0051 100644 --- a/src/gdb_parser_precompile.c +++ b/src/gdb_parser_precompile.c @@ -351,7 +351,7 @@ _match: break; case 11: #line 79 "src/gdb_parser.rl" - {cmd = DISCONNECT;} + {cmd = DETACH;} break; case 12: #line 83 "src/gdb_parser.rl" diff --git a/src/pdbgproxy.c b/src/pdbgproxy.c index bb7c7b35..3e27ba02 100644 --- a/src/pdbgproxy.c +++ b/src/pdbgproxy.c @@ -95,9 +95,9 @@ static void stop_reason(uint64_t *stack, void *priv) send_response(fd, TRAP); } -static void disconnect(uint64_t *stack, void *priv) +static void detach(uint64_t *stack, void *priv) { - PR_INFO("Terminating connection with client. pid %16" PRIi64 "\n", stack[0]); + PR_INFO("Detach debug session with client. pid %16" PRIi64 "\n", stack[0]); send_response(fd, OK); } @@ -416,7 +416,7 @@ command_cb callbacks[LAST_CMD + 1] = { v_conts, put_mem, interrupt, - disconnect, + detach, NULL}; int gdbserver_start(struct pdbg_target *thread, struct pdbg_target *adu, uint16_t port) diff --git a/src/pdbgproxy.h b/src/pdbgproxy.h index 1fe67f2c..1910fdba 100644 --- a/src/pdbgproxy.h +++ b/src/pdbgproxy.h @@ -3,7 +3,7 @@ enum gdb_command {NONE, GET_GPRS, GET_SPR, GET_MEM, STOP_REASON, SET_THREAD, V_CONTC, V_CONTS, - PUT_MEM, INTERRUPT, DISCONNECT, LAST_CMD}; + PUT_MEM, INTERRUPT, DETACH, LAST_CMD}; typedef void (*command_cb)(uint64_t *stack, void *priv); void parser_init(command_cb *callbacks);