From: Alan Modra <amodra@gmail.com>
To: binutils@sourceware.org
Subject: ppc gas: don't leak ppc_hash memory
Date: Sat, 9 Jul 2022 22:01:52 +0930 [thread overview]
Message-ID: <Ysl1OE1oZHnPIhtN@squeak.grove.modra.org> (raw)
* config/tc-ppc.c (insn_obstack): New.
(insn_calloc): New function.
(ppc_setup_opcodes): Use insn_obstack for ppc_hash.
(ppc_md_end): New function.
* config/tc-ppc.h (ppc_md_end): Declare
(md_end): Define.
diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
index 0c3e670d11b..ac61cd8f122 100644
--- a/gas/config/tc-ppc.c
+++ b/gas/config/tc-ppc.c
@@ -976,6 +976,10 @@ ppc_optimize_expr (expressionS *left, operatorT op, expressionS *right)
/* Whether to target xcoff64/elf64. */
static unsigned int ppc_obj64 = BFD_DEFAULT_TARGET_SIZE == 64;
+/* A separate obstack for use by ppc_hash, so that we can quickly
+ throw away hash table memory . */
+struct obstack insn_obstack;
+
/* Opcode hash table. */
static htab_t ppc_hash;
@@ -1613,6 +1617,21 @@ insn_validate (const struct powerpc_opcode *op)
return false;
}
+static void *
+insn_calloc (size_t n, size_t size)
+{
+ size_t amt;
+ void *ret;
+ if (gas_mul_overflow (n, size, &amt))
+ {
+ obstack_alloc_failed_handler ();
+ abort ();
+ }
+ ret = obstack_alloc (&insn_obstack, amt);
+ memset (ret, 0, amt);
+ return ret;
+}
+
/* Insert opcodes into hash tables. Called at startup and for
.machine pseudo. */
@@ -1624,10 +1643,16 @@ ppc_setup_opcodes (void)
bool bad_insn = false;
if (ppc_hash != NULL)
- htab_delete (ppc_hash);
+ {
+ htab_delete (ppc_hash);
+ _obstack_free (&insn_obstack, NULL);
+ }
+
+ obstack_begin (&insn_obstack, chunksize);
/* Insert the opcodes into a hash table. */
- ppc_hash = str_htab_create ();
+ ppc_hash = htab_create_alloc (5000, hash_string_tuple, eq_string_tuple,
+ NULL, insn_calloc, NULL);
if (ENABLE_CHECKING)
{
@@ -1875,6 +1900,13 @@ md_begin (void)
#endif
}
+void
+ppc_md_end (void)
+{
+ htab_delete (ppc_hash);
+ _obstack_free (&insn_obstack, NULL);
+}
+
void
ppc_cleanup (void)
{
diff --git a/gas/config/tc-ppc.h b/gas/config/tc-ppc.h
index e335aa611fe..ed06a296382 100644
--- a/gas/config/tc-ppc.h
+++ b/gas/config/tc-ppc.h
@@ -256,6 +256,9 @@ extern void ppc_elf_md_finish (void);
#endif /* OBJ_ELF */
+extern void ppc_md_end (void);
+#define md_end ppc_md_end
+
#if defined (OBJ_ELF) || defined (OBJ_XCOFF)
#define TC_FORCE_RELOCATION(FIX) ppc_force_relocation (FIX)
extern int ppc_force_relocation (struct fix *);
--
Alan Modra
Australia Development Lab, IBM
reply other threads:[~2022-07-09 12:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=Ysl1OE1oZHnPIhtN@squeak.grove.modra.org \
--to=amodra@gmail.com \
--cc=binutils@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).