From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 84D6FC433FE for ; Tue, 1 Nov 2022 19:29:59 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7651882BAF; Tue, 1 Nov 2022 20:29:49 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="bQjBf0uc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E7C5A85044; Tue, 1 Nov 2022 20:21:43 +0100 (CET) Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id AD38985044 for ; Tue, 1 Nov 2022 20:21:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=francis.laniel@amarulasolutions.com Received: by mail-wr1-x42f.google.com with SMTP id h9so21549025wrt.0 for ; Tue, 01 Nov 2022 12:21:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=o9r7xFxMX1aufqLZ77Q0wSU0KowIhdo8wj0z7TyoMTE=; b=bQjBf0ucJrCWqSmQddmCF3l9Ec9hNNYcFOCvCiS8wzFRXctluJpUugMoU/lUi7gxaC kvMq86SwvigRHirKWIlBwZkzIuZGU9DtmFT1QJ62wZQx0d6WoCI9rsIejCTAa5YqoB3s wdiOYZy5B23ps3WduhsoqGDtSXYKYkTWNBpHA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=o9r7xFxMX1aufqLZ77Q0wSU0KowIhdo8wj0z7TyoMTE=; b=RA0wDumsUGZeu51QUxHYT5afIahgsZl0cFOLOQoKDgxfcNth/u2ZtQ+qirERsK67dC +ZgQeYmfv5/8Ucl3zJTTebO5fb+Ev7K0O7LRfnCZNAg1jEfEqAslwdeBX5UkbgFbeBCw arY9IfV5/hG3MvB6e/inU7p8dCLCE9ONVdDYS5UZgGcEg/dz1g1bZxVw+o858GJ+lYoF 6v9HzMk9J1EKMSWVsoIzkbVO9F4wUh76ix8Bx7muiC2ZECHrTfPtZwa1SPG5XmTM/S2V V6+4dh4QOeaKfL0epjfFB7NZVtZcjnth5lvtTZm6ARA/oODsBio82I8p8Gl+Zml7GGKX h6mg== X-Gm-Message-State: ACrzQf1DGNXrMN8RnRLvCiBHn7CCPCXg7ZqKnRNVHJmkhfht5UiHkFZh K87PNLRx9kYsLBWqXcUh7oZGFEhor9hESw== X-Google-Smtp-Source: AMsMyM7oUHt0Md9y589iuPKHfvBdtQVFtUHDHhAfzDTpS2VOF5V5u2ae4GJSLKxdPLLg0WoJfjIANQ== X-Received: by 2002:a05:6000:168f:b0:236:e93e:7047 with SMTP id y15-20020a056000168f00b00236e93e7047mr2102916wrd.264.1667330480209; Tue, 01 Nov 2022 12:21:20 -0700 (PDT) Received: from pwmachine.numericable.fr (85-170-25-210.rev.numericable.fr. [85.170.25.210]) by smtp.gmail.com with ESMTPSA id h17-20020a5d6e11000000b002356c051b9csm10755732wrz.66.2022.11.01.12.21.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Nov 2022 12:21:19 -0700 (PDT) From: Francis Laniel To: u-boot@lists.denx.de Cc: Michael Nazzareno Trimarchi , Tom Rini , Aleksandar Gerasimovski , Holger Brunck , Francis Laniel , Simon Glass , Artem Lapkin , Ramon Fried , Heinrich Schuchardt , Ashok Reddy Soma , Huang Jianan , Chris Morgan , Ovidiu Panait Subject: [RFC PATCH v5 11/24] cmd: Add new parser command Date: Tue, 1 Nov 2022 20:20:16 +0100 Message-Id: <20221101192029.10231-12-francis.laniel@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221101192029.10231-1-francis.laniel@amarulasolutions.com> References: <20221101192029.10231-1-francis.laniel@amarulasolutions.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This command can be used to print the current parser with 'parser print'. It can also be used to set the current parser with 'parser set'. For the moment, only one value is valid for set: old. Signed-off-by: Francis Laniel --- cmd/Makefile | 2 + cmd/parser.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++ common/cli.c | 3 +- 3 files changed, 124 insertions(+), 1 deletion(-) create mode 100644 cmd/parser.c diff --git a/cmd/Makefile b/cmd/Makefile index ca9ed1054d..81fe7aa0db 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -215,6 +215,8 @@ obj-$(CONFIG_CMD_AVB) += avb.o # Foundries.IO SCP03 obj-$(CONFIG_CMD_SCP03) += scp03.o +obj-$(CONFIG_HUSH_PARSER) += parser.o + obj-$(CONFIG_ARM) += arm/ obj-$(CONFIG_RISCV) += riscv/ obj-$(CONFIG_SANDBOX) += sandbox/ diff --git a/cmd/parser.c b/cmd/parser.c new file mode 100644 index 0000000000..0a433b7dc6 --- /dev/null +++ b/cmd/parser.c @@ -0,0 +1,120 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include +#include +#include +#include +#include + +DECLARE_GLOBAL_DATA_PTR; + +static const char *gd_flags_to_parser(void) +{ + if (gd->flags & GD_FLG_HUSH_OLD_PARSER) + return "old"; + return NULL; +} + +static int do_parser_get(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) +{ + const char *current = gd_flags_to_parser(); + + if (!current) { + printf("current parser value is not valid, this should not happen!\n"); + return CMD_RET_FAILURE; + } + + printf("%s\n", current); + + return CMD_RET_SUCCESS; +} + +static int parser_string_to_gd_flags(const char *parser) +{ + if (!strcmp(parser, "old")) + return GD_FLG_HUSH_OLD_PARSER; + return -1; +} + +static void reset_parser_gd_flags(void) +{ + gd->flags &= ~GD_FLG_HUSH_OLD_PARSER; +} + +static int do_parser_set(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) +{ + char *parser_name; + int parser_flag; + + if (argc < 2) + return CMD_RET_USAGE; + + parser_name = argv[1]; + + parser_flag = parser_string_to_gd_flags(parser_name); + if (parser_flag == -1) { + printf("Bad value for parser name: %s\n", parser_name); + return CMD_RET_USAGE; + } + + if (parser_flag == GD_FLG_HUSH_OLD_PARSER && + !CONFIG_IS_ENABLED(HUSH_OLD_PARSER)) { + printf("Want to set current parser to old, but its code was not compiled!\n"); + return CMD_RET_FAILURE; + } + + if (parser_flag == GD_FLG_HUSH_2021_PARSER && + !CONFIG_IS_ENABLED(HUSH_2021_PARSER)) { + printf("Want to set current parser to 2021, but its code was not compiled!\n"); + return CMD_RET_FAILURE; + } + + reset_parser_gd_flags(); + gd->flags |= parser_flag; + + cli_init(); + cli_loop(); + + /* cli_loop() should never return. */ + return CMD_RET_FAILURE; +} + +static struct cmd_tbl parser_sub[] = { + U_BOOT_CMD_MKENT(get, 1, 1, do_parser_get, "", ""), + U_BOOT_CMD_MKENT(set, 2, 1, do_parser_set, "", ""), +}; + +static int do_parser(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) +{ + struct cmd_tbl *cp; + + if (argc < 2) + return CMD_RET_USAGE; + + /* drop initial "parser" arg */ + argc--; + argv++; + + cp = find_cmd_tbl(argv[0], parser_sub, ARRAY_SIZE(parser_sub)); + if (cp) + return cp->cmd(cmdtp, flag, argc, argv); + + return CMD_RET_USAGE; +} + +#if CONFIG_IS_ENABLED(SYS_LONGHELP) +static char parser_help_text[] = + "get - print current parser\n" + "set - set the current parser, possible value is: old" + ; +#endif + +U_BOOT_CMD(parser, 3, 1, do_parser, + "parser", +#if CONFIG_IS_ENABLED(SYS_LONGHELP) + parser_help_text +#endif +); diff --git a/common/cli.c b/common/cli.c index cfcf4a585b..65ec00dc9f 100644 --- a/common/cli.c +++ b/common/cli.c @@ -254,7 +254,8 @@ void cli_loop(void) void cli_init(void) { #ifdef CONFIG_HUSH_PARSER - if (!(gd->flags & GD_FLG_HUSH_OLD_PARSER)) + if (!(gd->flags & GD_FLG_HUSH_OLD_PARSER) + && CONFIG_IS_ENABLED(HUSH_OLD_PARSER)) gd->flags |= GD_FLG_HUSH_OLD_PARSER; u_boot_hush_start(); #endif -- 2.25.1