[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1435448915-28419-4-git-send-email-amonakov@ispras.ru>
Date: Sun, 28 Jun 2015 02:48:32 +0300
From: Alexander Monakov <amonakov@...ras.ru>
To: musl@...ts.openwall.com
Subject: [PATCH v2 3/6] dynlink.c: slim down gnu_lookup
Do not reference dso->syms and dso-strings until point of use.
Check 'h1 == (h2|1)', the simplest condition, before the others.
---
src/ldso/dynlink.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index b08596e..0ca7a16 100644
--- a/src/ldso/dynlink.c
+++ b/src/ldso/dynlink.c
@@ -176,24 +176,20 @@ static Sym *sysv_lookup(const char *s, uint32_t h, struct dso *dso)
static Sym *gnu_lookup(const char *s, uint32_t h1, struct dso *dso)
{
- Sym *syms = dso->syms;
- char *strings = dso->strings;
uint32_t *hashtab = dso->ghashtab;
uint32_t nbuckets = hashtab[0];
uint32_t *buckets = hashtab + 4 + hashtab[2]*(sizeof(size_t)/4);
- uint32_t h2;
- uint32_t *hashval;
uint32_t i = buckets[h1 % nbuckets];
if (!i) return 0;
- hashval = buckets + nbuckets + (i - hashtab[1]);
+ uint32_t *hashval = buckets + nbuckets + (i - hashtab[1]);
for (h1 |= 1; ; i++) {
- h2 = *hashval++;
- if ((!dso->versym || dso->versym[i] >= 0)
- && (h1 == (h2|1)) && !strcmp(s, strings + syms[i].st_name))
- return syms+i;
+ uint32_t h2 = *hashval++;
+ if ((h1 == (h2|1)) && (!dso->versym || dso->versym[i] >= 0)
+ && !strcmp(s, dso->strings + dso->syms[i].st_name))
+ return dso->syms+i;
if (h2 & 1) break;
}
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
