From patchwork Wed Apr 20 06:49:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1619330 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=XsEVAW8O; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=pdbg-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (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 4KjrsZ59HSz9sG0 for ; Wed, 20 Apr 2022 16:50:42 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4KjrsZ3mXjz3bWD for ; Wed, 20 Apr 2022 16:50:42 +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=XsEVAW8O; 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::1033; helo=mail-pj1-x1033.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=XsEVAW8O; dkim-atps=neutral Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) (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 4KjrsR0mTcz2xnM for ; Wed, 20 Apr 2022 16:50:35 +1000 (AEST) Received: by mail-pj1-x1033.google.com with SMTP id z6-20020a17090a398600b001cb9fca3210so1162693pjb.1 for ; Tue, 19 Apr 2022 23:50:34 -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=AfvageHOrOHXM0EVXmYBSZjTGFGynVqeucPTabsnhyY=; b=XsEVAW8OlhjnzkvKkHSgqq8ydF/+WWpmy6I9sC0sPIh7SjAomGYVK1Wg6/MEt1VwOa 7NS6705GRCuuof7Pg7+BQHj2oVvVkga7WtWRnbLGC+5qs2mp2lWYdmHpbyDKb1ElAb27 gG1oRQuy4moo2RUXrBzRYcwghkqIFg0oyw2UuWERRHvuT3fIqBP+HhlgdBbgcYHlknxu oRHmlzF6TuWygDkxSIQZZFod6QzmQdPG81L8mTqw9o7X9XpFOrZsyimGf+ChSN5hF2dR ITh5VKKepZk9iz5jlTQHYi5wmyBtvw5XvvYA5jJizV8MJQXix1pU/3uTRnw0re3zLbYa NJfg== 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=AfvageHOrOHXM0EVXmYBSZjTGFGynVqeucPTabsnhyY=; b=Q6iXS1GWmRpH+Lwr5IBXyFigpDPwKvj0WnRw3I6NfLjJS4G9xWImdnEPguctzC/S26 y5WAEh+CNvXTBW3TvGMv1cGCzK4o5cN8edDMvviHzcMz9bh5rLlVvgXB7BgktdSYk01H OOGzGOH7pWo6nwQi5ooN9nYn4oy9wgEV8I2w9mWbo+jVH0cmEJKla90UYhl0gbPKJBLH igs+eA4GtC5Qy1C8Uwz7ty9Q3PDYELo4TLChjHfF5risZXqmJ50tZAjIIUl2mZgj37Wk TEfb+EBnN+t3TAw3Vxz2a7Ho5GA5Zs352u4OkU2qUKt1+uXQglmirEySZc9yQWJABrvN vdHQ== X-Gm-Message-State: AOAM5330lUmAZHdOZujFsRuX0GdwxQDWOLAyL4xuK3wvIqwGWkkq8bng 3s8I65pXlvJiq0HU2EBwKCMYBwLIguS1Cw== X-Google-Smtp-Source: ABdhPJxBBhLfA3c24U7I/6kPHJFpXp/JcA1hU3MULCLXIyAAfbexiEH6AXizJNMT4DSxbel6frWTpw== X-Received: by 2002:a17:90b:3810:b0:1d1:b184:1ead with SMTP id mq16-20020a17090b381000b001d1b1841eadmr2746201pjb.89.1650437432240; Tue, 19 Apr 2022 23:50:32 -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.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Apr 2022 23:50:31 -0700 (PDT) From: Nicholas Piggin To: pdbg@lists.ozlabs.org Date: Wed, 20 Apr 2022 16:49:38 +1000 Message-Id: <20220420065013.222816-5-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 04/39] gdbserver: fix put_mem command parsing 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 'M' gdb command (put_mem) should not match characters after the 'M' which are not part of the first hex number matching. Signed-off-by: Nicholas Piggin --- src/gdb_parser.rl | 2 +- src/gdb_parser_precompile.c | 139 +++++++++++++++++------------------- 2 files changed, 68 insertions(+), 73 deletions(-) diff --git a/src/gdb_parser.rl b/src/gdb_parser.rl index 93213e4f..629a091c 100644 --- a/src/gdb_parser.rl +++ b/src/gdb_parser.rl @@ -60,7 +60,7 @@ ',' xdigit+ $hex_digit %push); - put_mem = ('M' any* @{cmd = PUT_MEM;} + put_mem = ('M' @{cmd = PUT_MEM;} xdigit+ $hex_digit %push ',' xdigit+ $hex_digit %push diff --git a/src/gdb_parser_precompile.c b/src/gdb_parser_precompile.c index e0df0051..734b0f8b 100644 --- a/src/gdb_parser_precompile.c +++ b/src/gdb_parser_precompile.c @@ -30,19 +30,18 @@ static const char _gdb_actions[] = { 11, 1, 2, 12, 1, 2, 13, 1, 2, 14, 1, 2, 15, 1, 2, 16, 1, 2, 17, 1, 2, 18, 1, 2, - 19, 0, 3, 1, 19, 0, 3, 6, - 2, 1, 3, 6, 3, 1 + 19, 0, 3, 1, 19, 0 }; static const unsigned char _gdb_key_offsets[] = { 0, 0, 2, 14, 15, 21, 27, 30, 38, 46, 53, 60, 61, 68, 76, 83, - 92, 99, 107, 114, 122, 127, 129, 131, - 133, 135, 137, 139, 141, 143, 150, 152, - 154, 156, 158, 160, 162, 164, 166, 168, - 169, 171, 173, 175, 177, 179, 181, 183, - 185, 187, 189, 191, 193, 195, 197, 200, - 203, 204, 205, 207 + 91, 98, 106, 111, 113, 115, 117, 119, + 121, 123, 125, 127, 134, 136, 138, 140, + 142, 144, 146, 148, 150, 152, 153, 155, + 157, 159, 161, 163, 165, 167, 169, 171, + 173, 175, 177, 179, 181, 184, 187, 188, + 189, 191 }; static const char _gdb_trans_keys[] = { @@ -56,9 +55,7 @@ static const char _gdb_trans_keys[] = { 65, 70, 97, 102, 35, 35, 48, 57, 65, 70, 97, 102, 35, 44, 48, 57, 65, 70, 97, 102, 35, 48, 57, 65, - 70, 97, 102, 35, 44, 58, 48, 57, - 65, 70, 97, 102, 35, 48, 57, 65, - 70, 97, 102, 35, 44, 48, 57, 65, + 70, 97, 102, 35, 58, 48, 57, 65, 70, 97, 102, 35, 48, 57, 65, 70, 97, 102, 35, 44, 48, 57, 65, 70, 97, 102, 35, 65, 67, 83, 102, 35, @@ -77,35 +74,35 @@ static const char _gdb_trans_keys[] = { static const char _gdb_single_lengths[] = { 0, 2, 12, 1, 0, 0, 3, 2, - 2, 1, 1, 1, 1, 2, 1, 3, - 1, 2, 1, 2, 5, 2, 2, 2, + 2, 1, 1, 1, 1, 2, 1, 2, + 1, 2, 5, 2, 2, 2, 2, 2, + 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 3, 3, - 1, 1, 2, 3 + 2, 2, 2, 2, 3, 3, 1, 1, + 2, 3 }; static const char _gdb_range_lengths[] = { 0, 0, 0, 0, 3, 3, 0, 3, 3, 3, 3, 0, 3, 3, 3, 3, - 3, 3, 3, 3, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 3, 0, 0, + 3, 3, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0 + 0, 0 }; static const short _gdb_index_offsets[] = { 0, 0, 3, 16, 18, 22, 26, 30, 36, 42, 47, 52, 54, 59, 65, 70, - 77, 82, 88, 93, 99, 105, 108, 111, - 114, 117, 120, 123, 126, 129, 134, 137, - 140, 143, 146, 149, 152, 155, 158, 161, - 163, 166, 169, 172, 175, 178, 181, 184, - 187, 190, 193, 196, 199, 202, 205, 209, - 213, 215, 217, 220 + 76, 81, 87, 93, 96, 99, 102, 105, + 108, 111, 114, 117, 122, 125, 128, 131, + 134, 137, 140, 143, 146, 149, 151, 154, + 157, 160, 163, 166, 169, 172, 175, 178, + 181, 184, 187, 190, 193, 197, 201, 203, + 205, 208 }; static const char _gdb_indicies[] = { @@ -115,62 +112,60 @@ static const char _gdb_indicies[] = { 17, 16, 19, 20, 21, 18, 1, 2, 22, 22, 22, 0, 1, 2, 17, 17, 17, 0, 4, 23, 23, 23, 3, 24, - 23, 23, 23, 3, 4, 25, 4, 27, - 27, 27, 26, 4, 28, 27, 27, 27, - 26, 4, 29, 29, 29, 26, 4, 28, - 30, 29, 29, 29, 26, 4, 31, 31, - 31, 26, 24, 28, 31, 31, 31, 26, - 4, 32, 32, 32, 3, 4, 33, 32, - 32, 32, 3, 4, 34, 35, 36, 37, - 3, 4, 38, 3, 4, 39, 3, 4, - 40, 3, 4, 41, 3, 4, 42, 3, - 4, 43, 3, 4, 44, 3, 4, 45, - 3, 4, 46, 46, 46, 3, 4, 47, - 3, 4, 48, 3, 4, 49, 3, 4, - 50, 3, 4, 51, 3, 4, 52, 3, - 4, 53, 3, 4, 54, 3, 4, 55, - 3, 4, 56, 4, 57, 3, 4, 58, - 3, 4, 59, 3, 4, 60, 3, 4, - 61, 3, 4, 62, 3, 4, 63, 3, - 4, 64, 3, 4, 65, 3, 4, 66, - 3, 4, 67, 3, 4, 68, 3, 4, - 69, 3, 4, 70, 3, 4, 71, 72, - 3, 4, 73, 74, 3, 4, 75, 4, - 76, 1, 2, 0, 19, 20, 21, 18, - 0 + 23, 23, 23, 3, 4, 25, 4, 26, + 26, 26, 3, 4, 27, 26, 26, 26, + 3, 4, 28, 28, 28, 3, 4, 29, + 28, 28, 28, 3, 4, 30, 30, 30, + 3, 4, 29, 30, 30, 30, 3, 4, + 31, 32, 33, 34, 3, 4, 35, 3, + 4, 36, 3, 4, 37, 3, 4, 38, + 3, 4, 39, 3, 4, 40, 3, 4, + 41, 3, 4, 42, 3, 4, 43, 43, + 43, 3, 4, 44, 3, 4, 45, 3, + 4, 46, 3, 4, 47, 3, 4, 48, + 3, 4, 49, 3, 4, 50, 3, 4, + 51, 3, 4, 52, 3, 4, 53, 4, + 54, 3, 4, 55, 3, 4, 56, 3, + 4, 57, 3, 4, 58, 3, 4, 59, + 3, 4, 60, 3, 4, 61, 3, 4, + 62, 3, 4, 63, 3, 4, 64, 3, + 4, 65, 3, 4, 66, 3, 4, 67, + 3, 4, 68, 69, 3, 4, 70, 71, + 3, 4, 72, 4, 73, 1, 2, 0, + 19, 20, 21, 18, 0 }; static const char _gdb_trans_targs[] = { - 1, 2, 2, 3, 4, 59, 3, 9, - 11, 12, 3, 18, 9, 20, 50, 5, - 0, 58, 6, 2, 7, 2, 8, 10, - 4, 11, 12, 13, 14, 15, 16, 17, - 19, 9, 21, 3, 30, 40, 22, 23, - 24, 25, 26, 27, 28, 29, 29, 31, - 32, 33, 34, 35, 36, 37, 38, 39, - 39, 41, 42, 43, 44, 45, 46, 47, - 48, 49, 3, 51, 52, 53, 54, 55, - 3, 56, 57, 56, 57 + 1, 2, 2, 3, 4, 57, 3, 9, + 11, 12, 3, 16, 9, 18, 48, 5, + 0, 56, 6, 2, 7, 2, 8, 10, + 4, 11, 13, 14, 15, 9, 17, 19, + 3, 28, 38, 20, 21, 22, 23, 24, + 25, 26, 27, 27, 29, 30, 31, 32, + 33, 34, 35, 36, 37, 37, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 3, + 49, 50, 51, 52, 53, 3, 54, 55, + 54, 55 }; static const char _gdb_trans_actions[] = { 0, 63, 1, 3, 0, 3, 33, 39, - 3, 3, 27, 21, 30, 3, 3, 7, + 3, 24, 27, 21, 30, 3, 3, 7, 0, 18, 3, 66, 0, 9, 7, 15, - 5, 36, 24, 74, 70, 74, 70, 74, - 15, 12, 3, 45, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 42, 3, - 3, 3, 3, 3, 3, 3, 3, 3, - 48, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 51, 3, 3, 3, 3, 3, - 54, 3, 3, 57, 60 + 5, 36, 15, 12, 15, 12, 15, 3, + 45, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 42, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 48, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 51, + 3, 3, 3, 3, 3, 54, 3, 3, + 57, 60 }; -static const int gdb_start = 58; -static const int gdb_first_final = 58; +static const int gdb_start = 56; +static const int gdb_first_final = 56; static const int gdb_error = 0; -static const int gdb_en_main = 58; +static const int gdb_en_main = 56; #line 119 "src/gdb_parser.rl" @@ -178,7 +173,7 @@ static const int gdb_en_main = 58; void parser_init(command_cb *callbacks) { -#line 182 "src/gdb_parser_precompile.c" +#line 177 "src/gdb_parser_precompile.c" { cs = gdb_start; } @@ -194,7 +189,7 @@ int parse_buffer(char *buf, size_t len, void *priv) char *pe = p + len + 1; -#line 198 "src/gdb_parser_precompile.c" +#line 193 "src/gdb_parser_precompile.c" { int _klen; unsigned int _trans; @@ -385,7 +380,7 @@ _match: #line 93 "src/gdb_parser.rl" {command_callbacks[INTERRUPT](stack, priv);} break; -#line 389 "src/gdb_parser_precompile.c" +#line 384 "src/gdb_parser_precompile.c" } }