summaryrefslogtreecommitdiff
path: root/tokhash.pl
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2007-09-18 12:38:07 -0700
committerH. Peter Anvin <hpa@zytor.com>2007-09-18 12:38:07 -0700
commit5255fd1f36eece1cbf4000ffc3120dbcb9bf5038 (patch)
tree1b48eca6bea429f943bd77dcdf91be7e85a013c2 /tokhash.pl
parent3ce3715fba17d5ad54278a42dd0fe75a5b0ebc8d (diff)
downloadnasm-5255fd1f36eece1cbf4000ffc3120dbcb9bf5038.tar.gz
Change the token prehash function for better convergence
Combining arithmetric (add) and bitwise (xor) mixing seems to give better result than either. With the new prehash function, we find a valid hash much quicker.
Diffstat (limited to 'tokhash.pl')
-rwxr-xr-xtokhash.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/tokhash.pl b/tokhash.pl
index 5f1a9f4c..9d5888be 100755
--- a/tokhash.pl
+++ b/tokhash.pl
@@ -187,8 +187,8 @@ print " const char *p = token;\n";
print "\n";
print " while ((c = *p++) != 0) {\n";
-printf " uint32_t kn1 = rot(k1,%2d) - rot(k2,%2d) + c;\n", ${$sv}[0], ${$sv}[1];
-printf " uint32_t kn2 = rot(k2,%2d) - rot(k1,%2d) + c;\n", ${$sv}[2], ${$sv}[3];
+printf " uint32_t kn1 = rot(k1,%2d)^(rot(k2,%2d) + c);\n", ${$sv}[0], ${$sv}[1];
+printf " uint32_t kn2 = rot(k2,%2d)^(rot(k1,%2d) + c);\n", ${$sv}[2], ${$sv}[3];
print " k1 = kn1; k2 = kn2;\n";
print " }\n";
print "\n";