From patchwork Mon Feb 12 14:40:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandra Petlanova Hajkova X-Patchwork-Id: 85599 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E24333858C30 for ; Mon, 12 Feb 2024 14:40:51 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 14AC73858D37 for ; Mon, 12 Feb 2024 14:40:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 14AC73858D37 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 14AC73858D37 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707748821; cv=none; b=OijhhnOpkg8rhXPYEp05TrmMGXDu+snizbs6O5BLl57mjjcGkHI9NvrLci0KTjEETZM+Y8uk4YheC/dbzdSXQuuvWOCPl0IwpOtkz3WUZFUjWPDuRThLA7L4pbkC786ksUIc1z1avM2R6jYfxUR7KB2wandCnFCaK3QY9jd1TLw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707748821; c=relaxed/simple; bh=hyJfy1sdOmYpFiYMG4ZuUt5JocJoMqrpaH+TiPphqDU=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Xb9A0iOYCE6ytrSE5vhcMiyIMtX/S6xskaK7yDkBp2ahpLJ8vTvVEnlFE0PfLtrpndj/XfziPy0xihhsu2I3K1g7GCdfEdW3UZ8GI5aKYBcw/jzy3TYpwKOJKOuqc/GpIhQ6vYB/NdKzC2mbhLqCXwi9pwscuKc5cbayaMV3mjE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707748818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b05CzKu/xHe+YehuA8YQzJNBozIfxsOwn/WEMF4/fkY=; b=TJJj2LmSseZ5vLXUPX06/fPp2VAdfL0kQW5xBx0GDp6IzvDv9ffsddO88j07Lsgz73Xub0 TMwuFHdcInVHyc3+yWVMt6K/kcqzOq7IywWXlPGfcK752zZ9++sXT8MoAndRgEwfqD8uV8 k0WFI6gdhK7n16c5wcFeiuKRmsEcwMo= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-633-xSEPXRWjOzehF4tZYBWvpw-1; Mon, 12 Feb 2024 09:40:17 -0500 X-MC-Unique: xSEPXRWjOzehF4tZYBWvpw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3DEF61C41A02 for ; Mon, 12 Feb 2024 14:40:17 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.242.15]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9A3B111215 for ; Mon, 12 Feb 2024 14:40:16 +0000 (UTC) From: =?utf-8?q?Alexandra_H=C3=A1jkov=C3=A1?= To: gdb-patches@sourceware.org Subject: [PATCH 1/2] remote.c: Use packet_check_result Date: Mon, 12 Feb 2024 15:40:12 +0100 Message-ID: <20240212144014.438615-1-ahajkova@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org when processing the GDBserver reply to qRcmd packet. Print error message or the error code. Currently, when qRcmd request returns an error, GDB just prints: Protocol error with Rcmd After this change, GDB will also print the error code: Protocol error with Rcmd: 01. Add an accept_msg argument to packet_check result. qRcmd request (such as many other packets) does not recognise "E.msg" form as an error right now. We want to recognise "E.msg" as an error response only for the packets where it's documented. --- gdb/remote.c | 65 ++++++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/gdb/remote.c b/gdb/remote.c index 14c8b020b1e..8caee0dcff9 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -2455,7 +2455,7 @@ add_packet_config_cmd (const unsigned int which_packet, const char *name, structure which contains the packet_status enum and an error message for the PACKET_ERROR case. */ static packet_result -packet_check_result (const char *buf) +packet_check_result (const char *buf, bool accept_msg) { if (buf[0] != '\0') { @@ -2467,14 +2467,20 @@ packet_check_result (const char *buf) /* "Enn" - definitely an error. */ return { PACKET_ERROR, buf + 1 }; - /* Always treat "E." as an error. This will be used for - more verbose error messages, such as E.memtypes. */ - if (buf[0] == 'E' && buf[1] == '.') + /* Not every request accepts an error in a E.msg form. + Some packets accepts only Enn, in this case E. is not + defined and E. is treated as PACKET_OK. */ + if (accept_msg) { - if (buf[2] != '\0') - return { PACKET_ERROR, buf + 2 }; - else - return { PACKET_ERROR, "no error provided" }; + /* Always treat "E." as an error. This will be used for + more verbose error messages, such as E.memtypes. */ + if (buf[0] == 'E' && buf[1] == '.') + { + if (buf[2] != '\0') + return { PACKET_ERROR, buf + 2 }; + else + return { PACKET_ERROR, "no error provided" }; + } } /* The packet may or may not be OK. Just assume it is. */ @@ -2488,9 +2494,9 @@ packet_check_result (const char *buf) } static packet_result -packet_check_result (const gdb::char_vector &buf) +packet_check_result (const gdb::char_vector &buf, bool accept_msg) { - return packet_check_result (buf.data ()); + return packet_check_result (buf.data (), accept_msg); } packet_status @@ -2503,7 +2509,7 @@ remote_features::packet_ok (const char *buf, const int which_packet) && config->support == PACKET_DISABLE) internal_error (_("packet_ok: attempt to use a disabled packet")); - packet_result result = packet_check_result (buf); + packet_result result = packet_check_result (buf, true); switch (result.status ()) { case PACKET_OK: @@ -8831,7 +8837,7 @@ remote_target::send_g_packet () xsnprintf (rs->buf.data (), get_remote_packet_size (), "g"); putpkt (rs->buf); getpkt (&rs->buf); - packet_result result = packet_check_result (rs->buf); + packet_result result = packet_check_result (rs->buf, true); if (result.status () == PACKET_ERROR) error (_("Could not read registers; remote failure reply '%s'"), result.err_msg ()); @@ -9140,7 +9146,7 @@ remote_target::store_registers_using_G (const struct regcache *regcache) bin2hex (regs, p, rsa->sizeof_g_packet); putpkt (rs->buf); getpkt (&rs->buf); - packet_result pkt_status = packet_check_result (rs->buf); + packet_result pkt_status = packet_check_result (rs->buf, true); if (pkt_status.status () == PACKET_ERROR) error (_("Could not write registers; remote failure reply '%s'"), pkt_status.err_msg ()); @@ -9748,7 +9754,7 @@ remote_target::remote_send_printf (const char *format, ...) rs->buf[0] = '\0'; getpkt (&rs->buf); - return packet_check_result (rs->buf).status (); + return packet_check_result (rs->buf, true).status (); } /* Flash writing can take quite some time. We'll set @@ -11931,20 +11937,19 @@ remote_target::rcmd (const char *command, struct ui_file *outbuf) continue; } buf = rs->buf.data (); - if (buf[0] == '\0') - error (_("Target does not support this command.")); if (buf[0] == 'O' && buf[1] != 'K') { remote_console_output (buf + 1); /* 'O' message from stub. */ continue; } - if (strcmp (buf, "OK") == 0) + packet_result result = packet_check_result (buf, true); + if (result.status () == PACKET_OK) break; - if (strlen (buf) == 3 && buf[0] == 'E' - && isxdigit (buf[1]) && isxdigit (buf[2])) - { - error (_("Protocol error with Rcmd")); - } + else if (result.status () == PACKET_UNKNOWN) + error (_("Target does not support this command.")); + else + error (_("Protocol error with Rcmd: %s."), result.err_msg ()); + for (p = buf; p[0] != '\0' && p[1] != '\0'; p += 2) { char c = (fromhex (p[0]) << 4) + fromhex (p[1]); @@ -15571,7 +15576,7 @@ remote_target::store_memtags (CORE_ADDR address, size_t len, getpkt (&rs->buf); /* Verify if the request was successful. */ - return packet_check_result (rs->buf).status () == PACKET_OK; + return (packet_check_result (rs->buf, true).status () == PACKET_OK); } /* Return true if remote target T is non-stop. */ @@ -15672,26 +15677,26 @@ static void test_packet_check_result () { std::string buf = "E.msg"; - packet_result result = packet_check_result (buf.data ()); + packet_result result = packet_check_result (buf.data (), true); SELF_CHECK (result.status () == PACKET_ERROR); SELF_CHECK (strcmp(result.err_msg (), "msg") == 0); - result = packet_check_result ("E01"); + result = packet_check_result ("E01", true); SELF_CHECK (result.status () == PACKET_ERROR); SELF_CHECK (strcmp(result.err_msg (), "01") == 0); - SELF_CHECK (packet_check_result ("E1").status () == PACKET_OK); + SELF_CHECK (packet_check_result ("E1", true).status () == PACKET_OK); - SELF_CHECK (packet_check_result ("E000").status () == PACKET_OK); + SELF_CHECK (packet_check_result ("E000", true).status () == PACKET_OK); - result = packet_check_result ("E."); + result = packet_check_result ("E.", true); SELF_CHECK (result.status () == PACKET_ERROR); SELF_CHECK (strcmp(result.err_msg (), "no error provided") == 0); - SELF_CHECK (packet_check_result ("some response").status () == PACKET_OK); + SELF_CHECK (packet_check_result ("some response", true).status () == PACKET_OK); - SELF_CHECK (packet_check_result ("").status () == PACKET_UNKNOWN); + SELF_CHECK (packet_check_result ("", true).status () == PACKET_UNKNOWN); } } // namespace selftests #endif /* GDB_SELF_TEST */