shithub: sl

Info  •  Files  •  Log  •  Branches

get rid of memhash32 - use 64-bit hashing for symbols

--- a/src/flisp.c

+++ b/src/flisp.c

@@ -198,7 +198,7 @@

 		sym->flags = 0;

 	}

 	sym->type = nil;

-	sym->hash = memhash32(str, len)^0xAAAAAAAA;

+	sym->hash = memhash(str, len)^0xAAAAAAAAAAAAAAAAULL;

 	if(copy){

 		memcpy((char*)(sym+1), str, len+1);

 		sym->name = (const char*)(sym+1);

--- a/src/flisp.h

+++ b/src/flisp.h

@@ -65,9 +65,9 @@

 // NOTE: symbol_t MUST have the same fields as gensym_t first

 // there are places where gensyms are treated as normal symbols

 typedef struct {

+	uint64_t hash;

 	fltype_t *type;

 	value_t binding;   // global value binding

-	uint32_t hash;

 	uint8_t numtype;

 	uint8_t size;

 	uint8_t flags;

@@ -76,9 +76,9 @@

 }fl_aligned(8) symbol_t;

 typedef struct {

+	uint64_t id;

 	fltype_t *type;

 	value_t binding;

-	uint32_t id;

 }fl_aligned(8) gensym_t;

 typedef struct Builtin Builtin;

--- a/src/hashing.c

+++ b/src/hashing.c

@@ -3,23 +3,6 @@

 #include "spooky.h"

 value_t

-nextipow2(value_t i)

-{

-	if(i == 0)

-		return 1;

-	i |= i >> 1;

-	i |= i >> 2;

-	i |= i >> 4;

-	i |= i >> 8;

-	i |= i >> 16;

-#if defined(BITS64)

-	i |= i >> 32;

-#endif

-	i++;

-	return i ? i : TOP_BIT;

-}

-

-value_t

 inthash(value_t a)

 {

 #if defined(BITS64)

@@ -58,11 +41,5 @@

 uint64_t

 memhash(const char *buf, size_t n)

 {

-	return spooky_hash64(buf, n, 0xcafe8881);

-}

-

-uint32_t

-memhash32(const char *buf, size_t n)

-{

-	return spooky_hash32(buf, n, 0xcafe8881);

+	return spooky_hash64(buf, n, 0xcafe8881ULL);

 }

--- a/src/hashing.h

+++ b/src/hashing.h

@@ -1,7 +1,5 @@

 #pragma once

-value_t nextipow2(value_t i) fl_constfn;

 value_t inthash(value_t a) fl_constfn;

 uint32_t int64to32hash(uint64_t key) fl_constfn;

 uint64_t memhash(const char* buf, size_t n);

-uint32_t memhash32(const char* buf, size_t n);

--- a/src/htable.c

+++ b/src/htable.c

@@ -6,6 +6,23 @@

 #include "htable.h"

 #include "hashing.h"

+static fl_constfn value_t

+nextipow2(value_t i)

+{

+	if(i == 0)

+		return 1;

+	i |= i >> 1;

+	i |= i >> 2;

+	i |= i >> 4;

+	i |= i >> 8;

+	i |= i >> 16;

+#if defined(BITS64)

+	i |= i >> 32;

+#endif

+	i++;

+	return i ? i : TOP_BIT;

+}

+

 htable_t *

 htable_new(htable_t *h, size_t size)

 {