From: Tom Tromey <tom@tromey.com>
To: Mike Frysinger via Gdb-patches <gdb-patches@sourceware.org>
Subject: Re: [PATCH/committed] sim: options: increase max option count
Date: Sat, 24 Apr 2021 15:00:34 -0600 [thread overview]
Message-ID: <87tunve6tp.fsf@tromey.com> (raw)
In-Reply-To: <20210424041808.12359-1-vapier@gentoo.org> (Mike Frysinger via Gdb-patches's message of "Sat, 24 Apr 2021 00:18:08 -0400")
>>>>> "Mike" == Mike Frysinger via Gdb-patches <gdb-patches@sourceware.org> writes:
Mike> This will be needed to turn on hw support for v850 as it will then
Mike> exceed the current limit.
The libiberty hash table is easy to use and doesn't have this limitation.
WDYT of the appended?
Tom
diff --git a/sim/common/sim-options.c b/sim/common/sim-options.c
index ab95984e833..a6da8eccdef 100644
--- a/sim/common/sim-options.c
+++ b/sim/common/sim-options.c
@@ -28,6 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "sim-io.h"
#include "sim-assert.h"
#include "version.h"
+#include "hashtab.h"
#include "bfd.h"
@@ -413,37 +414,36 @@ standard_install (SIM_DESC sd)
return SIM_RC_OK;
}
+/* Equality function for arguments. */
+
+static int
+compare_strings (const void *a, const void *b)
+{
+ return strcmp (a, b) == 0;
+}
+
/* Return non-zero if arg is a duplicate argument.
If ARG is NULL, initialize. */
-#define ARG_HASH_SIZE 256
-#define ARG_HASH(a) ((256 * (unsigned char) a[0] + (unsigned char) a[1]) % ARG_HASH_SIZE)
-
static int
dup_arg_p (const char *arg)
{
- int hash;
- static const char **arg_table = NULL;
+ static htab_t arg_table = NULL;
+ void **slot;
if (arg == NULL)
{
if (arg_table == NULL)
- arg_table = (const char **) xmalloc (ARG_HASH_SIZE * sizeof (char *));
- memset (arg_table, 0, ARG_HASH_SIZE * sizeof (char *));
+ arg_table = htab_create_alloc (10, htab_hash_string,
+ compare_strings, NULL,
+ xcalloc, free);
return 0;
}
- hash = ARG_HASH (arg);
- while (arg_table[hash] != NULL)
- {
- if (strcmp (arg, arg_table[hash]) == 0)
- return 1;
- /* We assume there won't be more than ARG_HASH_SIZE arguments so we
- don't check if the table is full. */
- if (++hash == ARG_HASH_SIZE)
- hash = 0;
- }
- arg_table[hash] = arg;
+ slot = htab_find_slot (arg_table, arg, INSERT);
+ if (*slot != NULL)
+ return 1;
+ *slot = (void *) arg;
return 0;
}
@@ -478,9 +478,6 @@ sim_parse_args (SIM_DESC sd, char * const *argv)
for (opt = ol->options; OPTION_VALID_P (opt); ++opt)
++num_opts;
- /* We build a hash table of all options, so make sure they all fit. */
- SIM_ASSERT (num_opts <= ARG_HASH_SIZE);
-
/* Initialize duplicate argument checker. */
(void) dup_arg_p (NULL);
next prev parent reply other threads:[~2021-04-24 21:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-24 4:18 Mike Frysinger
2021-04-24 21:00 ` Tom Tromey [this message]
2021-04-24 22:35 ` Mike Frysinger
2021-05-02 3:09 ` [PATCH/committed] sim: options: fix --help output Mike Frysinger
2021-05-02 20:42 ` Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87tunve6tp.fsf@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).