This is an automated email from Gerrit.
"Antonio Borneo <borneo.anto...@gmail.com>" just uploaded a new patch set to
Gerrit, which you can find at https://review.openocd.org/c/openocd/+/7423
-- gerrit
commit 36d1604454cde6da0a4bf7b939db586a02e1d6b5
Author: Antonio Borneo <borneo.anto...@gmail.com>
Date: Mon Dec 26 21:59:56 2022 +0100
helper: nvp: add openocd nvp files
Long ago jim_nvp was part of jimtcl. When jimtcl dropped it,
OpenOCD kept copy of it in its code base. Current code of jim_nvp
is still related with jimtcl data types and functions.
With the target of better isolating OpenOCD code from jimtcl,
create a new file nvp.c that re-proposes only the core of the old
jim_nvp, dropping any link with jimtcl and removing the string
'jim' either from the filename and from the code.
Keep the same license from the old code, as the new files are
clearly derived from it.
Change-Id: I273448cf1f1484b10f6b6113ed7bb0fcf946482b
Signed-off-by: Antonio Borneo <borneo.anto...@gmail.com>
diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 7354f5422b..7d86fe8e5f 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -15,6 +15,7 @@ noinst_LTLIBRARIES += %D%/libhelper.la
%D%/util.c \
%D%/jep106.c \
%D%/jim-nvp.c \
+ %D%/nvp.c \
%D%/align.h \
%D%/binarybuffer.h \
%D%/bits.h \
@@ -30,7 +31,8 @@ noinst_LTLIBRARIES += %D%/libhelper.la
%D%/system.h \
%D%/jep106.h \
%D%/jep106.inc \
- %D%/jim-nvp.h
+ %D%/jim-nvp.h \
+ %D%/nvp.h
STARTUP_TCL_SRCS += %D%/startup.tcl
EXTRA_DIST += \
diff --git a/src/helper/nvp.c b/src/helper/nvp.c
new file mode 100644
index 0000000000..b0f4ac9434
--- /dev/null
+++ b/src/helper/nvp.c
@@ -0,0 +1,77 @@
+// SPDX-License-Identifier: BSD-2-Clause-Views
+
+/*
+ * Copyright 2005 Salvatore Sanfilippo <anti...@invece.org>
+ * Copyright 2005 Clemens Hintze <c.hin...@gmx.net>
+ * Copyright 2005 patthoyts - Pat Thoyts <pattho...@users.sf.net>
+ * Copyright 2008 oharboe - Øyvind Harboe - oyvind.har...@zylin.com
+ * Copyright 2008 Andrew Lunn <and...@lunn.ch>
+ * Copyright 2008 Duane Ellis <open...@duaneellis.com>
+ * Copyright 2008 Uwe Klein <ukl...@klein-messgeraete.de>
+ * Copyright 2008 Steve Bennett <ste...@workware.net.au>
+ * Copyright 2009 Nico Coesel <ncoe...@dealogic.nl>
+ * Copyright 2009 Zachary T Welch z...@superlucidity.net
+ * Copyright 2009 David Brownell
+ * Copyright (c) 2005-2011 Jim Tcl Project. All rights reserved.
+ *
+ * This file is extracted from jim_nvp.c, originally part of jim TCL code.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string.h>
+
+#include <helper/log.h>
+#include <helper/nvp.h>
+
+const struct nvp *nvp_name2value(const struct nvp *p, const char *name)
+{
+ while (p->name) {
+ if (strcmp(name, p->name) == 0)
+ break;
+ p++;
+ }
+ return p;
+}
+
+const struct nvp *nvp_value2name(const struct nvp *p, int value)
+{
+ while (p->name) {
+ if (value == p->value)
+ break;
+ p++;
+ }
+ return p;
+}
+
+char *nvp_alloc_unknown(const struct nvp *nvp, const char *param_name, const
char *param_value)
+{
+ char *s;
+
+ if (param_name)
+ s = alloc_printf("%s: Unknown: %s, try one of: ", param_name,
param_value);
+ else
+ s = alloc_printf("Unknown param: %s, try one of: ",
param_value);
+
+ while (s && nvp->name) {
+ const char *a;
+ const char *b;
+
+ if ((nvp + 1)->name) {
+ a = nvp->name;
+ b = ", ";
+ } else {
+ a = "or ";
+ b = nvp->name;
+ }
+
+ char *old = s;
+ s = alloc_printf("%s%s%s", s, a, b);
+ free(old);
+ nvp++;
+ }
+
+ return s;
+}
diff --git a/src/helper/nvp.h b/src/helper/nvp.h
new file mode 100644
index 0000000000..4d90f2adda
--- /dev/null
+++ b/src/helper/nvp.h
@@ -0,0 +1,72 @@
+/* SPDX-License-Identifier: BSD-2-Clause-Views */
+
+/*
+ * Copyright 2005 Salvatore Sanfilippo <anti...@invece.org>
+ * Copyright 2005 Clemens Hintze <c.hin...@gmx.net>
+ * Copyright 2005 patthoyts - Pat Thoyts <pattho...@users.sf.net>
+ * Copyright 2008 oharboe - Øyvind Harboe - oyvind.har...@zylin.com
+ * Copyright 2008 Andrew Lunn <and...@lunn.ch>
+ * Copyright 2008 Duane Ellis <open...@duaneellis.com>
+ * Copyright 2008 Uwe Klein <ukl...@klein-messgeraete.de>
+ * Copyright 2008 Steve Bennett <ste...@workware.net.au>
+ * Copyright 2009 Nico Coesel <ncoe...@dealogic.nl>
+ * Copyright 2009 Zachary T Welch z...@superlucidity.net
+ * Copyright 2009 David Brownell
+ * Copyright (c) 2005-2011 Jim Tcl Project. All rights reserved.
+ *
+ * This file is extracted from jim_nvp.h, originally part of jim TCL code.
+ */
+
+#ifndef OPENOCD_HELPER_NVP_H
+#define OPENOCD_HELPER_NVP_H
+
+/** Name Value Pairs, aka: NVP
+ * - Given a string - return the associated int.
+ * - Given a number - return the associated string.
+ * .
+ *
+ * Very useful when the number is not a simple index into an array of
+ * known string, or there may be multiple strings (aliases) that mean then same
+ * thing.
+ *
+ * An NVP Table is terminated with ".name = NULL".
+ *
+ * During the 'name2value' operation, if no matching string is found
+ * the pointer to the terminal element (with p->name == NULL) is returned.
+ *
+ * Example:
+ * \code
+ * const struct nvp yn[] = {
+ * { "yes", 1 },
+ * { "no" , 0 },
+ * { "yep", 1 },
+ * { "nope", 0 },
+ * { NULL, -1 },
+ * };
+ *
+ * struct nvp *result;
+ * result = nvp_name2value(yn, "yes");
+ * returns &yn[0];
+ * result = nvp_name2value(yn, "no");
+ * returns &yn[1];
+ * result = jim_nvp_name2value(yn, "Blah");
+ * returns &yn[4];
+ * \endcode
+ *
+ * During the number2name operation, the first matching value is returned.
+ */
+
+struct nvp {
+ const char *name;
+ int value;
+};
+
+/* Name Value Pairs Operations */
+const struct nvp *nvp_name2value(const struct nvp *nvp_table, const char *name)
+ __attribute__((returns_nonnull, nonnull (1)));
+const struct nvp *nvp_value2name(const struct nvp *nvp_table, int v)
+ __attribute__((returns_nonnull, nonnull (1)));
+
+char *nvp_alloc_unknown(const struct nvp *nvp, const char *param_name, const
char *param_value);
+
+#endif /* OPENOCD_HELPER_NVP_H */
--
